May 2015 - U-Boot

[U-Boot] [PATCH] vexpress64: use uncompressed kernel by default
by Linus Walleij 28 May '15

28 May '15

The foundation model (FVP) emulator nominally boots using a clean, uncompressed kernel and the "booti" command. Augment the default U-Boot script to do this. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/vexpress_aemv8a.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index 2b41fc5e361e..f7bb7236b73d 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -220,7 +220,7 @@ #elif CONFIG_TARGET_VEXPRESS64_BASE_FVP #define CONFIG_EXTRA_ENV_SETTINGS \ - "kernel_name=uImage\0" \ + "kernel_name=Image\0" \ "kernel_addr=0x80000000\0" \ "initrd_name=ramdisk.img\0" \ "initrd_addr=0x88000000\0" \ @@ -234,11 +234,11 @@ "loglevel=9" #define CONFIG_BOOTCOMMAND "smhload ${kernel_name} ${kernel_addr}; " \ - "smhload ${fdt_name} $fdt_addr; " \ - "smhload ${initrd_name} $initrd_addr initrd_end; " \ - "fdt addr $fdt_addr; fdt resize; " \ - "fdt chosen $initrd_addr $initrd_end; " \ - "bootm $kernel_addr - $fdt_addr" + "smhload ${fdt_name} ${fdt_addr}; " \ + "smhload ${initrd_name} ${initrd_addr} initrd_end; " \ + "fdt addr ${fdt_addr}; fdt resize; " \ + "fdt chosen ${initrd_addr} ${initrd_end}; " \ + "booti $kernel_addr - $fdt_addr" #define CONFIG_BOOTDELAY 1 -- 1.9.3

2 1

[U-Boot] [PATCH] kbuild: define DO_DEPS_ONLY for u-boot.cfg to fix build error
by Masahiro Yamada 28 May '15

28 May '15

Since 741e58e0fc8e (Create a .cfg file containing the CONFIG options used to build), all the Blackfin boards fail to build if the parallel (-j) option is passed. $ make -s bf506f-ezkit_defconfig # # configuration written to .config # $ make -j8 CROSS_COMPILE=bfin-elf- scripts/kconfig/conf --silentoldconfig Kconfig CHK include/config.h UPD include/config.h GEN include/autoconf.mk GEN include/autoconf.mk.dep CHK include/config/uboot.release CHK include/generated/timestamp_autogenerated.h UPD include/generated/timestamp_autogenerated.h CFG u-boot.cfg include/asm-offsets.h:3:43: fatal error: generated/generic-asm-offsets.h: No such file or directory compilation terminated. make: *** [u-boot.cfg] Error 1 When parsing header files for defined CONFIG options, DO_DEPS_ONLY must be defined to exclude generated headers that might not have been available yet. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Makefile | 2 +- scripts/Makefile.spl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bc47d98..da8cb05 100644 --- a/Makefile +++ b/Makefile @@ -876,7 +876,7 @@ endif # Create a file containing the configuration options the image was built with quiet_cmd_cpp_cfg = CFG $@ cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ - -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $< + -DDO_DEPS_ONLY -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $< MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index ea67137..fd572f4 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -167,7 +167,7 @@ all: $(ALL-y) quiet_cmd_cpp_cfg = CFG $@ cmd_cpp_cfg = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ - -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $< + -DDO_DEPS_ONLY -D__ASSEMBLY__ -x assembler-with-cpp -P -dM -E -o $@ $< $(obj)/$(SPL_BIN).cfg: include/config.h $(call if_changed,cpp_cfg) -- 1.9.1

3 2

[U-Boot] [PATCH] meminfo cmd: Enable printing >=4GiB SDRAM sizes
by andrew＠bradfordembedded.com 28 May '15

28 May '15

From: Andrew Bradford <andrew.bradford(a)kodakalaris.com> gd->ram_size is stored as phys_size_t type which can be bigger than an unsigned long on some architectures. When using unsigned long type, SDRAM of 4GiB or larger will not print the correct size, but using phys_size_t will. Signed-off-by: Andrew Bradford <andrew.bradford(a)kodakalaris.com> --- common/cmd_mem.c | 2 +- include/common.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/common/cmd_mem.c b/common/cmd_mem.c index 2e85d53..43c3fb6 100644 --- a/common/cmd_mem.c +++ b/common/cmd_mem.c @@ -1325,7 +1325,7 @@ U_BOOT_CMD( #endif #ifdef CONFIG_CMD_MEMINFO -__weak void board_show_dram(ulong size) +__weak void board_show_dram(phys_size_t size) { puts("DRAM: "); print_size(size, "\n"); diff --git a/include/common.h b/include/common.h index d4d704a..ea5aeb0 100644 --- a/include/common.h +++ b/include/common.h @@ -274,7 +274,7 @@ __weak int arch_reserve_stacks(void); * * @param size Size of DRAM (which should be displayed along with other info) */ -void board_show_dram(ulong size); +void board_show_dram(phys_size_t size); /** * arch_fixup_fdt() - Write arch-specific information to fdt -- 1.9.1

2 1

[U-Boot] spl: spl_mmc: Error and count distinction
by Paul Kocialkowski 28 May '15

28 May '15

My previous commit: spl: spl_mmc: Clearer structure in spl_mmc_load_image and cosmetics introduced a regression due to a wrongly-checked return code, that represented a read bytes count and not an error. This was fixed by commit: spl: spl_mmc: fix mmc Falcon mode regression This commit aims to clarify whether each return code is a read bytes count or an error in order to avoid such mistakes in the future. It applies on top of: spl: spl_mmc: fix mmc Falcon mode regression

3 3

[U-Boot] [PATCH v4 0/4] New tag for Flattened Image Trees (FIT) - Booting Xen from a FIT.
by Karl Apsite 28 May '15

28 May '15

The FIT config now supports a tag named "loadables:" which is a comma separated list. Users can add any number of images to the list, and u-boot will move the selected binaries to their listed load_addresses. This allows u-boot to boot xen from using an FIT configuration. Xen expects a kernel to be placed at a predetermined location, however the "kernel" field was already filled by xen itself. This change allows the user to move the required binary before xen boots, all within the FIT's configuration. Changes in v4: - Corrected capitalization on "U-Boot" - A couple lines were corrected to respect the 78 column limit - Correct a comment to use the suggested style - Forgot to remove an extra printline that I tossed in while I was writing the tests. It's gone now. Changes in v3: - Moved the documentation about the loadables field from the commit message, to a new example.its file in doc/uImage.FIT/ doc/uImage.FIT/multi-with-loadables.its - Removed a couple zealous puts->printf conversions - Replaced an instance of puts I mistakenly included with printf - Moved the commit that adds the test to the end of patch-stack Karl Apsite (4): mkimage will now report information about loadable add boot_get_loadables() to load listed images Combine bootm_find_<thing> functions together add test for two 'loadables' common/bootm.c | 45 +++++++++-------- common/cmd_bootm.c | 4 +- common/image-fit.c | 27 +++++++++- common/image.c | 71 ++++++++++++++++++++++++++ doc/uImage.FIT/multi-with-loadables.its | 89 +++++++++++++++++++++++++++++++++ doc/uImage.FIT/source_file_format.txt | 4 ++ include/bootm.h | 2 +- include/bootstage.h | 1 + include/image.h | 28 ++++++++++- test/image/test-fit.py | 72 ++++++++++++++++++++++---- 10 files changed, 309 insertions(+), 34 deletions(-) create mode 100644 doc/uImage.FIT/multi-with-loadables.its -- 2.3.7

3 12

[U-Boot] [PATCH] powerpc: gitignore: ignore PowerPC DTBs
by Masahiro Yamada 28 May '15

28 May '15

Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/powerpc/dts/.gitignore | 1 + 1 file changed, 1 insertion(+) create mode 100644 arch/powerpc/dts/.gitignore diff --git a/arch/powerpc/dts/.gitignore b/arch/powerpc/dts/.gitignore new file mode 100644 index 0000000..b60ed20 --- /dev/null +++ b/arch/powerpc/dts/.gitignore @@ -0,0 +1 @@ +*.dtb -- 1.9.1

2 1

[U-Boot] [PATCHv2] tools: use pkg-config when available to get SSL flags
by Thomas Petazzoni 28 May '15

28 May '15

Instead of hardcoding -lssl -lcrypto as the flags needed to build mkimage with FIT signature enabled, use pkg-config when available. This allows to properly support cases where static linking is used, which requires linking with -lz, since OpenSSL uses zlib internally. We gracefully fallback on the previous behavior of hardcoding -lssl -lcrypto if pkg-config is not available or fails with an error. Signed-off-by: Thomas Petazzoni <thomas.petazzoni(a)free-electrons.com> --- Changes since v1: - Use both libssl and libcrypto when calling pkg-config, because some symbols of libcrypto are used directly by u-boot. This wasn't visible with static linking because -lssl -lcrypto are returned by pkg-config, but was visible with dynamic linking since only -lssl was returned by pkg-config. tools/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/Makefile b/tools/Makefile index 4bbb153..8ff9c2e 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -122,7 +122,8 @@ endif # MXSImage needs LibSSL ifneq ($(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_FIT_SIGNATURE),) -HOSTLOADLIBES_mkimage += -lssl -lcrypto +HOSTLOADLIBES_mkimage += \ + $(shell pkg-config --libs libssl libcrypto 2> /dev/null || echo "-lssl -lcrypto") endif HOSTLOADLIBES_dumpimage := $(HOSTLOADLIBES_mkimage) -- 2.1.0

2 1

[U-Boot] [PATCH v2] include: introduce include/linux/io.h as a wrapper of asm/io.h
by Masahiro Yamada 28 May '15

28 May '15

In the latest Linux coding style, <linux/io.h> should be included rather than <asm/io.h>. To follow this standard also in U-Boot, add include/linux/io.h. Currently, it just includes <asm/io.h>. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- Changes in v2: - Fix a typo s/introcude/introduce/ - Remove a redundant whitespace include/linux/io.h | 10 ++++++++++ 1 file changed, 10 insertions(+) create mode 100644 include/linux/io.h diff --git a/include/linux/io.h b/include/linux/io.h new file mode 100644 index 0000000..1b36a22 --- /dev/null +++ b/include/linux/io.h @@ -0,0 +1,10 @@ +/* + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef _LINUX_IO_H +#define _LINUX_IO_H + +#include <asm/io.h> + +#endif /* _LINUX_IO_H */ -- 1.9.1

2 1

[U-Boot] [PATCH] vexpress64: let Juno wait for root device
by Linus Walleij 28 May '15

28 May '15

The Juno reference design typically plugs the root FS on a USB stick. We need to wait a bit for the root to appear so tell this on the default command line. Signed-off-by: Linus Walleij <linus.walleij(a)linaro.org> --- include/configs/vexpress_aemv8a.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index e9d9ae3a88be..2b41fc5e361e 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -206,6 +206,7 @@ /* Assume we boot with root on the first partition of a USB stick */ #define CONFIG_BOOTARGS "console=ttyAMA0,115200n8 " \ "root=/dev/sda1 rw " \ + "rootwait "\ "earlyprintk=pl011,0x7ff80000 debug user_debug=31 "\ "loglevel=9" -- 1.9.3

2 2

[U-Boot] [PATCH] beagle-xm: gpio_63 fix wrong pin initialization
by Evgeniy Dushistov 28 May '15

28 May '15

DM3730 CPU used on beagleboard-xm doesn't have any gpio multiplexed with wait0 pin, but gpio_63 multiplexed with wait1, so it looks like typo. At current form it has no sense, because of wait0 have no function "4". Signed-off-by: Evgneiy A. Dushistov <dushistov(a)mail.ru> --- board/ti/beagle/beagle.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h index 6dd2ffe..86bd6e9 100644 --- a/board/ti/beagle/beagle.h +++ b/board/ti/beagle/beagle.h @@ -375,7 +375,7 @@ const omap3_sysinfo sysinfo = { #define MUX_BEAGLE_XM() \ MUX_VAL(CP(GPMC_NCS5), (IDIS | PTD | EN | M4)) /*GPIO_56*/\ - MUX_VAL(CP(GPMC_WAIT0), (IDIS | PTU | EN | M4)) /*GPIO_63*/\ + MUX_VAL(CP(GPMC_WAIT1), (IDIS | PTU | EN | M4)) /*GPIO_63*/\ MUX_VAL(CP(MMC1_DAT7), (IDIS | PTU | EN | M4)) /*GPIO_129*/\ MUX_VAL(CP(HDQ_SIO), (IDIS | PTU | EN | M4)) /*GPIO_170*/\ MUX_VAL(CP(MCBSP3_DX), (IEN | PTD | DIS | M4)) /*GPIO_140*/\ -- 2.0.5 -- /Evgeniy

2 1