March 2015 - U-Boot

[U-Boot] [PATCH] ARM: omap4_panda: enable saveenv command
by Maxin B. John 28 Mar '15

28 Mar '15

Enable saveenv command and the configs to store environment persistently in the SD card. Tested on OMAP4 Panda (OMAP4460 ES1.1) Signed-off-by: Maxin B. John <maxin.john(a)enea.com> --- include/configs/omap4_panda.h | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 7378acd..e97c5e3 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -43,8 +43,13 @@ #define CONFIG_CMD_GPIO /* ENV related config options */ -#define CONFIG_ENV_IS_NOWHERE #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +#define CONFIG_ENV_IS_IN_FAT +#define FAT_ENV_INTERFACE "mmc" +#define FAT_ENV_DEVICE_AND_PART "0:1" +#define FAT_ENV_FILE "uboot.env" +#define CONFIG_CMD_SAVEENV +#define CONFIG_ENV_OVERWRITE #endif /* __CONFIG_PANDA_H */ -- 1.9.1

3 2

[U-Boot] [PATCH 0/8] m68k: stop grepping and refactor CPU flags
by Masahiro Yamada 28 Mar '15

28 Mar '15

arch/m68k/cpu/mcf52x2/config.mk arch/m68k/cpu/mcf530x/config.mk arch/m68k/cpu/mcf532x/config.mk are not very nice. They use "grep" to decide the CPU type. They can be tidied up by moving the CPU type CONFIGs to Kconfig. I built all the M68k boards and compared MD5SUM for each of them. I confirmed this series still produces the same output binaries. Masahiro Yamada (8): m68k: mcf52x2: move CPU type to Kconfig and refactor config.mk m68k: mcf530x: move CPU type to Kconfig and refactor config.mk m68k: mcf532x: move CPU type to Kconfig and refactor config.mk m68k: mcf5445x: move CPU type to Kconfig and refactor config.mk m68k: mcf5227x: move CPU type to Kconfig and refactor config.mk m68k: mcf523x: move CPU type to Kconfig and refactor config.mk m68k: mcf547x_8x: move CPU type to Kconfig and refactor config.mk m68k: merge per-CPU config.mk into arch/m68k/Makefile arch/m68k/Kconfig | 129 +++++++++++++++++++++++++++++++++++++ arch/m68k/Makefile | 29 +++++++++ arch/m68k/cpu/mcf5227x/config.mk | 10 --- arch/m68k/cpu/mcf523x/config.mk | 10 --- arch/m68k/cpu/mcf52x2/config.mk | 39 ----------- arch/m68k/cpu/mcf530x/config.mk | 12 ---- arch/m68k/cpu/mcf532x/config.mk | 19 ------ arch/m68k/cpu/mcf5445x/config.mk | 25 ------- arch/m68k/cpu/mcf547x_8x/config.mk | 16 ----- include/configs/M5208EVBE.h | 3 - include/configs/M52277EVB.h | 2 - include/configs/M5235EVB.h | 2 - include/configs/M5249EVB.h | 3 - include/configs/M5253DEMO.h | 2 - include/configs/M5253EVBE.h | 2 - include/configs/M5272C3.h | 3 - include/configs/M5275EVB.h | 2 - include/configs/M5282EVB.h | 3 - include/configs/M53017EVB.h | 2 - include/configs/M5329EVB.h | 2 - include/configs/M5373EVB.h | 2 - include/configs/M54418TWR.h | 2 - include/configs/M54451EVB.h | 2 - include/configs/M54455EVB.h | 2 - include/configs/M5475EVB.h | 3 - include/configs/M5485EVB.h | 3 - include/configs/amcore.h | 3 - include/configs/astro_mcf5373l.h | 10 --- include/configs/cobra5272.h | 10 --- include/configs/eb_cpu5282.h | 3 - 30 files changed, 158 insertions(+), 197 deletions(-) delete mode 100644 arch/m68k/cpu/mcf5227x/config.mk delete mode 100644 arch/m68k/cpu/mcf523x/config.mk delete mode 100644 arch/m68k/cpu/mcf52x2/config.mk delete mode 100644 arch/m68k/cpu/mcf530x/config.mk delete mode 100644 arch/m68k/cpu/mcf532x/config.mk delete mode 100644 arch/m68k/cpu/mcf5445x/config.mk delete mode 100644 arch/m68k/cpu/mcf547x_8x/config.mk -- 1.9.1

2 16

[U-Boot] [PATCH 0/3] kbuild: refactor ./Kbuild
by Masahiro Yamada 28 Mar '15

28 Mar '15

Masahiro Yamada (2): kbuild: merge generic-asm-offsets.h and asm-offsets.h rules kbuild: remove redundant line from (generic-)asm-offsets.h Michal Marek (1): kbuild: Don't reset timestamps in include/generated if not needed Kbuild | 73 +++++++++++++++++++++++++----------------------------------------- 1 file changed, 27 insertions(+), 46 deletions(-) -- 1.9.1

2 6

[U-Boot] [PATCH v3 0/7] Some improvements related to build system
by Masahiro Yamada 28 Mar '15

28 Mar '15

- Move GENERIC_BOARD CONFIGs - Remove arch/m68k/lib/board.c - Clean ups CONFIG_SYS_MALLOC_F and CONFIG_SYS_MALLOC_F_LEN - Move BCM283x code into arch/arm/mach-bcm283x Changes in v3: - No change. Just add Stephen's Acked-by tag Changes in v2: - Fix a typo s/not board-independent/board-independent/ Masahiro Yamada (7): generic-board: move __HAVE_ARCH_GENERIC_BOARD to Kconfig generic-board: select SYS_GENERIC_BOARD for some architectures m68k: remove arch/m68k/lib/board.c malloc_f: remove redundant defalut values of CONFIG_SYS_MALLOC_F_LEN malloc_f: enable SYS_MALLOC_F by default if DM is on ARM: bcm283x: merge BCM2835/BCM2836 directories into mach-bcm283x ARM: bcm283x: move SoC headers to mach-bcm283x/include/mach Kconfig | 2 +- Makefile | 2 +- README | 6 +- arch/Kconfig | 26 + arch/arc/config.mk | 3 - arch/arc/include/asm/config.h | 1 - arch/arm/Kconfig | 15 +- arch/arm/Makefile | 1 + arch/arm/config.mk | 3 - arch/arm/cpu/arm1176/Makefile | 2 - arch/arm/cpu/arm1176/bcm2835/Kconfig | 12 - arch/arm/cpu/armv7/Makefile | 1 - arch/arm/cpu/armv7/bcm2835/Makefile | 13 - arch/arm/cpu/armv7/exynos/Kconfig | 6 - arch/arm/cpu/armv7/omap3/Kconfig | 6 - arch/arm/mach-bcm283x/Kconfig | 40 ++ .../{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile | 2 +- .../include/mach}/gpio.h | 0 .../include/mach}/mbox.h | 0 .../include/mach}/sdhci.h | 0 .../include/mach}/timer.h | 0 .../include/mach}/wdog.h | 0 .../{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c | 0 .../bcm2835 => mach-bcm283x}/lowlevel_init.S | 0 .../{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c | 0 .../{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c | 0 .../{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c | 0 arch/arm/mach-tegra/Kconfig | 3 - arch/arm/mach-uniphier/Kconfig | 6 - arch/avr32/config.mk | 3 - arch/blackfin/config.mk | 3 - arch/blackfin/include/asm/config.h | 1 - arch/m68k/config.mk | 3 - arch/m68k/include/asm/config.h | 1 - arch/m68k/lib/Makefile | 3 - arch/m68k/lib/board.c | 642 --------------------- arch/microblaze/config.mk | 1 - arch/microblaze/include/asm/config.h | 1 - arch/mips/config.mk | 2 - arch/nios2/config.mk | 2 - arch/nios2/include/asm/config.h | 1 - arch/powerpc/config.mk | 3 - arch/sandbox/config.mk | 5 +- arch/x86/Kconfig | 3 - arch/x86/config.mk | 3 - arch/x86/include/asm/config.h | 1 - board/amcc/canyonlands/Kconfig | 8 - board/raspberrypi/rpi/Kconfig | 15 - board/raspberrypi/rpi_2/Kconfig | 15 - board/ti/am335x/Kconfig | 6 - configs/Linksprite_pcDuino3_fdt_defconfig | 2 - configs/am335x_igep0033_defconfig | 2 - configs/cm_fx6_defconfig | 2 - configs/cm_t335_defconfig | 2 - configs/gwventana_defconfig | 1 - configs/mx6dlsabreauto_defconfig | 2 - configs/mx6qsabreauto_defconfig | 2 - configs/mx6qsabresd_defconfig | 2 - configs/mx6sxsabresd_defconfig | 2 - configs/nokia_rx51_defconfig | 2 - configs/pcm051_rev1_defconfig | 2 - configs/pcm051_rev3_defconfig | 2 - configs/pengwyn_defconfig | 2 - configs/pepper_defconfig | 2 - configs/rpi_2_defconfig | 3 +- configs/rpi_defconfig | 3 +- configs/s5p_goni_defconfig | 2 - configs/sandbox_defconfig | 2 - configs/smdkc100_defconfig | 2 - configs/snapper9260_defconfig | 2 - configs/snapper9g20_defconfig | 2 - configs/stv0991_defconfig | 1 - doc/README.generic-board | 12 +- drivers/mmc/bcm2835_sdhci.c | 4 +- include/configs/amcore.h | 2 - include/configs/dbau1x00.h | 1 - include/configs/malta.h | 1 - include/configs/pb1x00.h | 1 - include/configs/qemu-mips.h | 1 - include/configs/qemu-mips64.h | 1 - include/configs/rcar-gen2-common.h | 2 - include/configs/vct.h | 1 - 82 files changed, 89 insertions(+), 853 deletions(-) delete mode 100644 arch/arm/cpu/arm1176/bcm2835/Kconfig delete mode 100644 arch/arm/cpu/armv7/bcm2835/Makefile create mode 100644 arch/arm/mach-bcm283x/Kconfig rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/Makefile (72%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/gpio.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/mbox.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/sdhci.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/timer.h (100%) rename arch/arm/{include/asm/arch-bcm2835 => mach-bcm283x/include/mach}/wdog.h (100%) rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/init.c (100%) rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/lowlevel_init.S (100%) rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/mbox.c (100%) rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/reset.c (100%) rename arch/arm/{cpu/arm1176/bcm2835 => mach-bcm283x}/timer.c (100%) delete mode 100644 arch/m68k/lib/board.c delete mode 100644 board/raspberrypi/rpi/Kconfig delete mode 100644 board/raspberrypi/rpi_2/Kconfig -- 1.9.1

5 26

[U-Boot] [PATCH 0/2] kbuild: clean up glue code to delete scripts/multoconfig.sh
by Masahiro Yamada 28 Mar '15

28 Mar '15

Masahiro Yamada (2): kbuild: remove "*_felconfig" target kbuild: remove scripts/multiconfig.sh Makefile | 13 +++++- scripts/kconfig/Makefile | 10 +++++ scripts/multiconfig.sh | 102 ----------------------------------------------- 3 files changed, 21 insertions(+), 104 deletions(-) delete mode 100755 scripts/multiconfig.sh -- 1.9.1

3 6

[U-Boot] allow LED initialization without STATUS_LED_BOOT
by Bernhard Nortmann 28 Mar '15

28 Mar '15

For current U-Boot to initialize status LEDs via status_led_init(), it is required to have both CONFIG_STATUS_LED and STATUS_LED_BOOT defined. This may be a particular concern with GPIO LEDs, where __led_init() is required to correctly set up the GPIO (gpio_request and gpio_direction_output). Without STATUS_LED_BOOT the initialization isn't called, which could leave the user with a non-functional "led" command - due to the fact that the LED routines in gpio_led.c use gpio_set_value() just fine, but the GPIO never got set up properly in the first place. I think having CONFIG_STATUS_LED is sufficient to justify a corresponding call to status_led_init(), even with no STATUS_LED_BOOT defined. To do so, common/board_r.c needs some way to call that routine either directly (which probably requires exposing it via status_led.h) or indirectly. For the latter, I've attached a patch that (ab)uses an invalid LED id in status_led_set() to enforce the init. Regards, B. Nortmann --- common/board_r.c | 10 +++++++--- drivers/misc/status_led.c | 7 ++++--- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 0335f6b..c67f459 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -547,11 +547,15 @@ static int initr_kgdb(void) } #endif -#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) +#ifdef CONFIG_STATUS_LED static int initr_status_led(void) { +#ifdef STATUS_LED_BOOT status_led_set(STATUS_LED_BOOT, STATUS_LED_BLINKING); - +#else + /* use invalid LED id to enforce status_led_init() */ + status_led_set(-1, 0); +#endif return 0; } #endif @@ -838,7 +842,7 @@ init_fnc_t init_sequence_r[] = { || defined(CONFIG_M68K) timer_init, /* initialize timer */ #endif -#if defined(CONFIG_STATUS_LED) && defined(STATUS_LED_BOOT) +#ifdef CONFIG_STATUS_LED initr_status_led, #endif /* PPC has a udelay(20) here dating from 2002. Why? */ diff --git a/drivers/misc/status_led.c b/drivers/misc/status_led.c index ed9adb2..4751c8d 100644 --- a/drivers/misc/status_led.c +++ b/drivers/misc/status_led.c @@ -94,12 +94,13 @@ void status_led_set (int led, int state) { led_dev_t *ld; - if (led < 0 || led >= MAX_LED_DEV) - return; - + /* reordered, allows using invalid led ID to enforce init */ if (!status_led_init_done) status_led_init (); + if (led < 0 || led >= MAX_LED_DEV) + return; + ld = &led_dev[led]; ld->state = state; -- 2.0.5

1 0

[U-Boot] Generic stubs for GPIO LEDs
by Bernhard Nortmann 28 Mar '15

28 Mar '15

For boards that support LEDs driven via GPIO (CONFIG_GPIO_LED), it may be useful to have some generic stubs (wrapper functions) for the "colored" LEDs. This allows definitions like: #define GREEN_LED_GPIO 248 /* = PH24 */ #define STATUS_LED_BIT GREEN_LED_GPIO #define STATUS_LED_STATE STATUS_LED_OFF #define STATUS_LED_PERIOD (CONFIG_SYS_HZ / 2) #define STATUS_LED_GREEN GREEN_LED_GPIO To keep this optional, it's probably best to introduce an additional configuration setting. I've chosen CONFIG_GPIO_LED_STUBS for that. Placing the code in drivers/misc/gpio_led.c also ensures that it automatically depends on CONFIG_GPIO_LED too. Regards, B. Nortmann --- drivers/misc/gpio_led.c | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/drivers/misc/gpio_led.c b/drivers/misc/gpio_led.c index 3e95727..8f3bd9b 100644 --- a/drivers/misc/gpio_led.c +++ b/drivers/misc/gpio_led.c @@ -51,3 +51,42 @@ void __led_toggle(led_id_t mask) { gpio_set_value(mask, !gpio_get_value(mask)); } + +#ifdef CONFIG_GPIO_LED_STUBS + +/* 'generic' override of colored LED stubs, to use GPIO functions instead */ + +#ifdef STATUS_LED_RED +void red_led_on(void) { + __led_set(STATUS_LED_RED, STATUS_LED_ON); +} +void red_led_off(void) { + __led_set(STATUS_LED_RED, STATUS_LED_OFF); +} +#endif +#ifdef STATUS_LED_GREEN +void green_led_on(void) { + __led_set(STATUS_LED_GREEN, STATUS_LED_ON); +} +void green_led_off(void) { + __led_set(STATUS_LED_GREEN, STATUS_LED_OFF); +} +#endif +#ifdef STATUS_LED_YELLOW +void yellow_led_on(void) { + __led_set(STATUS_LED_YELLOW, STATUS_LED_ON); +} +void yellow_led_off(void) { + __led_set(STATUS_LED_YELLOW, STATUS_LED_OFF); +} +#endif +#ifdef STATUS_LED_BLUE +void blue_led_on(void) { + __led_set(STATUS_LED_BLUE, STATUS_LED_ON); +} +void blue_led_off(void) { + __led_set(STATUS_LED_BLUE, STATUS_LED_OFF); +} +#endif + +#endif /* CONFIG_GPIO_LED_STUBS */ -- 2.0.5

1 0

[U-Boot] [PATCH] common: Fix source command on 64-bit architectures
by Thierry Reding 28 Mar '15

28 Mar '15

From: Thierry Reding <treding(a)nvidia.com> The source command uses an unsigned long to iterate over the 32-bit lengths array contained in the legacy image format. On architectures where unsigned long is 64-bit this fails to find the correct entry point of a script. Cc: Tom Rini <trini(a)konsulko.com> Signed-off-by: Thierry Reding <treding(a)nvidia.com> --- common/cmd_source.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_source.c b/common/cmd_source.c index 6881bc9ddd33..5f550a525430 100644 --- a/common/cmd_source.c +++ b/common/cmd_source.c @@ -32,7 +32,7 @@ source (ulong addr, const char *fit_uname) #if defined(CONFIG_IMAGE_FORMAT_LEGACY) const image_header_t *hdr; #endif - ulong *data; + u32 *data; int verify; void *buf; #if defined(CONFIG_FIT) @@ -73,7 +73,7 @@ source (ulong addr, const char *fit_uname) } /* get length of script */ - data = (ulong *)image_get_data (hdr); + data = (u32 *)image_get_data (hdr); if ((len = uimage_to_cpu (*data)) == 0) { puts ("Empty Script\n"); -- 2.3.2

2 1

[U-Boot] v2015.04-rc4: broken for custom TI-based board
by Peter Kuemmel 28 Mar '15

28 Mar '15

I have a custom board which boots with a patched cm_t35 configuration based on the v2015.01 release. When I update to v2015.04-rc4 the system reboots after the x-loader has read u-boot from MMC and started it. Does someone has an idea which change could be responsible for this? Many thanks, Peter

3 4

[U-Boot] [PATCH 1/3] sunxi: sun4i: add missing 912MHz clock divisors
by Iain Paton 28 Mar '15

28 Mar '15

clock divisors table was missing an entry for 912MHz. The same table is used for sun7i where the default boot clock is 912MHz, resulting in A20 boards being overclocked to 960MHz Signed-off-by: Iain Paton <ipaton0(a)gmail.com> --- arch/arm/cpu/armv7/sunxi/clock_sun4i.c | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c index 49f4032..c720e96 100644 --- a/arch/arm/cpu/armv7/sunxi/clock_sun4i.c +++ b/arch/arm/cpu/armv7/sunxi/clock_sun4i.c @@ -102,6 +102,7 @@ static struct { /* This array must be ordered by frequency. */ { PLL1_CFG(16, 0, 0, 0), 384000000 }, { PLL1_CFG(16, 1, 0, 0), 768000000 }, + { PLL1_CFG(19, 1, 0, 0), 912000000 }, { PLL1_CFG(20, 1, 0, 0), 960000000 }, { PLL1_CFG(21, 1, 0, 0), 1008000000}, { PLL1_CFG(22, 1, 0, 0), 1056000000}, -- 2.1.3

3 6