February 2020 - U-Boot

[PATCH] stm32mp1: remove fdt_high and initrd_high in environment
by Patrick Delaunay 14 Feb '20

14 Feb '20

Remove fdt_high and initrd_high (set to 0xffffffff) in stm32mp1 board enviromnent, and U-Boot always relocate FDT and initrd in bootm command. This relocation is limited by CONFIG_SYS_BOOTMAPSZ which indicates the size of the memory region where it is safe to place data passed to the Linux kernel (DTB, initrd), it is a) Less than or equal to RAM size. b) not within the kernel's highmem region So 256M seems large enough in most circumstances and users can override this value via environment variable "bootm_mapsize" if needed. This modification increases the boot time but avoid assumption on aligned address for bootm command. A user can still define this variables themselves if the FDT or initrd is either left in-place or copied to a specific location. Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- include/configs/stm32mp1.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index a66534e027..42717c167e 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -43,8 +43,14 @@ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG +/* + * For booting Linux, use the first 256 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ SZ_256M + /* Extend size of kernel image for uncompression */ -#define CONFIG_SYS_BOOTM_LEN SZ_32M +#define CONFIG_SYS_BOOTM_LEN SZ_32M /* SPL support */ #ifdef CONFIG_SPL @@ -215,8 +221,6 @@ "pxefile_addr_r=0xc4200000\0" \ "splashimage=0xc4300000\0" \ "ramdisk_addr_r=0xc4400000\0" \ - "fdt_high=0xffffffff\0" \ - "initrd_high=0xffffffff\0" \ "altbootcmd=run bootcmd\0" \ "env_default=1\0" \ "env_check=if test $env_default -eq 1;"\ -- 2.17.1

3 2

[PATCH v1 0/2] Update board environment for STM32 MCU's boards
by Patrice Chotard 14 Feb '20

14 Feb '20

This series: - standardizes the fdt_addr, scriptaddr and pxefile_addr across all STM32 MCU's board. - remove fdt_high and initrd_high from board environment Patrice Chotard (2): board: stm32: fix extra env setings addresses board: stm32: remove fdt_high and fdt_highinitrd_high include/configs/stm32f429-evaluation.h | 15 +++++++++------ include/configs/stm32f469-discovery.h | 15 +++++++++------ include/configs/stm32f746-disco.h | 15 +++++++++------ include/configs/stm32h743-disco.h | 14 ++++++++------ include/configs/stm32h743-eval.h | 14 ++++++++------ 5 files changed, 43 insertions(+), 30 deletions(-) -- 2.17.1

2 6

[PATCH] board: stih410-b2260: remove fdt_high and initrd_high
by Patrice Chotard 14 Feb '20

14 Feb '20

Remove fdt_high and initrd_high as they shouldn't be used, this allows the fdt and initrd relocation. This implies to set CONFIG_SYS_BOOTMAPSZ to indicate the amount of memory available to contain kernel, device tree and initrd for relocation. Signed-off-by: Patrice Chotard <patrice.chotard(a)st.com> --- include/configs/stih410-b2260.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index a8a58f3950..f393aa0264 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -19,6 +19,12 @@ /* Environment */ +/* + * For booting Linux, use the first 256 MB of memory, since this is + * the maximum mapped by the Linux kernel during initialization. + */ +#define CONFIG_SYS_BOOTMAPSZ SZ_256M + #define CONFIG_LOADADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_SYS_BOOTM_LEN SZ_16M @@ -34,8 +40,6 @@ "fdt_addr_r=0x47000000\0" \ "scriptaddr=0x50000000\0" \ "pxefile_addr_r=0x50100000\0" \ - "fdt_high=0xffffffffffffffff\0" \ - "initrd_high=0xffffffffffffffff\0" \ "ramdisk_addr_r=0x48000000\0" \ BOOTENV -- 2.17.1

3 3

[PATCH] tools: mkimage: fix STM32 image format for big endian hosts
by Patrick Delaunay 14 Feb '20

14 Feb '20

From: Antonio Borneo <antonio.borneo(a)st.com> Two header fields are not properly converted to little endian before assignment, resulting in incorrect header while executing mkimage on big endian hosts. Convert the value of the header fields image_checksum and edcsa_algorithm to little endian before the assignment. Signed-off-by: Antonio Borneo <antonio.borneo(a)st.com> Reviewed-by: Patrick DELAUNAY <patrick.delaunay(a)st.com> Signed-off-by: Patrick Delaunay <patrick.delaunay(a)st.com> --- tools/stm32image.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/stm32image.c b/tools/stm32image.c index ff3ec5f3f2..18357c0518 100644 --- a/tools/stm32image.c +++ b/tools/stm32image.c @@ -45,7 +45,7 @@ static void stm32image_default_header(struct stm32_header *ptr) ptr->magic_number = HEADER_MAGIC; ptr->header_version[VER_MAJOR_IDX] = HEADER_VERSION_V1; ptr->option_flags = HEADER_DEFAULT_OPTION; - ptr->ecdsa_algorithm = 1; + ptr->ecdsa_algorithm = cpu_to_le32(1); ptr->binary_type = HEADER_TYPE_UBOOT; } @@ -131,7 +131,8 @@ static void stm32image_set_header(void *ptr, struct stat *sbuf, int ifd, stm32hdr->image_entry_point = cpu_to_le32(params->ep); stm32hdr->image_length = cpu_to_le32((uint32_t)sbuf->st_size - sizeof(struct stm32_header)); - stm32hdr->image_checksum = stm32image_checksum(ptr, sbuf->st_size); + stm32hdr->image_checksum = + cpu_to_le32(stm32image_checksum(ptr, sbuf->st_size)); } /* -- 2.17.1

2 1

[PATCH 0/4] Several patch to solve warning on stm32mp1 board with W=1
by Patrick Delaunay 14 Feb '20

14 Feb '20

Hi, this serie includes few remaining patches on STM32 drivers or board code to avoid warning when the board stm32mp1 is compiled with W=1. See also patches on: - ENV (V2): http://patchwork.ozlabs.org/patch/1230200/ - MTD (merged): http://patchwork.ozlabs.org/patch/1228814/ Regards Patrick Delaunay (4): board: stm32mp1: board: add include for dfu board: stm32mp1: change dfu function to static pinctrl: stmfx: update the result type of dm_i2c_reg_read clk: stm32mp1: solve type issue in stm32mp1_lse_enable and stm32mp1_clktree board/st/stm32mp1/stm32mp1.c | 5 +++-- drivers/clk/clk_stm32mp1.c | 9 +++++---- drivers/pinctrl/pinctrl-stmfx.c | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) -- 2.17.1

3 12

[PATCH 0/9] stm32mp1 devicetre-tree and board update
by Patrick Delaunay 14 Feb '20

14 Feb '20

This serie provides the device tree resync with Kernel 5.4-rc5, solves some dtc compilation issue for U-Boot addon and some minor update in stm32mp1 board (documentation and support of revZ). Antonio Borneo (1): ARM: dts: stm32mp1: move FDCAN to PLL4_R Patrick Delaunay (8): ARM: dts: stm32mp1: DT alignment with kernel v5.4 stm32mp1: pwr: use the last binding for pwr ARM: dts: stm32mp1: DT alignment with kernel v5.5-rc7 ARM: dts: stm32mp1: correct ddr node ARM: dts: stm32m1: add reg for pll nodes board: stm32mp1: update readme doc: add board documentation for stm32mp1 stm32mp1: support of STM32MP15x Rev.Z arch/arm/dts/stm32mp15-ddr.dtsi | 2 +- arch/arm/dts/stm32mp157-pinctrl.dtsi | 31 +- arch/arm/dts/stm32mp157-u-boot.dtsi | 4 +- .../arm/dts/stm32mp157a-avenger96-u-boot.dtsi | 10 +- arch/arm/dts/stm32mp157a-avenger96.dts | 11 +- arch/arm/dts/stm32mp157a-dk1-u-boot.dtsi | 27 +- arch/arm/dts/stm32mp157a-dk1.dts | 73 ++- arch/arm/dts/stm32mp157c-dk2.dts | 13 + arch/arm/dts/stm32mp157c-ed1-u-boot.dtsi | 10 +- arch/arm/dts/stm32mp157c-ed1.dts | 28 +- arch/arm/dts/stm32mp157c-ev1.dts | 8 +- arch/arm/dts/stm32mp157c.dtsi | 48 +- arch/arm/dts/stm32mp15xx-dhcom-u-boot.dtsi | 10 +- arch/arm/dts/stm32mp15xx-dhcom.dtsi | 8 +- arch/arm/mach-stm32mp/cpu.c | 3 + arch/arm/mach-stm32mp/include/mach/stm32.h | 1 - .../arm/mach-stm32mp/include/mach/sys_proto.h | 1 + arch/arm/mach-stm32mp/pwr_regulator.c | 23 +- arch/arm/mach-stm32mp/syscon.c | 1 - board/st/stm32mp1/README | 504 +-------------- doc/board/index.rst | 1 + doc/board/st/index.rst | 9 + doc/board/st/stm32mp1.rst | 598 ++++++++++++++++++ .../clock/st,stm32mp1.txt | 32 +- .../mtd/stm32-fmc2-nand.txt | 6 +- 25 files changed, 845 insertions(+), 617 deletions(-) create mode 100644 doc/board/st/index.rst create mode 100644 doc/board/st/stm32mp1.rst -- 2.17.1

5 37

[u-boot PATCH] board: ti: am57xx-idk: Prevent boot for invalid configuation
by Roger Quadros 14 Feb '20

14 Feb '20

On am571x-idk there can be following configurations based on Jumper J51 and LCD panel detected. 1) J51 removed (6port): 6 port Ethernet. Disable LCD panel. 2) J51 placed (LCD) + Panel detected: 4 port Ethernet with appropriate LCD. 3) J51 placed (LCD) + Panel not detected/not supported. Configuration 3 is considered invalid as we can't use display nor ICSS1 ethernet ports due to hardware muxing. Alert the user to fix the configuration and prevent boot. Alternative was to allow boot and limit to 4 port Ethernet with no display but this involved introduction of another DTB for the kernel and was considered not worth the hassle. Signed-off-by: Roger Quadros <rogerq(a)ti.com> Acked-by: Suman Anna <s-anna(a)ti.com> --- board/ti/am57xx/board.c | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/board/ti/am57xx/board.c b/board/ti/am57xx/board.c index d70ab0c4d0..683d3aa8da 100644 --- a/board/ti/am57xx/board.c +++ b/board/ti/am57xx/board.c @@ -706,6 +706,18 @@ void am57x_idk_lcd_detect(void) } out: env_set("idk_lcd", idk_lcd); + + /* + * On AM571x_IDK, no Display with J51 set to LCD is considered as an + * invalid configuration and we prevent boot to get user attention. + */ + if (board_is_am571x_idk() && am571x_idk_needs_lcd() && + !strncmp(idk_lcd, "no", 2)) { + printf("%s: Invalid HW configuration: display not detected/supported but J51 is set. Remove J51 to boot without display.\n", + __func__); + hang(); + } + return; } -- Texas Instruments Finland Oy, Porkkalankatu 22, 00180 Helsinki. Y-tunnus/Business ID: 0615521-4. Kotipaikka/Domicile: Helsinki

2 1

[PATCH] arm: mach-k3: Fix nomenclature on Silicon Revisions
by Lokesh Vutla 14 Feb '20

14 Feb '20

Data manual mentions the new silicon revisions as SR instead of PG. Use the same nomenclature inside U-Boot as well. Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-k3/common.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/common.c b/arch/arm/mach-k3/common.c index 2f82edb970..7af60a7f2f 100644 --- a/arch/arm/mach-k3/common.c +++ b/arch/arm/mach-k3/common.c @@ -218,7 +218,7 @@ int print_cpuinfo(void) name = "Unknown Silicon"; }; - printf("%s PG ", name); + printf("%s SR ", name); switch (rev) { case REV_PG1_0: name = "1.0"; -- 2.23.0

1 1

[PATCH] ARM: keystone2: enable initrd fixup for LPAE addressing
by Lokesh Vutla 14 Feb '20

14 Feb '20

From: Tero Kristo <t-kristo(a)ti.com> Keystone2 u-boot loads the initrd image into non-LPAE addressed memory but linux kernel is running in LPAE. This causes a conflict as kernel detects that non-memory address is passed and kernel ignores initrd. There is an existing fixup logic to modify the address in the proper configuration, but this is disabled at the moment. Enable the fixup by setting the env variable for this so that initrd can be used properly. Signed-off-by: Tero Kristo <t-kristo(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- - This fixes boot on k2g platforms. include/configs/ti_armv7_keystone2.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index ba12428dbe..1b014c1022 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -213,6 +213,7 @@ "tftp_root=/\0" \ "nfs_root=/export\0" \ "mem_lpae=1\0" \ + "uinitrd_fixup=1\0" \ "addr_ubi=0x82000000\0" \ "addr_secdb_key=0xc000000\0" \ "name_kern=zImage\0" \ -- 2.23.0

2 4

[PATCH] arm: K3: j721e: Fix boot parameter table index memory address
by Lokesh Vutla 14 Feb '20

14 Feb '20

From: Andreas Dannenberg <dannenberg(a)ti.com> The boot parameter table index memory address for J721E was configured to an incorrect value which prevented the use of this definition to determine which boot parameter table is active which is needed to be able to distinguish between primary and backup boot modes. Fix this issue by updating the value to the correct one also in alignment with the J721E Technical Reference Manual (TRM). Signed-off-by: Andreas Dannenberg <dannenberg(a)ti.com> Signed-off-by: Lokesh Vutla <lokeshvutla(a)ti.com> --- arch/arm/mach-k3/Kconfig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm/mach-k3/Kconfig b/arch/arm/mach-k3/Kconfig index 2e111bbf27..8f4272286c 100644 --- a/arch/arm/mach-k3/Kconfig +++ b/arch/arm/mach-k3/Kconfig @@ -50,7 +50,7 @@ config SYS_K3_MCU_SCRATCHPAD_SIZE config SYS_K3_BOOT_PARAM_TABLE_INDEX hex default 0x41c7fbfc if SOC_K3_AM6 - default 0x41cffc00 if SOC_K3_J721E + default 0x41cffbfc if SOC_K3_J721E help Address at which ROM stores the value which determines if SPL is booted up by primary boot media or secondary boot media. -- 2.23.0

1 1