October 2015 - U-Boot

[U-Boot] [PATCH v2 00/10] vexpress64 FVP and Juno configuration updates
by Ryan Harkin 01 Oct '15

01 Oct '15

This patch series updates the default configuration of the vexpress64 FVP and Juno platforms to allow it to work on a variety of setups without modification by the user. [PATCH v2 01/10] vexpress64: fix checkpatch warnings [PATCH v2 02/10] vexpress64: Kconfig: tidy up [PATCH v2 03/10] vexpress64: increase max gunzip size [PATCH v2 04/10] vexpress64: fvp dram: add DRAM configuration [PATCH v2 05/10] vexpress64: juno: add androidboot.hardware=juno [PATCH v2 06/10] common/armflash: add command to check if image exists [PATCH v2 07/10] common/armflash: load_image returns success or failure [PATCH v2 08/10] vexpress64: juno: add optional initrd [PATCH v2 09/10] vexpress64: juno: add alternate kernel and device tree [PATCH v2 10/10] vexpress64: juno: use /dev/sda2 arch/arm/Kconfig | 4 ++++ board/armltd/vexpress64/Kconfig | 17 ----------------- board/armltd/vexpress64/MAINTAINERS | 5 +++++ common/cmd_armflash.c | 31 ++++++++++++++++++++++++++----- configs/vexpress_aemv8a_dram_defconfig | 19 +++++++++++++++++++ include/configs/vexpress_aemv8a.h | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 6 files changed, 107 insertions(+), 30 deletions(-) Changes since v1: - dropped the Kconfig changes for CONFIG_SYS_BOOTM_LEN - added CONFIG_SYS_BOOTM_LEN to include/configs/vexpress_aemv8a.h

1 11

[U-Boot] [PATCH] rockchip: Reconfigure the malloc based to point to system memory
by Sjoerd Simons 01 Oct '15

01 Oct '15

When malloc_base initially gets setup in the SPL it is based on the current (early) stack pointer, which for rockchip is pointing into SRAM. This means simple memory allocations happen in SRAM space, which is somewhat unfortunate. Specifically a bounce buffer for the mmc allocated in SRAM space seems to cause the mmc engine to stall/fail causing timeouts and a failure to load the main u-boot image. To resolve this, reconfigure the malloc_base to start at the relocated stack pointer after DRAM has been setup. For reference, things did work fine on rockchip before 596380db was merged to fix memalign_simple due to a combination of rockchip SDRAM starting at address 0 and the dw_mmc driver not checking errors from bounce_buffer_start. As a result, when a bounce buffer needed to be allocated mem_align simple would fail and return NULL. The mmc driver ignored the error and happily continued with the bounce buffer address being set to 0, which just happened to work fine.. Signed-off-by: Sjoerd Simons <sjoerd.simons(a)collabora.co.uk> --- A potentially better fix for this issue would be to reconfigure the malloc_base in spl_relocate_stack_gd following the same steps as is done for the initial setup. However at this point in the release cycle i preferred to do a minimal rockchip only fix (so those boards become bootable again) for this issue to minimize the potential impact on other boards. arch/arm/mach-rockchip/board-spl.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm/mach-rockchip/board-spl.c b/arch/arm/mach-rockchip/board-spl.c index a241d96..5daced7 100644 --- a/arch/arm/mach-rockchip/board-spl.c +++ b/arch/arm/mach-rockchip/board-spl.c @@ -217,6 +217,10 @@ void board_init_f(ulong dummy) debug("DRAM init failed: %d\n", ret); return; } + + /* Now that DRAM is initialized setup base pointer for simple malloc + * into RAM */ + gd->malloc_base = CONFIG_SPL_STACK_R_ADDR; } static int setup_led(void) -- 2.5.3

2 3

[U-Boot] [PATCH v2] arm, at91: small updates for the smartweb board
by Heiko Schocher 01 Oct '15

01 Oct '15

- add CONFIG_BOOT_RETRY_TIME to 30 - fex LED colors - fix button pressed combination - add CONFIG_USB_HOST_ETHER CONFIG_USB_ETHER_ASIX CONFIG_USB_ETHER_MCS7830 Signed-off-by: Heiko Schocher <hs(a)denx.de> Signed-off-by: Matthias Michel <matthias.michel(a)siemens.com> --- $ ./tools/buildman/buildman -b 20150923 at91 WARNING: no status info for 'dra72_evm' WARNING: no maintainers for 'dra72_evm' WARNING: no status info for 'am335x_gp_evm' WARNING: no maintainers for 'am335x_gp_evm' WARNING: no status info for 'hikey' WARNING: no maintainers for 'hikey' Building 5 commits for 61 boards (8 threads, 1 job per thread) Cloning repo for thread 0 Cloning repo for thread 1 Cloning repo for thread 2 Cloning repo for thread 3 Cloning repo for thread 4 Cloning repo for thread 5 Cloning repo for thread 6 Cloning repo for thread 7 305 0 0 /305 axm Changes in v2: - add comments from Andreas Biessmann: remove CONFIG_SYS_PROMPT from board config file as CONFIG_SYS_PROMPT is already defined in smartweb_defconfig. board/siemens/smartweb/smartweb.c | 25 ++++++++++++++----------- include/configs/smartweb.h | 4 ++++ 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/board/siemens/smartweb/smartweb.c b/board/siemens/smartweb/smartweb.c index 2d42488..d82f1b7 100644 --- a/board/siemens/smartweb/smartweb.c +++ b/board/siemens/smartweb/smartweb.c @@ -90,7 +90,8 @@ static void smartweb_macb_hw_init(void) pin_to_mask(AT91_PIN_PA17) | pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA26) | - pin_to_mask(AT91_PIN_PA28), + pin_to_mask(AT91_PIN_PA28) | + pin_to_mask(AT91_PIN_PA29), &pioa->pudr); at91_phy_reset(); @@ -101,7 +102,8 @@ static void smartweb_macb_hw_init(void) pin_to_mask(AT91_PIN_PA17) | pin_to_mask(AT91_PIN_PA25) | pin_to_mask(AT91_PIN_PA26) | - pin_to_mask(AT91_PIN_PA28), + pin_to_mask(AT91_PIN_PA28) | + pin_to_mask(AT91_PIN_PA29), &pioa->puer); /* Initialize EMAC=MACB hardware */ @@ -141,13 +143,6 @@ int board_early_init_f(void) int board_init(void) { - /* Adress of boot parameters */ - gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; - - smartweb_nand_hw_init(); -#ifdef CONFIG_MACB - smartweb_macb_hw_init(); -#endif /* power LED red */ at91_set_gpio_output(AT91_PIN_PC6, 0); at91_set_gpio_output(AT91_PIN_PC7, 1); @@ -163,6 +158,13 @@ int board_init(void) at91_udc_probe(&board_udc_data); #endif + /* Adress of boot parameters */ + gd->bd->bi_boot_params = CONFIG_SYS_SDRAM_BASE + 0x100; + + smartweb_nand_hw_init(); +#ifdef CONFIG_MACB + smartweb_macb_hw_init(); +#endif return 0; } @@ -197,6 +199,7 @@ void matrix_init(void) void spl_board_init(void) { + /* power LED orange */ at91_set_gpio_output(AT91_PIN_PC6, 1); at91_set_gpio_output(AT91_PIN_PC7, 1); /* alarm LED orange */ @@ -212,8 +215,8 @@ void spl_board_init(void) /* check if both button are pressed */ if (at91_get_gpio_value(AT91_PIN_PA28) == 0 && - at91_get_gpio_value(AT91_PIN_PA29) == 0) { - debug("Recovery button pressed\n"); + at91_get_gpio_value(AT91_PIN_PA29) == 0) { + smartweb_nand_hw_init(); nand_init(); spl_nand_erase_one(0, 0); } diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index d189c3f..e11c016 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -117,6 +117,9 @@ * */ #define CONFIG_MACB +#define CONFIG_USB_HOST_ETHER +#define CONFIG_USB_ETHER_ASIX +#define CONFIG_USB_ETHER_MCS7830 #define CONFIG_RMII /* use reduced MII inteface */ #define CONFIG_NET_RETRY_COUNT 20 /* # of DHCP/BOOTP retries */ #define CONFIG_AT91_WANTS_COMMON_PHY @@ -182,6 +185,7 @@ /* General Boot Parameter */ #define CONFIG_BOOTDELAY 3 #define CONFIG_BOOTCOMMAND "run flashboot" +#define CONFIG_BOOT_RETRY_TIME 30 #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_PBSIZE \ -- 2.1.0

2 1

[U-Boot] [PATCH] ARM: at91: sama5: add support for CONFIG_ENV_IS_IN_MMC
by Josh Wu 01 Oct '15

01 Oct '15

If defined CONFIG_ENV_IS_IN_MMC, then u-boot environment is saved in mmc's raw sectors. Otherwise, u-boot environment is saved as a file: uboot.env. Signed-off-by: Josh Wu <josh.wu(a)atmel.com> --- include/configs/at91-sama5_common.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index 3d6b0ae..a5990ce 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -53,6 +53,13 @@ #define CONFIG_CMD_DHCP #ifdef CONFIG_SYS_USE_MMC + +#ifdef CONFIG_ENV_IS_IN_MMC +/* Use raw reserved sectors to save environment */ +#define CONFIG_ENV_OFFSET 0x2000 +#define CONFIG_ENV_SIZE 0x1000 +#define CONFIG_SYS_MMC_ENV_DEV 0 +#else /* u-boot env in sd/mmc card */ #define CONFIG_ENV_IS_IN_FAT #define CONFIG_FAT_WRITE @@ -60,6 +67,7 @@ #define FAT_ENV_DEVICE_AND_PART "0" #define FAT_ENV_FILE "uboot.env" #define CONFIG_ENV_SIZE 0x4000 +#endif #define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \ "setenv dtb_name at91-${board_name}.dtb; " \ -- 1.9.1

3 2