August 2016 - U-Boot

[U-Boot] [PATCH v2] warp7: Modify fdt_file environment variable
by Breno Lima 26 Aug '16

26 Aug '16

Use imx7s-warp.dts as fdt_file because this is the name that upstream kernel will deploy. Signed-off-by: Breno Lima <breno.lima(a)nxp.com> --- Changes since v1: - Remove 1/2 from the Subject include/configs/warp7.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index e59b16c..91009a8 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -39,7 +39,7 @@ "console=ttymxc0\0" \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ - "fdt_file=imx7d-warp.dtb\0" \ + "fdt_file=imx7s-warp.dtb\0" \ "fdt_addr=0x83000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ -- 2.7.4

2 2

[U-Boot] Wrong Image Format for bootm command
by Ottavio Campana 26 Aug '16

26 Aug '16

Hello everybody, I am writing here because I'm having an issue with u-boot, I tried searching online and found that many others had the same issue but I was not able to find an answer. I am trying to boot a 4.4.0 kernel on U-Boot 2012.10. The problem that I'm having is that I get this error: u-boot> tftp 0x84000000 uImage ... u-boot> bootm 0x84000000 Wrong Image Format for bootm command ERROR: can't get kernel image! u-boot> My experience with embedded linux was always based on 2.* kernels, so this is the first time that I'm trying to learn how to user a modern kernel. As far as I understand, on modern kernels there's the possibility of having a flat image tree, so that the dtb can be bundled with the kernel, together with initramfs and other components. This feature is not supported by old versions of the bootloader. If an old version of u-boot is used, it is still possible to have a single file, by not using initramfs and by appending the dtb at the end of the kernel. My uImage looks like this: ottavio@ottavio:~$ mkimage -l /srv/tftp/uImage Image Name: Linux-4.4.0 Created: Fri Aug 26 08:39:54 2016 Image Type: ARM Linux Kernel Image (uncompressed) Data Size: 3589592 Bytes = 3505.46 kB = 3.42 MB Load Address: 81008000 Entry Point: 81008000 ottavio@ottavio:~$ file /srv/tftp/uImage /srv/tftp/uImage: u-boot legacy uImage, Linux-4.4.0, Linux/ARM, OS Kernel Image (Not compressed), 3589592 bytes, Fri Aug 26 08:39:54 2016, Load Address: 0x81008000, Entry Point: 0x81008000, Header CRC: 0x538260F4, Data CRC: 0x8D5C2A77 ottavio@ottavio:~$ For booting, my kernel is configured as follows: # # Boot options # # CONFIG_USE_OF is not set CONFIG_ATAGS=y # CONFIG_DEPRECATED_PARAM_STRUCT is not set CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ARM_APPENDED_DTB=y CONFIG_ARM_ATAG_DTB_COMPAT=y CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_FROM_BOOTLOADER=y # CONFIG_ARM_ATAG_DTB_COMPAT_CMDLINE_EXTEND is not set CONFIG_CMDLINE="console=ttyS0,115200n8 maxcpus=1" CONFIG_CMDLINE_FROM_BOOTLOADER=y # CONFIG_CMDLINE_EXTEND is not set # CONFIG_CMDLINE_FORCE is not set # CONFIG_XIP_KERNEL is not set # CONFIG_KEXEC is not set # CONFIG_CRASH_DUMP is not set CONFIG_AUTO_ZRELADDR=y So I'm wondering, why is u-boot refusing to boot the kernel? Can you help me and give me a hint please? Thank you for your help, Ottavio

1 0

[U-Boot] [ANN] U-Boot v2016.09-rc2 released
by Tom Rini 26 Aug '16

26 Aug '16

Hey all, It's release day and v2016.09-rc2 is out now. It's a week late as I wanted a few more things in and then next thing I knew it was Thursday, so I just pushed it out. I've updated git and the tarballs are also up now. A short list of changes to come in now are: - More and various SoC and architecture updates - Various DM updates and conversions - PSCI updates - MAKEALL is gone, buildman is for use by all - We now have xtensa support - DT overlays A non-code change is that now I have Jenkins setup to automatically poll my WIP branches and run test/py/test.py on a few real boards along with sandbox. I still have some more configuring and cabling to do, and a few more boards I can get setup. If you notice any problems with the release, please speak out and thanks all! -- Tom

4 4

[U-Boot] [PATCH v2] tools: kwboot: patch destaddr only for SoCs with header version 1
by Simon Baatz 26 Aug '16

26 Aug '16

Commit f4db6c976cf ("arm: mvebu: Add runtime detection of UART (xmodem) boot-mode") added a change to hdr->destaddr when dynamically patching an image for UART boot mode. With this change, kwboot ceases to work on Kirkwood. Thus, let's change hdr->destaddr only when we are patching an image with header version 1 (Orion and Kirkwood use header version 0). Signed-off-by: Simon Baatz <gmbnomis(a)gmail.com> Fixes: f4db6c976cf ("arm: mvebu: Add runtime detection of UART (xmodem) boot-mode") Cc: Stefan Roese <sr(a)denx.de> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Kevin Smith <kevin.smith(a)elecsyscorp.com> --- Changes for v2: - Corrected indentation (white space only) tools/kwboot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/tools/kwboot.c b/tools/kwboot.c index e00958a..26b3949 100644 --- a/tools/kwboot.c +++ b/tools/kwboot.c @@ -655,14 +655,6 @@ kwboot_img_patch_hdr(void *img, size_t size) hdr->blockid = IBR_HDR_UART_ID; - /* - * Subtract mkimage header size from destination address - * as this header is not expected by the Marvell BootROM. - * This way, the execution address is identical to the - * one the image is compiled for (TEXT_BASE). - */ - hdr->destaddr = hdr->destaddr - sizeof(struct image_header); - if (image_ver == 0) { struct main_hdr_v0 *hdr_v0 = img; @@ -672,6 +664,14 @@ kwboot_img_patch_hdr(void *img, size_t size) hdr_v0->srcaddr = hdr_v0->ext ? sizeof(struct kwb_header) : sizeof(*hdr_v0); + } else { + /* + * Subtract mkimage header size from destination address + * as this header is not expected by the Marvell BootROM. + * This way, the execution address is identical to the + * one the image is compiled for (TEXT_BASE). + */ + hdr->destaddr = hdr->destaddr - sizeof(struct image_header); } hdr->checksum = kwboot_img_csum8(hdr, hdrsz) - csum; -- 2.7.4

2 1

[U-Boot] [PATCH v1] arm: mvebu: a38x: typo fix cpabilities -> capbilities
by Chris Packham 26 Aug '16

26 Aug '16

Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c index 06a7715..98c447c 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c +++ b/arch/arm/mach-mvebu/serdes/a38x/ctrl_pex.c @@ -184,7 +184,7 @@ int hws_pex_config(const struct serdes_map *serdes_map, u8 count) DEBUG_INIT_S("PCIe, Idx "); DEBUG_INIT_D(pex_idx, 1); DEBUG_INIT_S - (": Link upgraded to Gen2 based on client cpabilities\n"); + (": Link upgraded to Gen2 based on client capabilities\n"); } /* Update pex DEVICE ID */ -- 2.9.2.518.ged577c6.dirty

2 1

[U-Boot] [PATCH v1] arm: mvebu: a38x: update serdes error handling
by Chris Packham 26 Aug '16

26 Aug '16

Ensure appropriate error messages are generated. Previously all errors indicated that the serdes was already in use. Now appropriate error messages are given. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- This looks to be a misplaced brace. Effectively the error handling for UNIT_NUMBER_VIOLATION and WRONG_NUMBER_OF_UNITS was unreachable. This would have meant that these errors would have gone unnoticed. So this could expose previously unknown misconfigurations. .../mach-mvebu/serdes/a38x/high_speed_env_spec.c | 39 +++++++++++----------- 1 file changed, 20 insertions(+), 19 deletions(-) diff --git a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c index 7d67199..820219e 100644 --- a/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c +++ b/arch/arm/mach-mvebu/serdes/a38x/high_speed_env_spec.c @@ -835,25 +835,26 @@ u32 hws_serdes_topology_verify(enum serdes_type serdes_type, u32 serdes_id, } } else { test_result = SERDES_ALREADY_IN_USE; - if (test_result == SERDES_ALREADY_IN_USE) { - printf("%s: Error: serdes lane %d is configured to type %s: type already in use\n", - __func__, serdes_id, - serdes_type_to_string[serdes_type]); - return MV_FAIL; - } else if (test_result == WRONG_NUMBER_OF_UNITS) { - printf("%s: Warning: serdes lane %d is set to type %s.\n", - __func__, serdes_id, - serdes_type_to_string[serdes_type]); - printf("%s: Maximum supported lanes are already set to this type (limit = %d)\n", - __func__, serd_max_num); - return MV_FAIL; - } else if (test_result == UNIT_NUMBER_VIOLATION) { - printf("%s: Warning: serdes lane %d type is %s: current device support only %d units of this type.\n", - __func__, serdes_id, - serdes_type_to_string[serdes_type], - serd_max_num); - return MV_FAIL; - } + } + + if (test_result == SERDES_ALREADY_IN_USE) { + printf("%s: Error: serdes lane %d is configured to type %s: type already in use\n", + __func__, serdes_id, + serdes_type_to_string[serdes_type]); + return MV_FAIL; + } else if (test_result == WRONG_NUMBER_OF_UNITS) { + printf("%s: Warning: serdes lane %d is set to type %s.\n", + __func__, serdes_id, + serdes_type_to_string[serdes_type]); + printf("%s: Maximum supported lanes are already set to this type (limit = %d)\n", + __func__, serd_max_num); + return MV_FAIL; + } else if (test_result == UNIT_NUMBER_VIOLATION) { + printf("%s: Warning: serdes lane %d type is %s: current device support only %d units of this type.\n", + __func__, serdes_id, + serdes_type_to_string[serdes_type], + serd_max_num); + return MV_FAIL; } return MV_OK; -- 2.9.2.518.ged577c6.dirty

2 1

[U-Boot] [PATCH v1] spl: Remove unused CONFIG_SPL_SPI_* definitions
by Chris Packham 26 Aug '16

26 Aug '16

As of commit 88e34e5 ("spl: replace CONFIG_SPL_SPI_* with CONFIG_SF_DEFAULT_*") these defines are not used. Remove them to avoid confusion. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- I decided to go with a single patch as with the exception of ds414 these all appear to be Armada based boards. I can split this into multiple patches if board maintainers wish me to. include/configs/clearfog.h | 2 -- include/configs/db-88f6720.h | 2 -- include/configs/db-88f6820-gp.h | 2 -- include/configs/db-mv784mp-gp.h | 2 -- include/configs/ds414.h | 2 -- include/configs/maxbcm.h | 2 -- include/configs/theadorable.h | 2 -- 7 files changed, 14 deletions(-) diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index ffaeedb..6cbdee2 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -133,8 +133,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-88f6720.h b/include/configs/db-88f6720.h index 01c7895..4e00812 100644 --- a/include/configs/db-88f6720.h +++ b/include/configs/db-88f6720.h @@ -100,8 +100,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 3539a62..88614b3 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -134,8 +134,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index d6acbbc..5cdfd1c 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -125,8 +125,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 23373cd..ff188e2 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -132,8 +132,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x24000 /* DS414 bus width is 32bits */ diff --git a/include/configs/maxbcm.h b/include/configs/maxbcm.h index fed310f..47d2948 100644 --- a/include/configs/maxbcm.h +++ b/include/configs/maxbcm.h @@ -93,8 +93,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 /* Enable DDR support in SPL (DDR3 training from Marvell bin_hdr) */ diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 1caa858..8bbf879 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -158,8 +158,6 @@ #define CONFIG_SPL_SPI_SUPPORT #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD -#define CONFIG_SPL_SPI_BUS 0 -#define CONFIG_SPL_SPI_CS 0 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x1a000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS -- 2.9.2.518.ged577c6.dirty

2 1

[U-Boot] [PATCH v1 1/2] arm: mvebu: Add support for NAND interface on A-38x
by Chris Packham 26 Aug '16

26 Aug '16

From: Chris Packham <chris.packham(a)alliedtelesis.co.nz> The NAND interface on the Armada-38x series is similar to that on the Armada-XP. The key difference is that the NAND ECC clock ratio is provided via the DFX Server registers instead of the Core Clock. Signed-off-by: Chris Packham <chris.packham(a)alliedtelesis.co.nz> Cc: Luka Perkov <luka.perkov(a)sartura.hr> Cc: Dirk Eibach <eibach(a)gdsys.de> --- I haven't got access to any Armada-375 docs so I wasn't sure if I should include it in the condition. For now it'll fall back to using the same clock control register as the Armada-XP. arch/arm/mach-mvebu/cpu.c | 9 ++++++++- arch/arm/mach-mvebu/include/mach/soc.h | 2 ++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index fd66f59..5eb2a39 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -452,8 +452,15 @@ int arch_cpu_init(void) u32 mvebu_get_nand_clock(void) { + u32 reg; + + if (mvebu_soc_family() == MVEBU_SOC_A38X) + reg = MVEBU_DFX_DIV_CLK_CTRL(1); + else + reg = MVEBU_CORE_DIV_CLK_CTRL(1); + return CONFIG_SYS_MVEBU_PLL_CLOCK / - ((readl(MVEBU_CORE_DIV_CLK_CTRL(1)) & + ((readl(reg) & NAND_ECC_DIVCKL_RATIO_MASK) >> NAND_ECC_DIVCKL_RATIO_OFFS); } diff --git a/arch/arm/mach-mvebu/include/mach/soc.h b/arch/arm/mach-mvebu/include/mach/soc.h index 13c9f29..6342cdc 100644 --- a/arch/arm/mach-mvebu/include/mach/soc.h +++ b/arch/arm/mach-mvebu/include/mach/soc.h @@ -73,6 +73,7 @@ #define MVEBU_NAND_BASE (MVEBU_REGISTER(0xd0000)) #define MVEBU_SDIO_BASE (MVEBU_REGISTER(0xd8000)) #define MVEBU_LCD_BASE (MVEBU_REGISTER(0xe0000)) +#define MVEBU_DFX_BASE (MVEBU_REGISTER(0xe4000)) #define SOC_COHERENCY_FABRIC_CTRL_REG (MVEBU_REGISTER(0x20200)) #define MBUS_ERR_PROP_EN (1 << 8) @@ -92,6 +93,7 @@ #define SPI_PUP_EN BIT(5) #define MVEBU_CORE_DIV_CLK_CTRL(i) (MVEBU_CLOCK_BASE + ((i) * 0x8)) +#define MVEBU_DFX_DIV_CLK_CTRL(i) (MVEBU_DFX_BASE + 0x250 + ((i) * 0x4)) #define NAND_ECC_DIVCKL_RATIO_OFFS 8 #define NAND_ECC_DIVCKL_RATIO_MASK (0x3F << NAND_ECC_DIVCKL_RATIO_OFFS) -- 2.9.2.518.ged577c6.dirty

2 6

Re: [U-Boot] EFI Stub compilation errors
by Robert Bray 26 Aug '16

26 Aug '16

Hello, I'm getting the same compilation errors as mentioned in the following thread. https://marc.info/?l=u-boot&m=145996759119043&w=2 Can you please provide the workaround patch for me as well? Thanks, Bob

2 2

[U-Boot] OMAP3 SPL Overflow
by Adam Ford 26 Aug '16

26 Aug '16

Using Git bisect, it appears to me that a78cd8613204188991c192b8dae2de0aae3b1722 makes "region `.sram' overflowed by 888 bytes" when I compile for omap3_logic. As I move forward through the git commits that overflow amount is continuing to grow. Does anyone else with an OMAP3 have this issue? adam

3 5