November 2012 - U-Boot

[U-Boot] [PATCH v3 0/22] AHCI / SATA Improvements
by Simon Glass 04 Nov '12

04 Nov '12

This series contains a set of improvements for the SATA susbsystem, mostly targeted at solid-state drivers and improving start-up time. The patches are tested on various x86 Chromebooks. Changes in v3: - Remove use of DEFINE_PCI_DEVICE_TABLE suggested by siren checkpatch - Use struct pci_device_id properly - Add new patch to enable setenv_ulong/addr() for powerpc - Fix setenv operation to use correct function - Move missing #ifdef CONFIG_AHCI_SETFEATURES_XFER from later commit - Remove . from end of commit subject - Move #ifdef change into earlier commit - Add patch to support 64-bit LBA option when reading capacity - Add new patch to correct ide_read/write() function signatures Changes in v2: - Use struct pci_device_id instead of defining new struct scsi_device - Squash in CONFIG_PCI patch - Set 'scsidevs' environment variable to number of SCSI disks Gabe Black (3): ahci: Make sending the SETFEATURES_XFER command optional ahci: Make the AHCI code find the capacity of disks > 128 GB properly ahci: Support 64-bit LBA option when reading capacity Hung-Te Lin (2): scsi: Add scsi_write to SCSI driver ahci: support scsi writing in AHCI driver Marc Jones (2): ahci: Support spin-up and link-up separately ahci: Perform SATA flush after disk write. Simon Glass (3): Support setenv_ulong() and setenv_addr() for powerpc ide: Correct function signatures for ide_read/write() x86: config: Enable AHCI support for coreboot Stefan Reinauer (4): scsi: Add function and env var to report number of scsi drives ahci: Optimise AHCI controller reset and start-up ahci: Improve AHCI debugging ahci: cosmetics and cleanup Taylor Hutt (4): ahci: Use sizeof(fis) instead of hardcoding '20' ahci: Fix 'Invaild' typo ahci: Use virt_to_phys() to denote physical addresses for DMA ahci: flush / invalidate dcache around SATA commands Vadim Bendebury (2): ahci: Support splitting of read transactions into multiple chunks scsi: Provide support for a list of AHCI controllers. Walter Murphy (2): ahci: Adjust SATA timeouts for hard disk (spinup delay & command timeout) ahci: Expand HDD Logical Block addressability up to 32 bits README | 3 + common/cmd_ide.c | 27 +-- common/cmd_scsi.c | 255 ++++++++++++++++++++++++---- drivers/block/ahci.c | 401 +++++++++++++++++++++++++++++++++++--------- include/ahci.h | 1 + include/ata.h | 3 + include/common.h | 2 +- include/configs/coreboot.h | 22 +++ include/scsi.h | 4 + 9 files changed, 585 insertions(+), 133 deletions(-) -- 1.7.7.3

2 25

[U-Boot] [PATCH 1/2] ZFS: Fix compile warning in cmd_zfs.c (GCC 4.6.4 from ELDK 5.2.1)
by Stefan Roese 04 Nov '12

04 Nov '12

This patch fixes the following compile warnings: cmd_zfs.c:177:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:177:1: warning: (near initialization for '_u_boot_list_cmd_zfsls.cmd') [enabled by default] cmd_zfs.c:182:1: warning: initialization from incompatible pointer type [enabled by default] cmd_zfs.c:182:1: warning: (near initialization for '_u_boot_list_cmd_zfsload.cmd') [enabled by default] Signed-off-by: Stefan Roese <sr(a)denx.de> Cc: Jorgen Lundman <lundman(a)lundman.net> --- common/cmd_zfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_zfs.c b/common/cmd_zfs.c index d580f7b..1df0c4d 100644 --- a/common/cmd_zfs.c +++ b/common/cmd_zfs.c @@ -46,7 +46,7 @@ #define DOS_FS_TYPE_OFFSET 0x36 #define DOS_FS32_TYPE_OFFSET 0x52 -static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_zfs_load(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { char *filename = NULL; int dev; @@ -146,7 +146,7 @@ int zfs_print(const char *entry, const struct zfs_dirhook_info *data) -static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char *argv[]) +static int do_zfs_ls(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { const char *filename = "/"; int part; -- 1.8.0

2 2

[U-Boot] [PATCH] Add board_name to CONFIG_ENV_VARS_UBOOT_CONFIG
by Stephen Warren 04 Nov '12

04 Nov '12

From: Stephen Warren <swarren(a)nvidia.com> CONFIG_ENV_VARS_UBOOT_CONFIG creates environment variables indicating which configuration U-Boot was built for. Some U-Boot binaries run on multiple boards, and hence this information may not uniquley describe the HW that U-Boot is actually running on. Another patch introduces environment variable board_name to represent that. In order to avoid scripts having to check $board_name, use it if set, and then fall back to using $board, make CONFIG_ENV_VARS_UBOOT_CONFIG also set a default value for board_name, so that variable is always available. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> --- include/env_default.h | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/include/env_default.h b/include/env_default.h index 375e5ca..a1db73a 100644 --- a/include/env_default.h +++ b/include/env_default.h @@ -118,6 +118,7 @@ const uchar default_environment[] = { "arch=" CONFIG_SYS_ARCH "\0" "cpu=" CONFIG_SYS_CPU "\0" "board=" CONFIG_SYS_BOARD "\0" + "board_name=" CONFIG_SYS_BOARD "\0" #ifdef CONFIG_SYS_VENDOR "vendor=" CONFIG_SYS_VENDOR "\0" #endif -- 1.7.0.4

3 2

[U-Boot] [PATCH 0/2] Standardize on run-time board ID variables
by Tom Rini 04 Nov '12

04 Nov '12

Hey all, I've been thinking about one of the problems we need to solve over in TI AM335x land and that is given that we support a number of different boards with a single binary (and we have an i2c eeprom that tells us what board and revision we are on), the user needs to be able to easily determine what board we are on so they know what dtb file to load so they can boot. To this end I've added CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to the README which says when set we have board_name and board_rev set at run-time. Then for am335x[1] set that and CONFIG_BOARD_LATE_INIT which will set the variables and add a command, findfdt to compare and set fdtfile correctly. Further distro-specific logic can then augment this to figure out what filesystem / partition to read from. [1]: Yes, this will need re-working after merging Peter K's patches to allow for non-TI boards. -- Tom

4 15

[U-Boot] [PATCH] git-mailrc: Change x86 maintainer to Simon
by Simon Glass 04 Nov '12

04 Nov '12

Grame is still listed since he has agreed to continue with some review. Also add an alias to shorten things. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- doc/git-mailrc | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index 7f60ef1..6600c15 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -30,6 +30,7 @@ alias rbohmer Remy Bohmer <linux(a)bohmer.net> alias reinhardm Reinhard Meyer <u-boot(a)emk-elektronik.de> alias sbabic Stefano Babic <sbabic(a)denx.de> alias scottwood Scott Wood <scottwood(a)freescale.com> +alias sjg Simon Glass <sjg(a)chromium.org> alias smcnutt Scott McNutt <smcnutt(a)psyent.com> alias stroese Stefan Roese <sr(a)denx.de> alias vapier Mike Frysinger <vapier(a)gentoo.org> @@ -50,7 +51,7 @@ alias rmobile uboot, iwamatsu alias s3c samsung alias s5pc samsung alias samsung uboot, prom -alias tegra uboot, Simon Glass <sjg(a)chromium.org>, Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com> +alias tegra uboot, sjg, Tom Warren <twarren(a)nvidia.com>, Stephen Warren <swarren(a)nvidia.com> alias tegra2 tegra alias ti uboot, Tom Rini <trini(a)ti.com> @@ -84,7 +85,7 @@ alias ppc4xx uboot, stroese alias ppc7xx uboot, wd alias ppc74xx uboot, wd -alias sandbox Simon Glass <sjg(a)chromium.org> +alias sandbox sjg alias sb sandbox alias sparc uboot, Daniel Hellstrom <daniel(a)gaisler.com> @@ -92,7 +93,7 @@ alias sparc uboot, Daniel Hellstrom <daniel(a)gaisler.com> alias superh uboot, iwamatsu alias sh superh -alias x86 uboot, gruss +alias x86 uboot, sjg, gruss # Subsystem aliases alias cfi uboot, stroese -- 1.7.7.3

2 1

[U-Boot] [PATCH] cmd_fdt.c: Use %p when printing pointers
by Tom Rini 04 Nov '12

04 Nov '12

When putting pointers into a format string use %p to ensure that they are printed correctly regardless of bitsize. This fixes warnings on sandbox on 64bit systems. Cc: Joe Hershberger <joe.hershberger(a)ni.com> Cc: Gerald Van Baren <vanbaren(a)cideas.com> Signed-off-by: Tom Rini <trini(a)ti.com> --- common/cmd_fdt.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/common/cmd_fdt.c b/common/cmd_fdt.c index a5e2cfc..f9acfc1 100644 --- a/common/cmd_fdt.c +++ b/common/cmd_fdt.c @@ -375,7 +375,7 @@ int do_fdt (cmd_tbl_t * cmdtp, int flag, int argc, char * const argv[]) /* Get address */ char buf[11]; - sprintf(buf, "0x%08X", (uint32_t)nodep); + sprintf(buf, "0x%p", nodep); setenv(var, buf); } else if (subcmd[0] == 's') { /* Get size */ @@ -816,7 +816,7 @@ static void print_data(const void *data, int len) if ((len %4) == 0) { if (len > CONFIG_CMD_FDT_MAX_DUMP) - printf("* 0x%08x [0x%08x]", (unsigned int)data, len); + printf("* 0x%p [0x%08x]", data, len); else { const u32 *p; @@ -828,7 +828,7 @@ static void print_data(const void *data, int len) } } else { /* anything else... hexdump */ if (len > CONFIG_CMD_FDT_MAX_DUMP) - printf("* 0x%08x [0x%08x]", (unsigned int)data, len); + printf("* 0x%p [0x%08x]", data, len); else { const u8 *s; -- 1.7.9.5

3 8

[U-Boot] [PATCH V4 1/3] fs: delete unused Makefile
by Stephen Warren 04 Nov '12

04 Nov '12

From: Stephen Warren <swarren(a)nvidia.com> fs/Makefile is unused. The top-level Makefile sets LIBS-y += fs/xxx and hence causes make to directly descend two directory levels into each individual filesystem, and it never descends into fs/ itself. So, delete this useless file. Signed-off-by: Stephen Warren <swarren(a)nvidia.com> Reviewed-by: Benoît Thébaudeau <benoit.thebaudeau(a)advansee.com> Acked-by: Simon Glass <sjg(a)chromium.org> --- v4: No change. v3: No change. v2: No change. --- fs/Makefile | 42 ------------------------------------------ 1 files changed, 0 insertions(+), 42 deletions(-) delete mode 100644 fs/Makefile diff --git a/fs/Makefile b/fs/Makefile deleted file mode 100644 index 901e189..0000000 --- a/fs/Makefile +++ /dev/null @@ -1,42 +0,0 @@ -# -# (C) Copyright 2000-2006 -# Wolfgang Denk, DENX Software Engineering, wd(a)denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# -# - -subdirs-$(CONFIG_CMD_CRAMFS) := cramfs -subdirs-$(CONFIG_CMD_EXT4) += ext4 -ifndef CONFIG_CMD_EXT4 -subdirs-$(CONFIG_CMD_EXT2) += ext4 -endif -subdirs-$(CONFIG_CMD_FAT) += fat -subdirs-$(CONFIG_CMD_FDOS) += fdos -subdirs-$(CONFIG_CMD_JFFS2) += jffs2 -subdirs-$(CONFIG_CMD_REISER) += reiserfs -subdirs-$(CONFIG_YAFFS2) += yaffs2 -subdirs-$(CONFIG_CMD_UBIFS) += ubifs -subdirs-$(CONFIG_CMD_ZFS) += zfs - -SUBDIRS := $(subdirs-y) - -$(obj).depend all: - @for dir in $(SUBDIRS) ; do \ - $(MAKE) -C $$dir $@ ; done -- 1.7.0.4

4 19

[U-Boot] [PATCH 1/2] mmc: add bcm2835 driver
by Stephen Warren 04 Nov '12

04 Nov '12

This adds a simple driver for the BCM2835's SD controller. Workarounds are implemented for: * Register writes can't be too close to each-other in time, or they will be lost. * Register accesses must all be 32-bit, so implement custom accessors. This code was extracted from: git://github.com/gonzoua/u-boot-pi.git master which was created by Oleksandr Tymoshenko. Portions of the code there were obviously based on the Linux kernel at: git://github.com/raspberrypi/linux.git rpi-3.2.27 No s-o-b tags were present in either location. swarren changed the following for upstream: * Removed hack udelay()s in bcm2835_sdhci_raw_writel(); setting SDHCI_QUIRK_WAIT_SEND_CMD appears to solve the issues. * Remove register logging from read*/write* functions. * Sort out confusion with min/max_freq values passed to add_sdhci(). * Simplified and commented twoticks_delay calculation. * checkpatch fixes. Cc: Oleksandr Tymoshenko <gonzo(a)bluezbox.com> Signed-off-by: Stephen Warren <swarren(a)wwwdotorg.org> --- This series is based on the previous bcm2835 patches I sent, to add the mbox and video drivers. Patch 1 should be independant, but patch 2 depends on those other patches. arch/arm/include/asm/arch-bcm2835/sdhci.h | 24 ++++ drivers/mmc/Makefile | 1 + drivers/mmc/bcm2835_sdhci.c | 172 +++++++++++++++++++++++++++++ 3 files changed, 197 insertions(+) create mode 100644 arch/arm/include/asm/arch-bcm2835/sdhci.h create mode 100644 drivers/mmc/bcm2835_sdhci.c diff --git a/arch/arm/include/asm/arch-bcm2835/sdhci.h b/arch/arm/include/asm/arch-bcm2835/sdhci.h new file mode 100644 index 0000000..a4f867b --- /dev/null +++ b/arch/arm/include/asm/arch-bcm2835/sdhci.h @@ -0,0 +1,24 @@ +/* + * (C) Copyright 2012 Stephen Warren + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * version 2 as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + */ + +#ifndef _BCM2835_SDHCI_H_ +#define _BCM2835_SDHCI_H_ + +#define BCM2835_SDHCI_BASE 0x20300000 + +int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq); + +#endif diff --git a/drivers/mmc/Makefile b/drivers/mmc/Makefile index a1dd730..6be36f2 100644 --- a/drivers/mmc/Makefile +++ b/drivers/mmc/Makefile @@ -43,6 +43,7 @@ COBJS-$(CONFIG_MXS_MMC) += mxsmmc.o COBJS-$(CONFIG_OMAP_HSMMC) += omap_hsmmc.o COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o COBJS-$(CONFIG_SDHCI) += sdhci.o +COBJS-$(CONFIG_BCM2835_SDHCI) += bcm2835_sdhci.o COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o diff --git a/drivers/mmc/bcm2835_sdhci.c b/drivers/mmc/bcm2835_sdhci.c new file mode 100644 index 0000000..1d623c0 --- /dev/null +++ b/drivers/mmc/bcm2835_sdhci.c @@ -0,0 +1,172 @@ +/* + * This code was extracted from: + * git://github.com/gonzoua/u-boot-pi.git master + * and hence presumably (C) 2012 Oleksandr Tymoshenko + * + * Tweaks for U-Boot upstreaming + * (C) 2012 Stephen Warren + * + * Portions (e.g. read/write macros, concepts for back-to-back register write + * timing workarounds) obviously extracted from the Linux kernel at: + * https://github.com/raspberrypi/linux.git rpi-3.2.27 + * + * The Linux kernel code has the following (c) and license, which is hence + * propagated to Oleksandr's tree and here: + * + * Support for SDHCI device on 2835 + * Based on sdhci-bcm2708.c (c) 2010 Broadcom + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +/* Supports: + * SDHCI platform device - Arasan SD controller in BCM2708 + * + * Inspired by sdhci-pci.c, by Pierre Ossman + */ + +#include <common.h> +#include <malloc.h> +#include <sdhci.h> + +/* 400KHz is max freq for card ID etc. Use that as min */ +#define MIN_FREQ 400000 + +static uint twoticks_delay; + +static inline void bcm2835_sdhci_raw_writel(struct sdhci_host *host, u32 val, + int reg) +{ + static ulong last_write; + + /* + * The Arasan has a bugette whereby it may lose the content of + * successive writes to registers that are within two SD-card clock + * cycles of each other (a clock domain crossing problem). + * It seems, however, that the data register does not have this problem. + * (Which is just as well - otherwise we'd have to nobble the DMA engine + * too) + */ + while (get_timer(last_write) < twoticks_delay) + ; + + writel(val, host->ioaddr + reg); + last_write = get_timer(0); +} + +static inline u32 bcm2835_sdhci_raw_readl(struct sdhci_host *host, int reg) +{ + return readl(host->ioaddr + reg); +} + +static void bcm2835_sdhci_writel(struct sdhci_host *host, u32 val, int reg) +{ + bcm2835_sdhci_raw_writel(host, val, reg); +} + +static void bcm2835_sdhci_writew(struct sdhci_host *host, u16 val, int reg) +{ + static u32 shadow; + + u32 p = reg == SDHCI_COMMAND ? shadow : + bcm2835_sdhci_raw_readl(host, reg & ~3); + u32 s = reg << 3 & 0x18; + u32 l = val << s; + u32 m = 0xffff << s; + + if (reg == SDHCI_TRANSFER_MODE) + shadow = (p & ~m) | l; + else + bcm2835_sdhci_raw_writel(host, (p & ~m) | l, reg & ~3); +} + +static void bcm2835_sdhci_writeb(struct sdhci_host *host, u8 val, int reg) +{ + u32 p = bcm2835_sdhci_raw_readl(host, reg & ~3); + u32 s = reg << 3 & 0x18; + u32 l = val << s; + u32 m = 0xff << s; + + bcm2835_sdhci_raw_writel(host, (p & ~m) | l, reg & ~3); +} + +static u32 bcm2835_sdhci_readl(struct sdhci_host *host, int reg) +{ + u32 val = bcm2835_sdhci_raw_readl(host, reg); + + return val; +} + +static u16 bcm2835_sdhci_readw(struct sdhci_host *host, int reg) +{ + u32 val = bcm2835_sdhci_raw_readl(host, (reg & ~3)); + val = val >> (reg << 3 & 0x18) & 0xffff; + + return (u16)val; +} + +static u8 bcm2835_sdhci_readb(struct sdhci_host *host, int reg) +{ + u32 val = bcm2835_sdhci_raw_readl(host, (reg & ~3)); + val = val >> (reg << 3 & 0x18) & 0xff; + + return (u8)val; +} + +static const struct sdhci_ops bcm2835_ops = { + .write_l = bcm2835_sdhci_writel, + .write_w = bcm2835_sdhci_writew, + .write_b = bcm2835_sdhci_writeb, + .read_l = bcm2835_sdhci_readl, + .read_w = bcm2835_sdhci_readw, + .read_b = bcm2835_sdhci_readb, +}; + +int bcm2835_sdhci_init(u32 regbase, u32 emmc_freq) +{ + struct sdhci_host *host = NULL; + + /* + * See the comments in bcm2835_sdhci_raw_writel(). + * + * This should probably be dynamically calculated based on the actual + * frequency. However, this is the longest we'll have to wait, and + * doesn't seem to slow access down too much, so the added complexity + * doesn't seem worth it for now. + * + * 1/MIN_FREQ is (max) time per tick of eMMC clock. + * 2/MIN_FREQ is time for two ticks. + * Multiply by 1000000 to get uS per two ticks. + * +1 for hack rounding. + */ + twoticks_delay = ((2 * 1000000) / MIN_FREQ) + 1; + + host = malloc(sizeof(struct sdhci_host)); + if (!host) { + printf("sdhci_host malloc fail!\n"); + return 1; + } + + host->name = "bcm2835_sdhci"; + host->ioaddr = (void *)regbase; + host->quirks = SDHCI_QUIRK_BROKEN_VOLTAGE | SDHCI_QUIRK_BROKEN_R1B | + SDHCI_QUIRK_WAIT_SEND_CMD; + host->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195; + host->ops = &bcm2835_ops; + + host->version = sdhci_readw(host, SDHCI_HOST_VERSION); + add_sdhci(host, emmc_freq, MIN_FREQ); + + return 0; +} -- 1.7.9.5

6 11

[U-Boot] [PATCH] arm: atmel: cpux9k2: add missing cache configs
by Jens Scharsig (BuS Elektronik) 04 Nov '12

04 Nov '12

From: "Jens Scharsig (BuS Elektronik)" <esw(a)bus-elektronik.de> * add CONFIG_SYS_CACHELINE_SIZE to eb_cpux9k2 board config header * dissable dcache (CONFIG_SYS_DCACHE_OFF) for eb_cpux9k2 Signed-off-by: Jens Scharsig (BuS Elektronik) <esw(a)bus-elektronik.de> --- This patch is send in reqest of <http://lists.denx.de/pipermail/u-boot/2012-October/136404.html> It fix compliation errors as long as 920t cache is not implemented. include/configs/eb_cpux9k2.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/include/configs/eb_cpux9k2.h b/include/configs/eb_cpux9k2.h index 9371ec3..3be4929 100644 --- a/include/configs/eb_cpux9k2.h +++ b/include/configs/eb_cpux9k2.h @@ -43,6 +43,10 @@ #define MACH_TYPE_EB_CPUX9K2 1977 #define CONFIG_MACH_TYPE MACH_TYPE_EB_CPUX9K2 + +#define CONFIG_SYS_CACHELINE_SIZE 32 +#define CONFIG_SYS_DCACHE_OFF + /*--------------------------------------------------------------------------*/ #ifndef CONFIG_RAMBOOT #define CONFIG_SYS_TEXT_BASE 0x00000000 @@ -56,7 +60,6 @@ #define CONFIG_SYS_U_BOOT_BASE PHYS_FLASH_1 #define CONFIG_SYS_U_BOOT_SIZE 0x60000 /* 384 KBytes */ - #define CONFIG_BOOT_RETRY_TIME 30 #define CONFIG_CMDLINE_EDITING -- 1.7.10.4

2 1

[U-Boot] [PATCH] mx53loco: Add support for SEIKO 4.3'' WVGA panel
by Fabio Estevam 04 Nov '12

04 Nov '12

Add support for SEIKO 4.3'' WVGA panel on mx53loco. By default, the CLAA WVGA panel is selected. In order to support the SEIKO panel, undef CONFIG_CLAA_WVGA and define CONFIG_SEIKO_WVGA in mx53loco.h. Signed-off-by: Fabio Estevam <fabio.estevam(a)freescale.com> --- board/freescale/mx53loco/mx53loco.c | 26 +++++++++++++++++++++++++- include/configs/mx53loco.h | 1 + 2 files changed, 26 insertions(+), 1 deletion(-) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index a11e883..5709c97 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -412,6 +412,7 @@ static void clock_1GHz(void) printf("CPU: Switch DDR clock to 400MHz failed\n"); } +#if defined(CONFIG_CLAA_WVGA) static struct fb_videomode const claa_wvga = { .name = "CLAA07LC0ACW", .refresh = 57, @@ -427,6 +428,24 @@ static struct fb_videomode const claa_wvga = { .sync = 0, .vmode = FB_VMODE_NONINTERLACED }; +#endif + +#if defined(CONFIG_SEIKO_WVGA) +static struct fb_videomode const seiko43wvga = { + .name = "Seiko-43WVF1G", + .refresh = 60, + .xres = 800, + .yres = 480, + .pixclock = 29851, /* picosecond (33.5 MHz) */ + .left_margin = 89, + .right_margin = 164, + .upper_margin = 23, + .lower_margin = 10, + .hsync_len = 10, + .vsync_len = 10, + .sync = 0, +}; +#endif void lcd_iomux(void) { @@ -470,7 +489,12 @@ void lcd_iomux(void) void lcd_enable(void) { - int ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565); + int ret; +#if defined(CONFIG_CLAA_WVGA) + ret = ipuv3_fb_init(&claa_wvga, 0, IPU_PIX_FMT_RGB565); +#elif defined(CONFIG_SEIKO_WVGA) + ret = ipuv3_fb_init(&seiko43wvga, 0, IPU_PIX_FMT_RGB24); +#endif if (ret) printf("LCD cannot be configured: %d\n", ret); } diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 0658dd3..e60b155 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -222,5 +222,6 @@ #define CONFIG_BMP_16BPP #define CONFIG_VIDEO_LOGO #define CONFIG_IPUV3_CLK 200000000 +#define CONFIG_CLAA_WVGA #endif /* __CONFIG_H */ -- 1.7.9.5

6 7