April 2017 - U-Boot

[U-Boot] DT overlay issues - dtc flags
by Andreas Färber 10 Apr '17

10 Apr '17

Hi, I've tried to play around with Device Tree overlays (.dtbo files): https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Doc… First of all, that document refers to a non-existing Documentation/devicetree/dt-object-internal.txt. Could someone please fix that one way or another? In my particular example I've tried to extend the &i2c1 and &gpio nodes of 4.11-rc5 arm64 broadcom/bcm2837-rpi-3-b.dts. The above documentation prominently claims that this can be done via target = <&foo> syntax, but U-Boot's fdt apply command fails for such a file. If instead I use the alternative target-path = "/soc/..." then it works just fine. As mentioned in the very bottom of the documentation, resolution of phandle target references requires a __symbols__ node in the base .dtb. IIUC this is only generated when passing the -@ dtc command line flag. At first I thought this were an issue with how we build the .dtb files in openSUSE [1], but by my reading of the kernel Makefiles not passing -@ in DTC_FLAGS or cmd_dtc, you should run into the exact same issue. I could think of a few ARMv7-M systems where such DT bloat might be undesired (small flash sector sizes), but then it would seem easier to suppress -@ where needed than to have a feature that by all practical means is half unusable by default. U-Boot itself appears to face a similar issue in that its internal Device Trees are built without -@, and via Alex' distro boot extensions this internal DT is passed on via UEFI as fallback when no external .dtb file is found. So in the non-SPL case the DT should probably be built with -@, too. Or am I misunderstanding something here? Thanks, Andreas [1] https://build.opensuse.org/package/view_file/Kernel:HEAD/dtb-aarch64/dtb-aa… -- SUSE Linux GmbH, Maxfeldstr. 5, 90409 Nürnberg, Germany GF: Felix Imendörffer, Jane Smithard, Graham Norton HRB 21284 (AG Nürnberg)

2 2

[U-Boot] [PATCH 1/2] fdt: Bring in changes from v1.4.4
by Simon Glass 10 Apr '17

10 Apr '17

This a few minor changes down from upstream since the last sync. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- lib/libfdt/fdt_overlay.c | 23 ++++++++++++----------- lib/libfdt/fdt_rw.c | 3 ++- lib/libfdt/fdt_strerror.c | 3 +++ 3 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/libfdt/fdt_overlay.c b/lib/libfdt/fdt_overlay.c index 56cb70ed44..ceb968786e 100644 --- a/lib/libfdt/fdt_overlay.c +++ b/lib/libfdt/fdt_overlay.c @@ -21,14 +21,14 @@ */ static uint32_t overlay_get_target_phandle(const void *fdto, int fragment) { - const uint32_t *val; + const fdt32_t *val; int len; val = fdt_getprop(fdto, fragment, "target", &len); if (!val) return 0; - if ((len != sizeof(*val)) || (*val == (uint32_t)-1)) + if ((len != sizeof(*val)) || (fdt32_to_cpu(*val) == (uint32_t)-1)) return (uint32_t)-1; return fdt32_to_cpu(*val); @@ -99,7 +99,7 @@ static int overlay_get_target(const void *fdt, const void *fdto, static int overlay_phandle_add_offset(void *fdt, int node, const char *name, uint32_t delta) { - const uint32_t *val; + const fdt32_t *val; uint32_t adj_val; int len; @@ -210,7 +210,7 @@ static int overlay_update_local_node_references(void *fdto, int ret; fdt_for_each_property_offset(fixup_prop, fdto, fixup_node) { - const uint32_t *fixup_val; + const fdt32_t *fixup_val; const char *tree_val; const char *name; int fixup_len; @@ -234,7 +234,8 @@ static int overlay_update_local_node_references(void *fdto, } for (i = 0; i < (fixup_len / sizeof(uint32_t)); i++) { - uint32_t adj_val, poffset; + fdt32_t adj_val; + uint32_t poffset; poffset = fdt32_to_cpu(fixup_val[i]); @@ -246,9 +247,7 @@ static int overlay_update_local_node_references(void *fdto, */ memcpy(&adj_val, tree_val + poffset, sizeof(adj_val)); - adj_val = fdt32_to_cpu(adj_val); - adj_val += delta; - adj_val = cpu_to_fdt32(adj_val); + adj_val = cpu_to_fdt32(fdt32_to_cpu(adj_val) + delta); ret = fdt_setprop_inplace_namelen_partial(fdto, tree_node, @@ -272,7 +271,7 @@ static int overlay_update_local_node_references(void *fdto, tree_child = fdt_subnode_offset(fdto, tree_node, fixup_child_name); - if (ret == -FDT_ERR_NOTFOUND) + if (tree_child == -FDT_ERR_NOTFOUND) return -FDT_ERR_BADOVERLAY; if (tree_child < 0) return tree_child; @@ -356,6 +355,7 @@ static int overlay_fixup_one_phandle(void *fdt, void *fdto, { const char *symbol_path; uint32_t phandle; + fdt32_t phandle_prop; int symbol_off, fixup_off; int prop_len; @@ -381,10 +381,11 @@ static int overlay_fixup_one_phandle(void *fdt, void *fdto, if (fixup_off < 0) return fixup_off; - phandle = cpu_to_fdt32(phandle); + phandle_prop = cpu_to_fdt32(phandle); return fdt_setprop_inplace_namelen_partial(fdto, fixup_off, name, name_len, poffset, - &phandle, sizeof(phandle)); + &phandle_prop, + sizeof(phandle_prop)); }; /** diff --git a/lib/libfdt/fdt_rw.c b/lib/libfdt/fdt_rw.c index 87d4030fb1..80a3212141 100644 --- a/lib/libfdt/fdt_rw.c +++ b/lib/libfdt/fdt_rw.c @@ -242,7 +242,8 @@ int fdt_setprop(void *fdt, int nodeoffset, const char *name, if (err) return err; - memcpy(prop->data, val, len); + if (len) + memcpy(prop->data, val, len); return 0; } diff --git a/lib/libfdt/fdt_strerror.c b/lib/libfdt/fdt_strerror.c index 7f8e02b1ee..f89004c609 100644 --- a/lib/libfdt/fdt_strerror.c +++ b/lib/libfdt/fdt_strerror.c @@ -36,6 +36,9 @@ static struct fdt_errtabent fdt_errtable[] = { FDT_ERRTABENT(FDT_ERR_BADVERSION), FDT_ERRTABENT(FDT_ERR_BADSTRUCTURE), FDT_ERRTABENT(FDT_ERR_BADLAYOUT), + FDT_ERRTABENT(FDT_ERR_INTERNAL), + FDT_ERRTABENT(FDT_ERR_BADNCELLS), + FDT_ERRTABENT(FDT_ERR_BADVALUE), FDT_ERRTABENT(FDT_ERR_BADOVERLAY), FDT_ERRTABENT(FDT_ERR_NOPHANDLES), }; -- 2.12.2.564.g063fe858b8-goog

1 2

[U-Boot] i.Mx6q u-boot stuck
by Fausto Sessego 10 Apr '17

10 Apr '17

Hi, i have a problem with my custom board. I created my custom u-boot and, now, i would like load automatically the kernel by CONFIG_BOOTCOMMAND. #define CONFIG_BOOTCOMMAND \ "mmc dev ${mmcdev};" \ "if mmc rescan; then " \ "echo test1; " \ "else echo test2; fi; " Because i have the "if" condition, i enabled the CONFIG_HUSH_PARSER=y into deconf file. Adding this CONFIG, the u-boot stuck CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 26C Reset cause: POR I2C: ready DRAM: gd->ram_size: 1073741824 DRAM test not implemented! 1 GiB Whitout the definition CONFIG_HUSH_PARSER=y i have the following result: CPU: Freescale i.MX6Q rev1.5 996 MHz (running at 792 MHz) CPU: Extended Commercial temperature grade (-20C to 105C) at 28C Reset cause: POR I2C: ready DRAM: gd->ram_size: 1073741824 DRAM test not implemented! 1 GiB 1 GiB MMC: FSL_SDHC: 0, FSL_SDHC: 1 *** Warning - bad CRC, using default environment In: serial Out: serial Err: serial Net: FEC [PRIME] Error: FEC address not set. Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device Unknown command 'if' - try 'help' Unknown command 'then' - try 'help' Unknown command 'else' - try 'help' Unknown command 'fi' - try 'help' Custimized_board> Why, if i enable the CONFIG_HUSH_PARSER=y, the u-boot stuck? ------------------------------ *Ing. Fausto Sessego* *R&D Hardware & Software Engineer* info mob > *Tecnologie Wireless per la logistica e la sicurezza* <http://www.infomob.it> *a:* Parco scientifico e tecnologico della Sardegna, Edificio 1 Loc. Piscinamanna - 09010 Pula (CA) <https://www.google.it/maps/place/Sardegna+Ricerche/@38.9899811,8.9280376,17…> *p:* +39 070 92432952 *e:* fausto.sessego(a)infomob.it *w:* www.infomob.it

2 3

[U-Boot] [PATCH 1/1] travis-ci: OrangePi PC2 only links with gcc-5.x or later
by Tom Rini 10 Apr '17

10 Apr '17

We disable this specific board as it does not link with the gcc-4.9.x that we use today in travis-ci. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 3dc38df9882b..591915df4c89 100644 --- a/.travis.yml +++ b/.travis.yml @@ -152,7 +152,7 @@ matrix: - env: - BUILDMAN="sun7i" - env: - - BUILDMAN="sun8i" + - BUILDMAN="sun8i -x orangepi_pc2" - env: - BUILDMAN="sun9i" - env: -- 1.9.1

1 1

[U-Boot] Please pull u-boot-x86
by Bin Meng 10 Apr '17

10 Apr '17

Hi Tom, The following changes since commit 04735a8fc45ba7c9f5b17d4837a0c649087b29e1: Merge branch 'master' of git://git.denx.de/u-boot-samsung (2017-04-08 10:20:26 -0400) are available in the git repository at: git://git.denx.de/u-boot-x86.git for you to fetch changes up to ca0d29e4f06095fd39f3125aef8f427aa1728ee5: x86: Introduce minimal PMU driver for Intel MID platforms (2017-04-10 10:02:03 +0800) ---------------------------------------------------------------- Andy Shevchenko (3): x86: Remove unused option serial: Add serial driver for Intel MID x86: Introduce minimal PMU driver for Intel MID platforms Bin Meng (2): dm: rtc: Add 16-bit read/write support tools: binman: Add missing filenames for various x86 rom tests Felipe Balbi (1): x86: Add SCU IPC driver for Intel MID platforms Stefan Roese (4): x86: Kconfig: Add options to configure the descriptor.bin / me.bin filenames x86: Add file names from Kconfig in descriptor/intel-me nodes in u-boot.dtsi binman: Remove hard-coded file name for x86 flash-descriptor & intel-me x86: bootm: Fix FIT image booting on x86 arch/x86/Kconfig | 18 +++++++++++++ arch/x86/dts/u-boot.dtsi | 2 ++ arch/x86/include/asm/cpu.h | 2 ++ arch/x86/include/asm/pmu.h | 11 ++++++++ arch/x86/include/asm/scu.h | 28 ++++++++++++++++++++ arch/x86/lib/Makefile | 2 ++ arch/x86/lib/bootm.c | 2 +- arch/x86/lib/pmu.c | 117 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ arch/x86/lib/scu.c | 168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ drivers/rtc/rtc-uclass.c | 30 ++++++++++++++++++++++ drivers/serial/Kconfig | 9 +++++++ drivers/serial/Makefile | 1 + drivers/serial/serial_intel_mid.c | 69 +++++++++++++++++++++++++++++++++++++++++++++++++ include/configs/x86-common.h | 1 - include/rtc.h | 20 +++++++++++++++ scripts/config_whitelist.txt | 1 - tools/binman/etype/intel_descriptor.py | 3 --- tools/binman/etype/intel_me.py | 3 --- tools/binman/test/30_x86-rom-me-no-desc.dts | 1 + tools/binman/test/31_x86-rom-me.dts | 2 ++ tools/binman/test/32_intel-vga.dts | 1 + tools/binman/test/42_intel-fsp.dts | 1 + tools/binman/test/43_intel-cmc.dts | 1 + 23 files changed, 484 insertions(+), 9 deletions(-) create mode 100644 arch/x86/include/asm/pmu.h create mode 100644 arch/x86/include/asm/scu.h create mode 100644 arch/x86/lib/pmu.c create mode 100644 arch/x86/lib/scu.c create mode 100644 drivers/serial/serial_intel_mid.c Regards, Bin

2 1

[U-Boot] [PATCH v3] Makefile: Fix linking with modern binutils
by Andreas Färber 10 Apr '17

10 Apr '17

From: Joel Stanley <joel(a)jms.id.au> Since Binutils 1a9ccd70f9a7[1] u-boot will not link targets that set CONFIG_SYS_TEXT_BASE=0 with the following error: LD u-boot arm-linux-gnueabi-ld.bfd: u-boot: Not enough room for program headers, try linking with -N arm-linux-gnueabi-ld.bfd: final link failed: Bad value The issue can be reproduced with the bad binutils and the rock2_defconfig target. This issue was also encountered by the powerpc kernel[2], with the fix being to pass --no-dynamic-linker for linkers newer than 2.26 when this flag was introduced. The option tells ld that the PIE or shared lib does not need loaded program headers. Ubuntu Zesty's Binutils 2.27.51.20161202 hits this error. [1] https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;a=commit;h=1a9ccd7… [2] https://git.kernel.org/cgit/linux/kernel/git/powerpc/linux.git/commit/?h=ne… Signed-off-by: Joel Stanley <joel(a)jms.id.au> [AF: Apply to LDFLAGS_$(SPL_BIN) as well, suggested by Tom Rini] Signed-off-by: Andreas Färber <afaerber(a)suse.de> --- Makefile | 4 ++++ scripts/Makefile.spl | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/Makefile b/Makefile index ca7d60d..09b597d 100644 --- a/Makefile +++ b/Makefile @@ -805,6 +805,10 @@ ALL-y += $(CONFIG_BUILD_TARGET:"%"=%) endif LDFLAGS_u-boot += $(LDFLAGS_FINAL) + +# Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. +LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker) + ifneq ($(CONFIG_SYS_TEXT_BASE),) LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE) endif diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index 760acee..eb24292 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -291,6 +291,10 @@ $(obj)/u-boot-x86-16bit-spl.bin: $(obj)/u-boot-spl FORCE $(call if_changed,objcopy) LDFLAGS_$(SPL_BIN) += -T u-boot-spl.lds $(LDFLAGS_FINAL) + +# Avoid 'Not enough room for program headers' error on binutils 2.28 onwards. +LDFLAGS_$(SPL_BIN) += $(call ld-option, --no-dynamic-linker) + ifneq ($(CONFIG_SPL_TEXT_BASE),) LDFLAGS_$(SPL_BIN) += -Ttext $(CONFIG_SPL_TEXT_BASE) endif -- 2.10.2

3 2

[U-Boot] [PATCH v4] spl: net: Add FIT image support over network boot
by Andrew F. Davis 10 Apr '17

10 Apr '17

FIT support in the net boot case is much like the RAM boot case in that we load our image to "load_addr" and pass a dummy read function into "spl_load_simple_fit()". As the load address is no longer hard-coded to the final execution address, legacy image loading will require load_addr to be set correctly in the image header. Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- Changes from v3: - Relocate legacy image according to its header Changes from v2: - Rebased on latest upstream/master Changes from v1: - move "spl_net_load_read" into #ifdef block as suggested by Vignesh common/spl/spl_net.c | 34 +++++++++++++++++++++++++++++++--- 1 file changed, 31 insertions(+), 3 deletions(-) diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c index 0fba0172ea..85fe508b17 100644 --- a/common/spl/spl_net.c +++ b/common/spl/spl_net.c @@ -11,19 +11,29 @@ #include <errno.h> #include <spl.h> #include <net.h> +#include <libfdt.h> DECLARE_GLOBAL_DATA_PTR; #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT) +static ulong spl_net_load_read(struct spl_load_info *load, ulong sector, + ulong count, void *buf) +{ + debug("%s: sector %lx, count %lx, buf %lx\n", + __func__, sector, count, (ulong)buf); + memcpy(buf, (void *)(load_addr + sector), count); + return count; +} + static int spl_net_load_image(struct spl_image_info *spl_image, struct spl_boot_device *bootdev) { + struct image_header *header = (struct image_header *)load_addr; int rv; env_init(); env_relocate(); setenv("autoload", "yes"); - load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header); rv = eth_initialize(); if (rv == 0) { printf("No Ethernet devices found\n"); @@ -36,8 +46,26 @@ static int spl_net_load_image(struct spl_image_info *spl_image, printf("Problem booting with BOOTP\n"); return rv; } - return spl_parse_image_header(spl_image, - (struct image_header *)load_addr); + + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) && + image_get_magic(header) == FDT_MAGIC) { + struct spl_load_info load; + + debug("Found FIT\n"); + load.bl_len = 1; + load.read = spl_net_load_read; + rv = spl_load_simple_fit(spl_image, &load, 0, header); + } else { + debug("Legacy image\n"); + + rv = spl_parse_image_header(spl_image, header); + if (rv) + return rv; + + memcpy((void *)spl_image->load_addr, header, spl_image->size); + } + + return rv; } #endif -- 2.11.0

2 1

[U-Boot] [PATCH 1/2] defconfigs: dra7xx_hs_evm: Move OPTEE load address to avoid overlaps
by Andrew F. Davis 10 Apr '17

10 Apr '17

From: Misael Lopez Cruz <misael.lopez(a)ti.com> Move the OPTEE load address to 0xbdb00000 in order to avoid overlap with the memory regions used in radio and RVC usecases. Signed-off-by: Misael Lopez Cruz <misael.lopez(a)ti.com> Signed-off-by: Andrew F. Davis <afd(a)ti.com> --- configs/dra7xx_hs_evm_defconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/dra7xx_hs_evm_defconfig b/configs/dra7xx_hs_evm_defconfig index f3a9c68008..e238c39c0c 100644 --- a/configs/dra7xx_hs_evm_defconfig +++ b/configs/dra7xx_hs_evm_defconfig @@ -3,7 +3,7 @@ CONFIG_OMAP54XX=y CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_TI_SECURE_DEVICE=y CONFIG_TARGET_DRA7XX_EVM=y -CONFIG_TI_SECURE_EMIF_REGION_START=0xbe000000 +CONFIG_TI_SECURE_EMIF_REGION_START=0xbdb00000 CONFIG_TI_SECURE_EMIF_TOTAL_REGION_SIZE=0x02000000 CONFIG_TI_SECURE_EMIF_PROTECTED_REGION_SIZE=0x01c00000 # CONFIG_SPL_NAND_SUPPORT is not set -- 2.11.0

2 3

[U-Boot] [PATCH v2 0/8] Update and sync HS configs
by Andrew F. Davis 10 Apr '17

10 Apr '17

Hello all, This series is a consolidation of several past series and patches. We first sync the current HS and non-HS defconfigs. Then we merge in two AM43xx defconfigs into the HS defconfig. Lastly we add a defconfig for AM335x UART boot, we cannot add UART boot to the regular defconfig due to SPL size limitations. Thanks, Andrew Andrew F. Davis (8): defconfigs: am335x_hs_evm: Sync HS and non-HS defconfigs defconfigs: am43xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: am57xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: dra7xx_hs_evm: Sync HS and non-HS defconfigs defconfigs: am43xx_hs_evm: Add Net boot mode support defconfigs: am43xx_hs_evm: Add USB client boot mode support defconfigs: am43xx_hs_evm: Add USB Host boot mode support defconfigs: Add a config for AM335x High Security EVM with UART Boot support configs/am335x_hs_evm_defconfig | 6 ++++++ ...35x_hs_evm_defconfig => am335x_hs_evm_uart_defconfig} | 16 ++++++++++++---- configs/am43xx_hs_evm_defconfig | 12 ++++++++++-- configs/am57xx_hs_evm_defconfig | 7 +++++++ configs/dra7xx_hs_evm_defconfig | 1 + 5 files changed, 36 insertions(+), 6 deletions(-) copy configs/{am335x_hs_evm_defconfig => am335x_hs_evm_uart_defconfig} (78%) -- 2.11.0

2 17

[U-Boot] [PATCH v2 00/10] Add support for secure boot on Keystone2 SoCs
by Andrew F. Davis 10 Apr '17

10 Apr '17

Hello all, This series adds support for secure Keystone2 K2E, K2G, and K2HK devices, much of the work is borrowed from the OMAP style devices as the secure workings are very similar, allowing minimal changes for this support. Thanks, Andrew Changes from v1: - Add Reviewed-bys - Add k2g_hs_evm_defconfig - Rebase on upstream/master Andrew F. Davis (2): defconfig: k2hk_hs_evm: Add k2hk_hs_evm_defconfig defconfig: k2g_hs_evm: Add k2g_hs_evm_defconfig Madan Srinivas (5): image: Fixes build warning with CONFIG_FIT_IMAGE_POST_PROCESS arm: mach-omap2: Add secure image name common to OMAP and keystone ARM: Keystone2: Build secure images for K2 doc: Updates info on using Keystone2 secure devices Kconfig: Adds SYS_TEXT_BASE config option for Keystone2 Vitaly Andrianov (3): arm: mach-keystone: Implements FIT post-processing call for keystone SoCs arm: mach-omap2: Enable Kconfig support for K2 HS devices defconfig: k2e_hs_evm: Add k2e_hs_evm_defconfig Kconfig | 2 +- arch/arm/mach-keystone/config.mk | 6 ++ arch/arm/mach-keystone/mon.c | 73 ++++++++++++++++++++++ arch/arm/mach-omap2/Kconfig | 2 +- arch/arm/mach-omap2/config_secure.mk | 6 ++ configs/k2e_evm_defconfig | 1 + .../{k2e_evm_defconfig => k2e_hs_evm_defconfig} | 15 ++--- configs/k2g_evm_defconfig | 1 + .../{k2g_evm_defconfig => k2g_hs_evm_defconfig} | 13 ++-- configs/k2hk_evm_defconfig | 1 + .../{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} | 13 ++-- configs/k2l_evm_defconfig | 1 + doc/README.ti-secure | 20 ++++++ include/image.h | 3 +- 14 files changed, 126 insertions(+), 31 deletions(-) copy configs/{k2e_evm_defconfig => k2e_hs_evm_defconfig} (78%) copy configs/{k2g_evm_defconfig => k2g_hs_evm_defconfig} (82%) copy configs/{k2hk_evm_defconfig => k2hk_hs_evm_defconfig} (80%) -- 2.11.0

4 29