September 2016 - U-Boot

[U-Boot] [PATCH 1/2] ARM: keystone2: Add support for parsing monitor header
by Lokesh Vutla 03 Oct '16

03 Oct '16

Given that boot monitor image is being generated to a specific target location depending on the SoC and U-boot relies on addr_mon env variable to be aligned with boot monitor target location. When ever the target address gets updated in boot monitor, it is difficult to sync between u-boot and boot monitor and also there is no way to update user that boot monitor image is updated. To avoid this problem, boot monitor image is being generated with mkimage header. Adding support in mon_install command for parsing this header. Signed-off-by: Suman Anna <s-anna(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-keystone/cmd_mon.c | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-keystone/cmd_mon.c b/arch/arm/mach-keystone/cmd_mon.c index 6a9bdc9..591e758 100644 --- a/arch/arm/mach-keystone/cmd_mon.c +++ b/arch/arm/mach-keystone/cmd_mon.c @@ -9,14 +9,16 @@ #include <common.h> #include <command.h> +#include <image.h> #include <mach/mon.h> asm(".arch_extension sec\n\t"); static int do_mon_install(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - u32 addr, dpsc_base = 0x1E80000, freq; + u32 addr, dpsc_base = 0x1E80000, freq, load_addr, size; int rcode = 0; + struct image_header *header; if (argc < 2) return CMD_RET_USAGE; @@ -25,9 +27,21 @@ static int do_mon_install(cmd_tbl_t *cmdtp, int flag, int argc, addr = simple_strtoul(argv[1], NULL, 16); - rcode = mon_install(addr, dpsc_base, freq); - printf("## installed monitor, freq [%d], status %d\n", - freq, rcode); + header = (struct image_header *)addr; + + if (image_get_magic(header) != IH_MAGIC) { + printf("## Please update monitor image\n"); + return -EFAULT; + } + + load_addr = image_get_load(header); + size = image_get_data_size(header); + memcpy((void *)load_addr, (void *)(addr + sizeof(struct image_header)), + size); + + rcode = mon_install(load_addr, dpsc_base, freq); + printf("## installed monitor @ 0x%x, freq [%d], status %d\n", + load_addr, freq, rcode); return 0; } -- 2.9.3

2 2

[U-Boot] [PATCH] keystone2: k2g: add env script to load firmware initramfs as part of boot flow
by Lokesh Vutla 03 Oct '16

03 Oct '16

From: Murali Karicheri <m-karicheri2(a)ti.com> On K2G, the PCIe SerDes h/w is a re-use from other K2 devices and SerDes driver requires a firmware image to initialize the SerDes h/w device. This is firmware is part of the initramfs file that is loaded to memory in u-boot and passed to kernel as in other K2 platforms. This patch customize the u-boot env to have this done automatically when the K2G EVM boots up. With this, a user may be able to boot the EVM with a standard PCIe card at the x1 PCIe slot and release image and test PCIe devices such as NIC, SATA etc. Signed-off-by: Murali Karicheri <m-karicheri2(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- include/configs/k2g_evm.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 71b0037..d73543f 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -18,6 +18,7 @@ #define CONFIG_EXTRA_ENV_KS2_BOARD_SETTINGS \ DEFAULT_MMC_TI_ARGS \ DEFAULT_PMMC_BOOT_ENV \ + DEFAULT_FW_INITRAMFS_BOOT_ENV \ "boot=mmc\0" \ "console=ttyS0,115200n8\0" \ "bootpart=0:2\0" \ @@ -31,6 +32,8 @@ "name_ubi=k2g-evm-ubifs.ubi\0" \ "name_uboot=u-boot-spi-k2g-evm.gph\0" \ "init_mmc=run args_all args_mmc\0" \ + "init_fw_rd_mmc=load mmc ${bootpart} ${rdaddr} " \ + "${bootdir}/${name_fw_rd}; run set_rd_spec\0" \ "soc_variant=k2g\0" \ "get_fdt_mmc=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${name_fdt}\0"\ "get_kern_mmc=load mmc ${bootpart} ${loadaddr} " \ @@ -40,7 +43,8 @@ #define CONFIG_BOOTCOMMAND \ "run envboot; " \ - "run set_name_pmmc init_${boot} get_pmmc_${boot} run_pmmc " \ + "run set_name_pmmc init_${boot} init_fw_rd_${boot} " \ + "get_pmmc_${boot} run_pmmc " \ "get_fdt_${boot} get_mon_${boot} get_kern_${boot} " \ "run_mon run_kern" -- 2.9.3

2 2

[U-Boot] [PATCH 0/2] board: k2g: Enable ECC support
by Lokesh Vutla 03 Oct '16

03 Oct '16

This series enables ECC support on k2g-evm. Lokesh Vutla (2): board: ks2: Enable ECC using detected DDR size board: k2g: Enable ECC byte lane arch/arm/mach-keystone/ddr3.c | 3 +-- board/ti/ks2_evm/board.c | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) -- 2.9.3

2 6

[U-Boot] [PATCH v2 0/4] Fastboot MBR and generic partition support
by Petr Kulhavy 03 Oct '16

03 Oct '16

This set extends the Fastboot implementation from GPT-only to any partition support. Further it adds a special target "mbr" (configurable) to write the DOS MBR. Version 2: Add a fourth patch into the set to move CONFIG_FASTBOOT_GPT_NAME and CONFIG_FASTBOOT_MBR_NAME into cmd/fastboot/Kconfig Petr Kulhavy (4): disk: part: implement generic function part_get_info_by_name() fastboot: add support for writing MBR disk: part: refactor generic name creation for DOS and ISO fastboot: move FASTBOOT_FLASH options into Kconfig README | 9 +++++- cmd/fastboot/Kconfig | 24 ++++++++++++++++ common/fb_mmc.c | 41 +++++++++++++++++++-------- disk/part.c | 58 +++++++++++++++++++++++++++++++++++++ disk/part_amiga.c | 1 + disk/part_dos.c | 52 +++++++++++++++------------------- disk/part_efi.c | 20 +------------ disk/part_iso.c | 26 ++--------------- disk/part_mac.c | 1 + doc/README.android-fastboot | 38 +++++++++++++++++++++++++ include/part.h | 69 +++++++++++++++++++++++++++++++++++++-------- include/part_efi.h | 1 - 12 files changed, 243 insertions(+), 97 deletions(-) -- 2.7.4

4 18

[U-Boot] [RFC v2] bootm: fix passing argc to standalone apps
by Zubair Lutfullah Kakakhel 03 Oct '16

03 Oct '16

This bug appears in b6396403 which makes u-boot unable to pass arguments via bootm to a standalone application without this patch. Steps to reproduce. Compile a u-boot. Use mkimage to package the standalone hello_world.bin file. e.g. For the MIPS Boston platform mkimage -n "hello" -A mips -O u-boot -C none -T standalone \ -a 0xffffffff80200000 -d hello_world.bin \ -ep 0xffffffff80200000 hello_out Then tftp hello_out and run it using boston # dhcp 192.168.154.45:hello_out ... boston # bootm $loadaddr 123 321 Without the patch the following output is observed. boston # bootm $loadaddr 123 321 Image Name: hello Image Type: MIPS U-Boot Standalone Program (uncompressed) Data Size: 1240 Bytes = 1.2 KiB Load Address: 80200000 Entry Point: 80200000 Verifying Checksum ... OK Loading Standalone Program ... OK Example expects ABI version 8 Actual U-Boot ABI version 8 Hello World argc = 0 argv[0] = "0xffffffff88000000" With the patch, you see the following. boston # bootm $loadaddr 123 321 Image Name: hello Image Type: MIPS U-Boot Standalone Program (uncompressed) Data Size: 1240 Bytes = 1.2 KiB Load Address: 80200000 Entry Point: 80200000 Verifying Checksum ... OK Loading Standalone Program ... OK Example expects ABI version 8 Actual U-Boot ABI version 8 Hello World argc = 3 argv[0] = "0xffffffff88000000" argv[1] = "123" argv[2] = "321" argv[3] = "<NULL>" Without the patch, the go command at the entry point seems to work. boston # go 0xffffffff80200000 123 321 Example expects ABI version 8 Actual U-Boot ABI version 8 Hello World argc = 3 argv[0] = "0xffffffff80200000" argv[1] = "123" argv[2] = "321" argv[3] = "<NULL>" Hit any key to exit ... Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel(a)imgtec.com> --- Tested on the MIPS Boston platform. --- common/bootm.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/common/bootm.c b/common/bootm.c index e6da551..a26ada4 100644 --- a/common/bootm.c +++ b/common/bootm.c @@ -602,10 +602,8 @@ int do_bootm_states(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[], if (!ret && (states & BOOTM_STATE_FINDOS)) ret = bootm_find_os(cmdtp, flag, argc, argv); - if (!ret && (states & BOOTM_STATE_FINDOTHER)) { + if (!ret && (states & BOOTM_STATE_FINDOTHER)) ret = bootm_find_other(cmdtp, flag, argc, argv); - argc = 0; /* consume the args */ - } /* Load the OS */ if (!ret && (states & BOOTM_STATE_LOADOS)) { -- 1.9.1

3 4

[U-Boot] [PATCH 1/2] sandbox, x86: select DM_KEYBOARD instead of default y entry
by Masahiro Yamada 03 Oct '16

03 Oct '16

Once we migrate to DM-based drivers, we cannot go back to legacy ones, i.e. config options like DM_* are not user-configurable. Make SANDBOX and X86 select DM_KEYBOARD like other platforms do. Signed-off-by: Masahiro Yamada <yamada.masahiro(a)socionext.com> --- arch/Kconfig | 2 ++ arch/sandbox/Kconfig | 3 --- arch/x86/Kconfig | 3 --- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/arch/Kconfig b/arch/Kconfig index d718a68..ffc7b45 100644 --- a/arch/Kconfig +++ b/arch/Kconfig @@ -62,6 +62,7 @@ config SANDBOX bool "Sandbox" select SUPPORT_OF_CONTROL select DM + select DM_KEYBOARD select DM_SPI_FLASH select DM_SERIAL select DM_I2C @@ -83,6 +84,7 @@ config X86 select HAVE_PRIVATE_LIBGCC select SUPPORT_OF_CONTROL select DM + select DM_KEYBOARD select DM_SERIAL select DM_GPIO select DM_SPI diff --git a/arch/sandbox/Kconfig b/arch/sandbox/Kconfig index d4c1ee0..c931c0b 100644 --- a/arch/sandbox/Kconfig +++ b/arch/sandbox/Kconfig @@ -25,7 +25,4 @@ config PCI used on some devices to allow the CPU to communicate with its peripherals. -config DM_KEYBOARD - default y - endmenu diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 5193ee7..9207549 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -549,9 +549,6 @@ config I8254_TIMER config I8042_KEYB default y -config DM_KEYBOARD - default y - config SEABIOS bool "Support booting SeaBIOS" help -- 1.9.1

4 8

[U-Boot] [bug report] sunxi: booting from eMMC
by Ciprian Manea 03 Oct '16

03 Oct '16

Hi, I'm using a SinA33 dev board (Allwinner a33 SoC) and at the moment I'm trying to boot from the eMMC. But it fails in the following way: *Got the following error at boot time:* *U-Boot SPL 2016.09-rc2-00125-g6e8b42f (Sep 08 2016 - 11:00:46) DRAM: 1024 MiB Trying to boot from MMC2 MMC Device 1 not found spl: could not find mmc device. error: -19 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ###* More info in the linux-sunxi mailing thread: https://groups.google.com/forum/#!topic/linux-sunxi/U4t-0VcDxLU Thanks

4 10

[U-Boot] [PATCH v2] cmd/fdt: add possibilty to have 'extrasize' on fdt resize
by Hannes Schmelzer 02 Oct '16

02 Oct '16

From: Hannes Schmelzer <hannes.schmelzer(a)br-automation.com> Sometimes devicetree nodes and or properties are added out of the u-boot console, maybe through some script or manual interaction. The devicetree as loaded or embedded is quite small, so the devicetree has to be resized to take up those new nodes/properties. In original the devicetree was only extended by effective 4 * add_mem_rsv. With this commit we can add an argument to the "fdt resize" command, which takes the extrasize to be added. Signed-off-by: Hannes Schmelzer <hannes.schmelzer(a)br-automation.com> Signed-off-by: Hannes Schmelzer <oe5hpm(a)oevsv.at> --- Changes in v2: - add function comment in fdt_support.h board/compulab/cm_fx6/cm_fx6.c | 2 +- cmd/fdt.c | 9 +++++++-- common/fdt_support.c | 3 ++- common/image-fdt.c | 2 +- include/fdt_support.h | 10 +++++++++- 5 files changed, 20 insertions(+), 6 deletions(-) diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index 28e9a8f..5b88bcc 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -602,7 +602,7 @@ int ft_board_setup(void *blob, bd_t *bd) char baseboard_name[16]; int err; - fdt_shrink_to_minimum(blob); /* Make room for new properties */ + fdt_shrink_to_minimum(blob, 0); /* Make room for new properties */ /* MAC addr */ if (eth_getenv_enetaddr("ethaddr", enetaddr)) { diff --git a/cmd/fdt.c b/cmd/fdt.c index 58af772..b503357 100644 --- a/cmd/fdt.c +++ b/cmd/fdt.c @@ -662,7 +662,12 @@ static int do_fdt(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) #endif /* resize the fdt */ else if (strncmp(argv[1], "re", 2) == 0) { - fdt_shrink_to_minimum(working_fdt); + uint extrasize; + if (argc > 2) + extrasize = simple_strtoul(argv[2], NULL, 16); + else + extrasize = 0; + fdt_shrink_to_minimum(working_fdt, extrasize); } else { /* Unrecognized command */ @@ -1056,7 +1061,7 @@ static char fdt_help_text[] = "fdt systemsetup - Do system-specific set up\n" #endif "fdt move <fdt> <newaddr> <length> - Copy the fdt to <addr> and make it active\n" - "fdt resize - Resize fdt to size + padding to 4k addr\n" + "fdt resize [<extrasize>] - Resize fdt to size + padding to 4k addr + some optional <extrasize> if needed\n" "fdt print <path> [<prop>] - Recursive print starting at <path>\n" "fdt list <path> [<prop>] - Print one level starting at <path>\n" "fdt get value <var> <path> <prop> - Get <property> and store in <var>\n" diff --git a/common/fdt_support.c b/common/fdt_support.c index 2020586..0609470 100644 --- a/common/fdt_support.c +++ b/common/fdt_support.c @@ -523,7 +523,7 @@ void fdt_fixup_ethernet(void *fdt) } /* Resize the fdt to its actual size + a bit of padding */ -int fdt_shrink_to_minimum(void *blob) +int fdt_shrink_to_minimum(void *blob, uint extrasize) { int i; uint64_t addr, size; @@ -551,6 +551,7 @@ int fdt_shrink_to_minimum(void *blob) actualsize = fdt_off_dt_strings(blob) + fdt_size_dt_strings(blob) + 5 * sizeof(struct fdt_reserve_entry); + actualsize += extrasize; /* Make it so the fdt ends on a page boundary */ actualsize = ALIGN(actualsize + ((uintptr_t)blob & 0xfff), 0x1000); actualsize = actualsize - ((uintptr_t)blob & 0xfff); diff --git a/common/image-fdt.c b/common/image-fdt.c index d6ee225..2ef1253 100644 --- a/common/image-fdt.c +++ b/common/image-fdt.c @@ -503,7 +503,7 @@ int image_setup_libfdt(bootm_headers_t *images, void *blob, lmb_free(lmb, (phys_addr_t)(u32)(uintptr_t)blob, (phys_size_t)fdt_totalsize(blob)); - ret = fdt_shrink_to_minimum(blob); + ret = fdt_shrink_to_minimum(blob, 0); if (ret < 0) goto err; of_size = ret; diff --git a/include/fdt_support.h b/include/fdt_support.h index e9f3497..adc7454 100644 --- a/include/fdt_support.h +++ b/include/fdt_support.h @@ -167,7 +167,15 @@ void ft_pci_setup(void *blob, bd_t *bd); int ft_system_setup(void *blob, bd_t *bd); void set_working_fdt_addr(ulong addr); -int fdt_shrink_to_minimum(void *blob); + +/** + * shrink down the given blob to minimum size + some extrasize if required + * + * @param blob FDT blob to update + * @param extrasize additional bytes needed + * @return 0 if ok, or -FDT_ERR_... on error + */ +int fdt_shrink_to_minimum(void *blob, uint extrasize); int fdt_increase_size(void *fdt, int add_len); int fdt_fixup_nor_flash_size(void *blob); -- 1.9.1

2 2

[U-Boot] is there any issue with creating and using more than one hashtable?
by Robert P. J. Day 02 Oct '16

02 Oct '16

short version: migrating target board from legacy OS to linux and, in a fixed address in flash, there is a legacy "bootline" of the form var=value var=value ... etc etc ... that i want to convert to u-boot compatible values such as ipaddr, gatewayip, serverip and so on. in misc_init_r(), i create a new hashtable to just grab the contents of that bootline as is. i then create a *second* hashtable and selectively move over just those keys i want from the first hashtable, possibly renaming them in the process. in the end, i end up with a small hashtable of u-boot compatible values, which i dump by walking through that second hashtable: Walking populated bootline_htab_2... k: [gatewayip], d: [192.168.1.1] k: [netmask], d: [255.255.255.0] k: [ipaddr], d: [192.168.1.2] now here's the thing ... after all that, i manually check whether the CRC for the env table in persistent storage is valid and, if it is, i do *nothing* with all that hashtable content -- that was all wasted cycles, but it should not do any harm. but it does, because this is what happens: TFTP from server 10.35.5.37; our IP address is 192.168.1.2; sending through gateway 192.168.1.1 the server address is correct, but the IP address and gateway are totally wrong -- they should have been untouched and been completely different values; instead, they now equal the values in that second hashtable, which i chose to do nothing with. is there some weird issue with re-entrancy here? if i print "ipaddr" and "gatewayip", they seem correct. if i "md" the environment in persistent storage, again, they seem correct. and yet, when TFTP kicks in, it seems to pick up the values from that hashtable. thoughts? is there some weird way that values from one hashtable can "bleed" into another one? i'm baffled. rday -- ======================================================================== Robert P. J. Day Ottawa, Ontario, CANADA http://crashcourse.ca Twitter: http://twitter.com/rpjday LinkedIn: http://ca.linkedin.com/in/rpjday ========================================================================

2 7

[U-Boot] [PATCH 0/4] boot-mode support in rockchip platform
by Jacob Chen 02 Oct '16

02 Oct '16

This patch add boot-mode support for rk3036,rk3288 (fastboot, ums) The corresponding commit in the kernel: https://git.kernel.org/cgit/linux/kernel/git/mmind/linux-rockchip.git/commi… This patch also make some work to let rk3036 and rk3288 more same , so easy to maintain Jacob Chen (4): rockchip: move partitons define from 3036-kylin to 3036-commn rockchip: rename board.c to rk3288-board.c rockchip: move common function from board-file to rk3036-board.c rockchip: add boot-mode support for rk3288,rk3036 arch/arm/include/asm/arch-rockchip/boot_mode.h | 19 ++++ arch/arm/mach-rockchip/Makefile | 3 +- arch/arm/mach-rockchip/rk3036-board.c | 122 +++++++++++++++++++++ arch/arm/mach-rockchip/{board.c => rk3288-board.c} | 50 ++++++++- board/rockchip/evb_rk3036/evb_rk3036.c | 66 ----------- board/rockchip/kylin_rk3036/kylin_rk3036.c | 80 +------------- include/configs/kylin_rk3036.h | 27 ----- include/configs/rk3036_common.h | 13 +++ include/configs/rk3288_common.h | 3 + 9 files changed, 206 insertions(+), 177 deletions(-) create mode 100644 arch/arm/include/asm/arch-rockchip/boot_mode.h create mode 100644 arch/arm/mach-rockchip/rk3036-board.c rename arch/arm/mach-rockchip/{board.c => rk3288-board.c} (80%) -- 1.9.1

2 12