September 2013 - U-Boot

[U-Boot] [PATCH v3 0/3] arm: add support for LaCie CloudBox
by Frédéric Leroy 08 Sep '13

08 Sep '13

This series adds support for the LaCie Cloudbox v2 device. Changes in v3: - prepare other LaCie boards for led patch - fix Machine ID - use one commit for adding device Changes in v2: - sort unsorted #ifdef list in lacie_kw.h - add entry to MAINTAINERS - remove unused GPIO definitions - remove empty misc_init_r() - add Machine ID - Use #define values for ethernet phy init - checkpatch compliant Frédéric Leroy (3): lacie_kw: sort #ifdef lists by CONFIG_ identifiers LaCie/common: Uses #defines for ethernet phy leds setup arm: add support for LaCie CloudBox MAINTAINERS | 4 + board/LaCie/cloudbox/Makefile | 46 +++++++++++ board/LaCie/cloudbox/cloudbox.c | 94 +++++++++++++++++++++ board/LaCie/cloudbox/cloudbox.h | 36 ++++++++ board/LaCie/cloudbox/kwbimage.cfg | 167 ++++++++++++++++++++++++++++++++++++++ board/LaCie/common/common.c | 13 ++- boards.cfg | 1 + include/configs/lacie_kw.h | 45 ++++++---- 8 files changed, 388 insertions(+), 18 deletions(-) create mode 100644 board/LaCie/cloudbox/Makefile create mode 100644 board/LaCie/cloudbox/cloudbox.c create mode 100644 board/LaCie/cloudbox/cloudbox.h create mode 100644 board/LaCie/cloudbox/kwbimage.cfg -- 1.8.1.2

3 7

[U-Boot] [PATCH] ppc4xx: Fix GPIO handling in lwmon5 and lcd4_lwmon5 BSP
by Stefan Roese 07 Sep '13

07 Sep '13

LCD4 needs a slightly different GPIO configuration than the original LWMON5 variant. GPIO49 needs to be configured to a default output value of 0 (permanent voltage supply). Additionally lcd4 also needs to enable the LSB transmitter. Signed-off-by: Stefan Roese <sr(a)denx.de> --- board/lwmon5/lwmon5.c | 3 +++ include/configs/lwmon5.h | 10 +++++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/board/lwmon5/lwmon5.c b/board/lwmon5/lwmon5.c index 4e4a594..e9aa0b7 100644 --- a/board/lwmon5/lwmon5.c +++ b/board/lwmon5/lwmon5.c @@ -527,6 +527,9 @@ void spl_board_init(void) */ board_early_init_f(); + /* enable the LSB transmitter */ + gpio_write_bit(CONFIG_SYS_GPIO_LSB_ENABLE, 1); + /* * Clear resets */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 8f5eb95..96f3ba5 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -565,6 +565,7 @@ #define CONFIG_SYS_GPIO_PHY1_RST 12 #define CONFIG_SYS_GPIO_FLASH_WP 14 #define CONFIG_SYS_GPIO_PHY0_RST 22 +#define CONFIG_SYS_GPIO_PERM_VOLT_FEED 49 #define CONFIG_SYS_GPIO_DSPIC_READY 51 #define CONFIG_SYS_GPIO_CAN_ENABLE 53 #define CONFIG_SYS_GPIO_LSB_ENABLE 54 @@ -577,6 +578,13 @@ #define CONFIG_SYS_GPIO_SYSMON_STATUS 62 #define CONFIG_SYS_GPIO_WATCHDOG 63 +/* On LCD4, GPIO49 has to be configured to 0 instead of 1 */ +#ifdef CONFIG_LCD4_LWMON5 +#define GPIO49_VAL 0 +#else +#define GPIO49_VAL 1 +#endif + /* * PPC440 GPIO Configuration */ @@ -635,7 +643,7 @@ {GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO46 UIC_IRQ(7) DMA_REQ(0) */ \ {GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO47 UIC_IRQ(8) DMA_ACK(0) */ \ {GPIO1_BASE, GPIO_IN , GPIO_ALT1, GPIO_OUT_0}, /* GPIO48 UIC_IRQ(9) DMA_EOT/TC(0) */ \ -{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO_OUT_1}, /* GPIO49 Unselect via TraceSelect Bit */ \ +{GPIO1_BASE, GPIO_OUT, GPIO_SEL , GPIO49_VAL}, /* GPIO49 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_IN, GPIO_SEL , GPIO_OUT_0}, /* GPIO50 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO51 Unselect via TraceSelect Bit */ \ {GPIO1_BASE, GPIO_IN , GPIO_SEL , GPIO_OUT_0}, /* GPIO52 Unselect via TraceSelect Bit */ \ -- 1.8.3.4

1 1

[U-Boot] NAND write error with HW ECC on OMAP3
by Ash Charles 07 Sep '13

07 Sep '13

Hi, When using 'nandecc hw' on an OMAP3 platform, data is not being correctly written to NAND. I see the issue on 2013.10-rc2 and 2013.07 but not on 2012.10. Specifically, when I read back a SPL binary written with hardware Hamming ECC, I don't get a matching CRC. With the BCH8 ECC algorithm, the CRC is correct (but SPL must be written with Hamming otherwise the board doesn't boot) I've shown my steps here: http://pastebin.com/tLZsr9zH The expected CRC is 46745188. Any suggestions/ideas much appreciated! --Ash

2 7

[U-Boot] [PATCH v2 0/2] config.mk: Delete unnecessary code
by Masahiro Yamada 06 Sep '13

06 Sep '13

These consecutive patches delete the following code in the top-level config.mk ifneq ($(CONFIG_SPL_TEXT_BASE),) CPPFLAGS += -DCONFIG_SPL_TEXT_BASE=$(CONFIG_SPL_TEXT_BASE) endif ifneq ($(CONFIG_SPL_PAD_TO),) CPPFLAGS += -DCONFIG_SPL_PAD_TO=$(CONFIG_SPL_PAD_TO) endif ifneq ($(CONFIG_TPL_PAD_TO),) CPPFLAGS += -DCONFIG_TPL_PAD_TO=$(CONFIG_TPL_PAD_TO) endif ifneq ($(CONFIG_UBOOT_PAD_TO),) CPPFLAGS += -DCONFIG_UBOOT_PAD_TO=$(CONFIG_UBOOT_PAD_TO) endif ifneq ($(RESET_VECTOR_ADDRESS),) CPPFLAGS += -DRESET_VECTOR_ADDRESS=$(RESET_VECTOR_ADDRESS) endif As for CONFIG_SPL_TEXT_BASE, CONFIG_UBOOT_PAD_TO, CONFIG_RESET_VECTOR_ADDRESS, CONFIG_TPL_PAD_TO, they are not defined in makefiles but only in config headers. So, we can simply delete them. (This is done in 0001.) As for CONFIG_SPL_PAD_TO, there is only one board which defines it in a makefile. For refactoring, 0002 patch moves the definition of CONFIG_SPL_PAD_TO from board/ait/cam_enc_4xx/config.mk to include/configs/cam_enc_4xx.h. I added Cc Heiko Schocher, the maintainer of cam_enc_4xx board. Heiko, a review is welcome if the refactoring in 0002 is acceptable or not. If it is not acceptable, please apply only 0001 patch. Note: We have one more left in config.mk ifneq ($(CONFIG_SYS_TEXT_BASE),) CPPFLAGS += -DCONFIG_SYS_TEXT_BASE=$(CONFIG_SYS_TEXT_BASE) endif But too many boards still define CONFIG_SYS_TEXT_BASE in makefiles. So I could not touch for now. I think board maintainers should make effort to move the CONFIG definition from config.mk to headers. Cc: Heiko Schocher <hs(a)denx.de> Masahiro Yamada (2): config.mk: Delete unnecessary code cam_enc_4xx: Move CONFIG_SPL_PAD_TO to a config header board/ait/cam_enc_4xx/config.mk | 2 -- config.mk | 20 -------------------- include/configs/cam_enc_4xx.h | 2 ++ 3 files changed, 2 insertions(+), 22 deletions(-) -- 1.8.1.2

2 3

[U-Boot] [PATCH v2 1/2] fw_env: add redundant env support for MTD_ABSENT
by Luka Perkov 06 Sep '13

06 Sep '13

From: Oliver Metz <oliver(a)freetz.org> Signed-off-by: Oliver Metz <oliver(a)freetz.org> Tested-by: Luka Perkov <luka(a)openwrt.org> --- v1 -> v2: * correct spelling of redundant tools/env/fw_env.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tools/env/fw_env.c b/tools/env/fw_env.c index 44607b1..65be5f3 100644 --- a/tools/env/fw_env.c +++ b/tools/env/fw_env.c @@ -1136,6 +1136,9 @@ int fw_env_open(void) } else if (DEVTYPE(dev_current) == MTD_UBIVOLUME && DEVTYPE(!dev_current) == MTD_UBIVOLUME) { environment.flag_scheme = FLAG_INCREMENTAL; + } else if (DEVTYPE(dev_current) == MTD_ABSENT && + DEVTYPE(!dev_current) == MTD_ABSENT) { + environment.flag_scheme = FLAG_INCREMENTAL; } else { fprintf (stderr, "Incompatible flash types!\n"); return -1; -- 1.8.4

2 2

[U-Boot] [PATCH] mail: Fix email address
by Marek Vasut 06 Sep '13

06 Sep '13

Fix my email address. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Tom Rini <trini(a)ti.com> --- doc/git-mailrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index e3a47c4..1d5eec6 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -22,7 +22,7 @@ alias jasonjin Jason Jin <jason.jin(a)freescale.com> alias jhersh Joe Hershberger <joe.hershberger(a)gmail.com> alias kimphill Kim Phillips <kim.phillips(a)freescale.com> alias macpaul Macpaul Lin <macpaul(a)andestech.com> -alias marex Marek Vasut <marek.vasut(a)gmail.com> +alias marex Marek Vasut <marex(a)denx.de> alias monstr Michal Simek <monstr(a)monstr.eu> alias prafulla Prafulla Wadaskar <prafulla(a)marvell.com> alias prom Minkyu Kang <mk7.kang(a)samsung.com> -- 1.7.10.4

2 1

[U-Boot] [PATCH] Always build u-boot.img when using CONFIG_SPL_FRAMEWORK
by Henrik Nordström 06 Sep '13

06 Sep '13

>From 015f65db8c6c01fe527f2f88af255ecdb5e2c58d Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom <henrik(a)henriknordstrom.net> Date: Wed, 21 Aug 2013 21:20:47 +0200 Subject: [PATCH] Always build u-boot.img when using CONFIG_SPL_FRAMEWORK Use of uImage formatted u-boot binary have long been preferred, and recent changes to better support Falcon mode on MMC now enforces it on MMC. --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index 43b57da..76dbda9 100644 --- a/Makefile +++ b/Makefile @@ -397,6 +397,7 @@ ALL-y += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map ALL-$(CONFIG_NAND_U_BOOT) += $(obj)u-boot-nand.bin ALL-$(CONFIG_ONENAND_U_BOOT) += $(obj)u-boot-onenand.bin ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin +ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.img ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin ifneq ($(CONFIG_SPL_TARGET),) ALL-$(CONFIG_SPL) += $(obj)$(subst ",,$(CONFIG_SPL_TARGET)) -- 1.8.3.1

2 2

[U-Boot] [PATCH v2 1/8] ahci: use ports implemented map instead of num_ports
by Rob Herring 06 Sep '13

06 Sep '13

From: Richard Gibbs <richard.gibbs(a)calxeda.com> The AHCI driver was incorrectly using the Capabilities register NP (number of ports) field to determine which ports to activate. This commit changes it to correctly use the PORTS_IMPL register as a port map. Signed-off-by: Richard Gibbs <richard.gibbs(a)calxeda.com> Reviewed-by: Tom Rini <trini(a)ti.com> --- v2: rebase to v2013.10-rc1 drivers/block/ahci.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/block/ahci.c b/drivers/block/ahci.c index e455ba5..02ba02f 100644 --- a/drivers/block/ahci.c +++ b/drivers/block/ahci.c @@ -119,6 +119,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) u32 tmp, cap_save, cmd; int i, j; volatile u8 *port_mmio; + u32 port_map; debug("ahci_host_init: start\n"); @@ -160,6 +161,7 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) #endif probe_ent->cap = readl(mmio + HOST_CAP); probe_ent->port_map = readl(mmio + HOST_PORTS_IMPL); + port_map = probe_ent->port_map; probe_ent->n_ports = (probe_ent->cap & 0x1f) + 1; debug("cap 0x%x port_map 0x%x n_ports %d\n", @@ -169,6 +171,8 @@ static int ahci_host_init(struct ahci_probe_ent *probe_ent) probe_ent->n_ports = CONFIG_SYS_SCSI_MAX_SCSI_ID; for (i = 0; i < probe_ent->n_ports; i++) { + if (!(port_map & (1 << i))) + continue; probe_ent->port[i].port_mmio = ahci_port_base((u32) mmio, i); port_mmio = (u8 *) probe_ent->port[i].port_mmio; ahci_setup_port(&probe_ent->port[i], (unsigned long)mmio, i); -- 1.8.1.2

2 8

[U-Boot] [PATCH 1/1] compiler_gcc: do not redefine __gnu_attributes
by Jeroen Hofstee 06 Sep '13

06 Sep '13

gcc allows extensions to be non compiler specific by defining __* macros for the attributes supported by gcc. Having a different definition causes many warnings during the build (cdefs.h on FreeBSD uses __attribute((__pure__)) where u-boot uses __attribute__((pure)) for example). Do not redefine these macros to suppress these warnings. This patch ignores the checkpatch warning: WARNING: __packed is preferred over __attribute__((packed)) Signed-off-by: Jeroen Hofstee <jeroen(a)myspectrum.nl> --- include/linux/compiler-gcc.h | 12 +++++++++--- include/linux/compiler-gcc4.h | 4 +++- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/linux/compiler-gcc.h b/include/linux/compiler-gcc.h index 73dcf80..9896e54 100644 --- a/include/linux/compiler-gcc.h +++ b/include/linux/compiler-gcc.h @@ -50,7 +50,9 @@ #endif #define __deprecated __attribute__((deprecated)) -#define __packed __attribute__((packed)) +#ifndef __packed +# define __packed __attribute__((packed)) +#endif #define __weak __attribute__((weak)) /* @@ -73,8 +75,12 @@ * would be. * [...] */ -#define __pure __attribute__((pure)) -#define __aligned(x) __attribute__((aligned(x))) +#ifndef __pure +# define __pure __attribute__((pure)) +#endif +#ifndef __aligned +# define __aligned(x) __attribute__((aligned(x))) +#endif #define __printf(a,b) __attribute__((format(printf,a,b))) #define noinline __attribute__((noinline)) #define __attribute_const__ __attribute__((__const__)) diff --git a/include/linux/compiler-gcc4.h b/include/linux/compiler-gcc4.h index 94dea3f..27d11ca 100644 --- a/include/linux/compiler-gcc4.h +++ b/include/linux/compiler-gcc4.h @@ -12,7 +12,9 @@ #define __used __attribute__((__used__)) #define __must_check __attribute__((warn_unused_result)) #define __compiler_offsetof(a,b) __builtin_offsetof(a,b) -#define __always_inline inline __attribute__((always_inline)) +#ifndef __always_inline +# define __always_inline inline __attribute__((always_inline)) +#endif /* * A trick to suppress uninitialized variable warning without generating any -- 1.8.1.2

2 1

[U-Boot] [PATCH] git-mailrc: Update MMC custodian
by Pantelis Antoniou 06 Sep '13

06 Sep '13

Update git-mailrc with my nick and replace afleming as mmc custodian. Signed-off-by: Pantelis Antoniou <panto(a)antoniou-consulting.com> --- doc/git-mailrc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/git-mailrc b/doc/git-mailrc index e3a47c4..03fc482 100644 --- a/doc/git-mailrc +++ b/doc/git-mailrc @@ -24,6 +24,7 @@ alias kimphill Kim Phillips <kim.phillips(a)freescale.com> alias macpaul Macpaul Lin <macpaul(a)andestech.com> alias marex Marek Vasut <marek.vasut(a)gmail.com> alias monstr Michal Simek <monstr(a)monstr.eu> +alias panto Pantelis Antoniou <panto(a)antoniou-consulting.com> alias prafulla Prafulla Wadaskar <prafulla(a)marvell.com> alias prom Minkyu Kang <mk7.kang(a)samsung.com> alias rbohmer Remy Bohmer <linux(a)bohmer.net> @@ -102,7 +103,7 @@ alias cfi uboot, stroese alias kerneldoc uboot, marex alias fdt uboot, Jerry Van Baren <vanbaren(a)cideas.com> alias i2c uboot, hs -alias mmc uboot, afleming +alias mmc uboot, panto alias nand uboot, scottwood alias net uboot, jhersh alias usb uboot, marex -- 1.7.12

2 1