July 2016 - U-Boot

[U-Boot] please pull u-boot-samsung master
by Minkyu Kang 16 Jul '16

16 Jul '16

Dear Tom, The following changes since commit 19ce924ff914f315dc2fdf79f357825c513aed6e: Prepare v2016.07 (2016-07-11 15:01:01 -0400) are available in the git repository at: git://git.denx.de/u-boot-samsung master for you to fetch changes up to 3537ee879e0428587621a2cafbad2d9982bc082b: mmc: exynos_dw_mmc: support the Driver mode for Exynos (2016-07-12 14:29:10 +0900) ---------------------------------------------------------------- Jaehoon Chung (7): ARM: exynos4: dts: add the prefix '/' for aliases nodes mmc: exynos_dw_mmc: remove the unused function mmc: exynos_dw_mmc: remove #ifdef for OF_CONTROL mmc: exynos_dw_mmc: add the error control for checking index mmc: exynos_dw_mmc: clean the unused and unnecessary codes mmc: exynos_dw_mmc: use the 4bit bus-width by default mmc: exynos_dw_mmc: support the Driver mode for Exynos arch/arm/dts/exynos4210-origen.dts | 2 +- arch/arm/dts/exynos4210-trats.dts | 4 +-- arch/arm/dts/exynos4210-universal_c210.dts | 4 +-- arch/arm/dts/exynos4412-odroid.dts | 4 +-- arch/arm/dts/exynos4412-trats2.dts | 6 ++--- arch/arm/mach-exynos/include/mach/dwmmc.h | 1 - drivers/mmc/exynos_dw_mmc.c | 148 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------------------------------------------- 7 files changed, 95 insertions(+), 74 deletions(-) -- Thanks, Minkyu Kang.

2 1

[U-Boot] [PATCH] configs: da850evm: enable bootz command
by Sekhar Nori 16 Jul '16

16 Jul '16

Enable bootz command on Texas Instruments DA850 EVM board. This helps it boot zImage with device-tree blob passed. Signed-off-by: Sekhar Nori <nsekhar(a)ti.com> --- configs/da850evm_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/configs/da850evm_defconfig b/configs/da850evm_defconfig index 0e281a5e672c..40ab975f02b9 100644 --- a/configs/da850evm_defconfig +++ b/configs/da850evm_defconfig @@ -5,6 +5,7 @@ CONFIG_SPL=y CONFIG_SYS_EXTRA_OPTIONS="MAC_ADDR_IN_SPIFLASH" CONFIG_BOOTDELAY=3 CONFIG_HUSH_PARSER=y +CONFIG_CMD_BOOTZ=y CONFIG_SYS_PROMPT="U-Boot > " # CONFIG_CMD_IMLS is not set CONFIG_CMD_ASKENV=y -- 2.9.0

3 3

[U-Boot] [PATCH] ARM: OMAP5+: Enable errata i727
by Lokesh Vutla 16 Jul '16

16 Jul '16

Errata i727 is applicable on all OMAP5 and DRA7 variants but enabled only on OMAP5 ES1.0. So, enable it on all platforms. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/cpu/armv7/omap-common/emif-common.c | 3 ++- arch/arm/cpu/armv7/omap-common/hwinit-common.c | 3 +-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm/cpu/armv7/omap-common/emif-common.c b/arch/arm/cpu/armv7/omap-common/emif-common.c index 9a9c764..2b79010 100644 --- a/arch/arm/cpu/armv7/omap-common/emif-common.c +++ b/arch/arm/cpu/armv7/omap-common/emif-common.c @@ -37,7 +37,8 @@ void set_lpmode_selfrefresh(u32 base) void force_emif_self_refresh() { set_lpmode_selfrefresh(EMIF1_BASE); - set_lpmode_selfrefresh(EMIF2_BASE); + if (!is_dra72x()) + set_lpmode_selfrefresh(EMIF2_BASE); } inline u32 emif_num(u32 base) diff --git a/arch/arm/cpu/armv7/omap-common/hwinit-common.c b/arch/arm/cpu/armv7/omap-common/hwinit-common.c index 2f9693f..f317293 100644 --- a/arch/arm/cpu/armv7/omap-common/hwinit-common.c +++ b/arch/arm/cpu/armv7/omap-common/hwinit-common.c @@ -147,8 +147,7 @@ void early_system_init(void) hw_data_init(); #ifdef CONFIG_SPL_BUILD - if (warm_reset() && - (is_omap44xx() || (omap_revision() == OMAP5430_ES1_0))) + if (warm_reset()) force_emif_self_refresh(); #endif watchdog_init(); -- 2.9.0

2 2

[U-Boot] [PATCH] mkimage: fix missing break for -p switch
by Teddy Reed 16 Jul '16

16 Jul '16

Signed-off-by: Teddy Reed <teddy.reed(a)gmail.com> --- tools/mkimage.c | 1 + 1 file changed, 1 insertion(+) diff --git a/tools/mkimage.c b/tools/mkimage.c index ff3024a..0e501f8 100644 --- a/tools/mkimage.c +++ b/tools/mkimage.c @@ -225,6 +225,7 @@ static void process_args(int argc, char **argv) params.cmdname, optarg); exit(EXIT_FAILURE); } + break; case 'q': params.quiet = 1; break; -- 2.7.4

2 2

[U-Boot] [PATCH] bootm: fixup silent Linux out of BOOTM_STATE_LOADOS state
by Hector Palacios 16 Jul '16

16 Jul '16

The function fixup_silent_linux() is called in status BOOTM_STATE_LOADOS to silence Linux if variable 'silent' is set. Currently only the 'bootm' command state machine contains BOOTM_STATE_LOADOS, but others like 'booti' or 'bootz' commands do not. This means silent Linux does not work with these commands. This patch moves the fixup_silent_linux() call out of the BOOTM_STATE_LOADOS state and into BOOTM_STATE_OS_PREP, to silence Linux independently of the used command (booti, bootm or bootz). Signed-off-by: Hector Palacios <hector.palacios(a)digi.com> --- common/bootm.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index 81a522eec348..521468c1ecd0 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -668,10 +668,6 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], goto err; else if (ret == BOOTM_ERR_OVERLAP) ret = 0; -#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY) - if (images->os.os == IH_OS_LINUX) - fixup_silent_linux(); -#endif } /* Relocate the ramdisk */ @@ -711,13 +707,19 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], return 1; } + /* Call various other states that are not generally used */ if (!ret && (states & BOOTM_STATE_OS_CMDLINE)) ret = boot_fn(BOOTM_STATE_OS_CMDLINE, argc, argv, images); if (!ret && (states & BOOTM_STATE_OS_BD_T)) ret = boot_fn(BOOTM_STATE_OS_BD_T, argc, argv, images); - if (!ret && (states & BOOTM_STATE_OS_PREP)) + if (!ret && (states & BOOTM_STATE_OS_PREP)) { +#if defined(CONFIG_SILENT_CONSOLE) && !defined(CONFIG_SILENT_U_BOOT_ONLY) + if (images->os.os == IH_OS_LINUX) + fixup_silent_linux(); +#endif ret = boot_fn(BOOTM_STATE_OS_PREP, argc, argv, images); + } #ifdef CONFIG_TRACE /* Pretend to run the OS, then run a user command */

2 1

[U-Boot] [PATCH] dragonboard410c: adding missing default addr for script and pxe boot
by Ricardo Salveti 16 Jul '16

16 Jul '16

Cc: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> Signed-off-by: Ricardo Salveti <rsalveti(a)rsalveti.net> --- include/configs/dragonboard410c.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 74a827d..1dbe219 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -126,6 +126,8 @@ REFLASH(dragonboard/u-boot.img, 8)\ "fdtfile=apq8016-sbc.dtb\0" \ "fdt_addr_r=0x83000000\0"\ "ramdisk_addr_r=0x84000000\0"\ + "scriptaddr=0x90000000\0"\ + "pxefile_addr_r=0x90100000\0"\ BOOTENV #define CONFIG_ENV_IS_NOWHERE -- 2.7.4

3 2

[U-Boot] [PATCH] dragonboard410c: prefer sdcard boot over emmc
by Ricardo Salveti 16 Jul '16

16 Jul '16

Make the external devices the preferred ones when booting the system (usb is already the first option). This allows users to easily boot custom distributions without requiring them to reflash/customize u-boot. Cc: Mateusz Kulikowski <mateusz.kulikowski(a)gmail.com> Signed-off-by: Ricardo Salveti <rsalveti(a)rsalveti.net> --- include/configs/dragonboard410c.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index 4b00922..74a827d 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -84,8 +84,8 @@ #define BOOT_TARGET_DEVICES(func) \ func(USB, usb, 0) \ - func(MMC, mmc, 0) \ func(MMC, mmc, 1) \ + func(MMC, mmc, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -- 2.7.4

4 3

[U-Boot] [PATCH 00/14] test/py: Convert vboot tests to use the test/py framework
by Simon Glass 16 Jul '16

16 Jul '16

There are a number of tests which still exist as shell scripts in U-Boot. This series converts the vboot test over, adding some functionality to the test environment as needed. A few minor changes are made to the vboot test as part of this: - fit_check_sign is used to check that an invalid signature is detected. Previously only the valid case was checked - Sandbox is adjusted to return normally from a bootm command, instead of exiting. This makes the test easier to write and seems more consistent. One observation about the test/py code. I feel it is confusing that the classes for running U-Boot commands and shell commands are named in a similar way. I would suggest renaming u_boot_utils to test_utils, or similar. Simon Glass (14): test: Add a README test: Add a simple script to run tests on sandbox sandbox: Don't exit when bootm completes test/py: Allow tests to control the sandbox device-tree file test/py: Allow RunAndLog() to return the output test/py: Provide output from exceptions with RunAndLog() test/py: Return output from run_and_log() test/py: Add an option to execute a string containing a command test/py: Provide a way to check that a command fails test/py: Add a helper to run a list of U-Boot commands tools: Add an error code when fit_handle_file() fails tools: Correct error handling in fit_image_process_hash() test/py: Fix up after the rename of CONFIG_SYS_HUSH_PARSER test: Convert the vboot test to test/py arch/sandbox/lib/bootm.c | 2 +- common/bootm_os.c | 1 + test/README | 92 +++++++++++ test/py/conftest.py | 1 + test/py/multiplexed_log.py | 10 +- test/py/tests/test_hush_if_test.py | 8 +- test/py/tests/test_vboot.py | 185 ++++++++++++++++++++++ test/{ => py/tests}/vboot/sandbox-kernel.dts | 0 test/{ => py/tests}/vboot/sandbox-u-boot.dts | 0 test/{ => py/tests}/vboot/sign-configs-sha1.its | 0 test/{ => py/tests}/vboot/sign-configs-sha256.its | 0 test/{ => py/tests}/vboot/sign-images-sha1.its | 0 test/{ => py/tests}/vboot/sign-images-sha256.its | 0 test/py/u_boot_console_base.py | 16 ++ test/py/u_boot_console_sandbox.py | 2 +- test/py/u_boot_utils.py | 39 ++++- test/run | 4 + test/vboot/.gitignore | 3 - test/vboot/vboot_test.sh | 151 ------------------ tools/fit_image.c | 4 +- tools/image-host.c | 14 +- 21 files changed, 361 insertions(+), 171 deletions(-) create mode 100644 test/README create mode 100644 test/py/tests/test_vboot.py rename test/{ => py/tests}/vboot/sandbox-kernel.dts (100%) rename test/{ => py/tests}/vboot/sandbox-u-boot.dts (100%) rename test/{ => py/tests}/vboot/sign-configs-sha1.its (100%) rename test/{ => py/tests}/vboot/sign-configs-sha256.its (100%) rename test/{ => py/tests}/vboot/sign-images-sha1.its (100%) rename test/{ => py/tests}/vboot/sign-images-sha256.its (100%) create mode 100755 test/run delete mode 100644 test/vboot/.gitignore delete mode 100755 test/vboot/vboot_test.sh -- 2.8.0.rc3.226.g39d4020

4 51

[U-Boot] [PATCH 00/14] mkimage: Tidy up error handling
by Simon Glass 16 Jul '16

16 Jul '16

There are a few problems when mkimage is provided with invalid arguments. In one case it crashes. When an invalid image type it is provided it lists the valid types, but this is not implemented for compression, architecture or OS. This series tidies this up a little, to make mkimage more friendly. Simon Glass (14): mkimage: Honour the default image type with auto-fit mkimage: Explain the auto-fit imagefile special case mkimage: Require a data file when auto-fit is used mkimage: Drop premature setting of params.fit_image_type mkimage: Drop blank line before main() image: Correct auto-fit architecture property name image: Convert the IH_... values to enums image: Create a table of information for each category image: Add a name for invalid types image: Add functions to obtain category information mkimage: Allow display of a list of any image header category mkimage: Use generic code for showing an 'image type' error mkimage: Show item lists for all categories tools: Allow building with debug enabled Kconfig | 9 +++ Makefile | 3 +- common/image.c | 87 ++++++++++++++++++++- include/image.h | 230 ++++++++++++++++++++++++++++++++++-------------------- tools/fit_image.c | 3 +- tools/mkimage.c | 69 +++++++++------- 6 files changed, 280 insertions(+), 121 deletions(-) -- 2.8.0.rc3.226.g39d4020

4 48

[U-Boot] [PATCH v2 0/3] Add generic ioremap / iounmap defines
by Masahiro Yamada 16 Jul '16

16 Jul '16

I ran Buildman for the whole series, and I did not see any regression. 01: Merge branch 'master' of git://git.denx.de/u-boot-uniphier openrisc: + openrisc-generic arc: + tb100 axs101 axs103 blackfin: + bf533-stamp cm-bf527 arm: + socfpga_is1 powerpc: + P1022DS_36BIT_NAND T2080QDS_SPIFLASH T1042RDB_PI_SPIFLASH P1010RDB-PA_36BIT_NAND P1010RDB-PB_SDCARD T1042D4RDB_NAND T4240RDB_SDCARD P1010RDB-PB_36BIT_NAND P1022DS_36BIT_SDCARD P1010RDB-PB_36BIT_SDCARD P1022DS_NAND T4160QDS_NAND T1042RDB_PI_NAND T2080RDB_NAND P1022DS_SDCARD T1042RDB_PI_SDCARD T2081QDS_NAND T4160QDS_SDCARD T2080QDS_SDCARD T4240QDS_SDCARD P1010RDB-PA_SPIFLASH T1040RDB_SDCARD B4860QDS_NAND P1010RDB-PA_36BIT_SDCARD T1040D4RDB_SDCARD T1040D4RDB_SPIFLASH T2080QDS_NAND T1040D4RDB_NAND P1010RDB-PB_SPIFLASH P1010RDB-PA_NAND T1040RDB_SPIFLASH kmcoge4 T2081QDS_SDCARD T2081QDS_SPIFLASH T4240QDS_NAND B4420QDS_NAND T1040RDB_NAND P1010RDB-PA_SDCARD T2080RDB_SPIFLASH P1010RDB-PB_NAND T1042D4RDB_SPIFLASH P1022DS_SPIFLASH T1042D4RDB_SDCARD kmlion1 P1022DS_36BIT_SPIFLASH P1010RDB-PB_36BIT_SPIFLASH T2080RDB_SDCARD P1010RDB-PA_36BIT_SPIFLASH [snip lots of error messages we have in the mainline] 02: types.h: move and redefine resource_size_t 03: arm, nds32, sh: remove useless ioremap()/iounmap() defines 04: linux/io.h: add generic ioremap()/iounmap() defines Changes in v2: - Use #ifndef CONFIG_HAVE_ARCH_IOREMAP instead of #ifndef CONFIG_MIPS Masahiro Yamada (3): types.h: move and redefine resource_size_t arm, nds32, sh: remove useless ioremap()/iounmap() defines linux/io.h: add generic ioremap()/iounmap() defines arch/Kconfig | 4 ++++ arch/arm/include/asm/io.h | 34 ---------------------------------- arch/arm/include/asm/types.h | 1 - arch/nds32/include/asm/io.h | 34 ---------------------------------- arch/sh/include/asm/io.h | 33 --------------------------------- include/linux/io.h | 16 ++++++++++++++++ include/linux/types.h | 4 ++++ 7 files changed, 24 insertions(+), 102 deletions(-) -- 1.9.1

4 8