January 2020 - U-Boot

[U-Boot] [PATCH 0/2] spi: cadence-qspi: Move to spi-mem APIs
by Vignesh Raghavendra 17 Jan '20

17 Jan '20

First patch moves driver over to spi-mem framework and implement spi_mem_ops. This is require to support more SPI Flash opcodes like SFDP parsing etc. Series is in prepartion to add Octal mode for support for the same driver to support OSPI version of the controller. Second patch adds DAC mode that provide memory mapped access to flash. This greatly increases the read throughput. Tested with mt25qu512 flash and s25fl512 flash Simon, Would greatly appreciate if you could test this series on platforms that you have access to? Vignesh Raghavendra (2): spi: cadence_qspi: Move to spi-mem framework spi: cadence-qspi: Add direct mode support drivers/spi/cadence_qspi.c | 148 ++++++++++++--------------- drivers/spi/cadence_qspi.h | 24 +++-- drivers/spi/cadence_qspi_apb.c | 181 +++++++++++++++------------------ 3 files changed, 160 insertions(+), 193 deletions(-) -- 2.23.0

3 17

[PATCH 0/3] stm32mp1: split board and SOC support for STM32MP15x family
by Patrick Delaunay 17 Jan '20

17 Jan '20

This serie prepare the introduction of boards with STM32MP15x SOC not provided by STMicroelectronics. I introduce two new CONFIG: one for SOC and one ST boards (EV1, DK1, DK2). And also create a new directory board/st/common to manage part common with all the board (today only command stboard). Patrick Delaunay (3): stm32mp1: move stboard command in board/st/common directory board: stm32mp1: move CONFIG_ENV_XXX in defconfig stm32mp1: split board and SOC support for STM32MP15x family arch/arm/dts/Makefile | 2 +- arch/arm/mach-stm32mp/Kconfig | 32 +++++++++++++++------ board/st/common/Kconfig | 7 +++++ board/st/common/MAINTAINERS | 6 ++++ board/st/common/Makefile | 6 ++++ board/st/{stm32mp1 => common}/cmd_stboard.c | 3 ++ board/st/stm32mp1/Kconfig | 20 ++----------- board/st/stm32mp1/Makefile | 1 - board/st/stm32mp1/stm32mp1.c | 2 +- configs/stm32mp15_basic_defconfig | 4 ++- configs/stm32mp15_optee_defconfig | 4 ++- configs/stm32mp15_trusted_defconfig | 4 ++- 12 files changed, 59 insertions(+), 32 deletions(-) create mode 100644 board/st/common/Kconfig create mode 100644 board/st/common/MAINTAINERS create mode 100644 board/st/common/Makefile rename board/st/{stm32mp1 => common}/cmd_stboard.c (98%) -- 2.17.1

3 9

[U-Boot] [RFC PATCH] pxe: add support for FDT overlays
by Neil Armstrong 17 Jan '20

17 Jan '20

This adds support for specicyinf FDT overlays in an extlinux/pxelinux configuration file. Without this, there is no simple way to apply overlays when the kernel and ftd is loaded by the pxe command. This change adds the 'fdtoverlays' keyword for a label, supporting multiple overlay files to be applied on top of the fdt specific in the 'fdt' or 'devicetree' keyword. Cc: Jernej Škrabec <jernej.skrabec(a)siol.net> Cc: Jonas Karlman <jonas(a)kwiboo.se> Signed-off-by: Neil Armstrong <narmstrong(a)baylibre.com> --- cmd/pxe.c | 104 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 104 insertions(+) diff --git a/cmd/pxe.c b/cmd/pxe.c index 1dd0a74ea3..8d19e6f99f 100644 --- a/cmd/pxe.c +++ b/cmd/pxe.c @@ -13,6 +13,8 @@ #include <linux/ctype.h> #include <errno.h> #include <linux/list.h> +#include <fdt_support.h> +#include <linux/libfdt.h> #include <fs.h> #include <splash.h> #include <asm/io.h> @@ -481,6 +483,7 @@ struct pxe_label { char *initrd; char *fdt; char *fdtdir; + char *fdtoverlays; int ipappend; int attempted; int localboot; @@ -561,6 +564,9 @@ static void label_destroy(struct pxe_label *label) if (label->fdtdir) free(label->fdtdir); + if (label->fdtoverlays) + free(label->fdtoverlays); + free(label); } @@ -608,6 +614,92 @@ static int label_localboot(struct pxe_label *label) return run_command_list(localcmd, strlen(localcmd), 0); } +/* + * Loads fdt overlays specified in 'fdtoverlays'. + */ +#ifdef CONFIG_OF_LIBFDT_OVERLAY +static void label_boot_fdtoverlay(cmd_tbl_t *cmdtp, struct pxe_label *label) +{ + char *fdtoverlay = label->fdtoverlays; + struct fdt_header *working_fdt; + char *fdtoverlay_addr_env; + ulong fdtoverlay_addr; + ulong fdt_addr; + int err; + + /* Get the main fdt and map it */ + fdt_addr = simple_strtoul(env_get("fdt_addr_r"), NULL, 16); + working_fdt = map_sysmem(fdt_addr, 0); + err = fdt_check_header(working_fdt); + if (err) + return; + + /* Get the specific overlay loading address */ + fdtoverlay_addr_env = env_get("fdtoverlay_addr_r"); + if (!fdtoverlay_addr_env) { + printf("Invalid fdtoverlay_addr_r for loading overlays\n"); + return; + } + + fdtoverlay_addr = simple_strtoul(fdtoverlay_addr_env, NULL, 16); + + /* Cycle over the overlay files and apply them in order */ + do { + struct fdt_header *blob; + char *overlayfile; + char *end; + int len; + + /* Drop leading spaces */ + while (*fdtoverlay == ' ') + ++fdtoverlay; + + /* Copy a single filename if multiple provided */ + end = strstr(fdtoverlay, " "); + if (end) { + len = (int)(end - fdtoverlay); + overlayfile = malloc(len + 1); + strncpy(overlayfile, fdtoverlay, len); + overlayfile[len] = '\0'; + } else + overlayfile = fdtoverlay; + + if (!strlen(overlayfile)) + goto skip_overlay; + + /* Load overlay file */ + err = get_relfile_envaddr(cmdtp, overlayfile, + "fdtoverlay_addr_r"); + if (err < 0) { + printf("Failed loading overlay %s\n", overlayfile); + goto skip_overlay; + } + + /* Resize main fdt */ + fdt_shrink_to_minimum(working_fdt, 8192); + + blob = map_sysmem(fdtoverlay_addr, 0); + err = fdt_check_header(blob); + if (err) { + printf("Invalid overlay %s, skipping\n", + overlayfile); + goto skip_overlay; + } + + err = fdt_overlay_apply_verbose(working_fdt, blob); + if (err) { + printf("Failed to apply overlay %s, skipping\n", + overlayfile); + goto skip_overlay; + } + +skip_overlay: + if (end) + free(overlayfile); + } while ((fdtoverlay = strstr(fdtoverlay, " "))); +} +#endif + /* * Boot according to the contents of a pxe_label. * @@ -798,6 +890,11 @@ static int label_boot(cmd_tbl_t *cmdtp, struct pxe_label *label) label->name); goto cleanup; } + +#ifdef CONFIG_OF_LIBFDT_OVERLAY + if (label->fdtoverlays) + label_boot_fdtoverlay(cmdtp, label); +#endif } else { bootm_argv[3] = NULL; } @@ -855,6 +952,7 @@ enum token_type { T_INCLUDE, T_FDT, T_FDTDIR, + T_FDTOVERLAYS, T_ONTIMEOUT, T_IPAPPEND, T_BACKGROUND, @@ -889,6 +987,7 @@ static const struct token keywords[] = { {"fdt", T_FDT}, {"devicetreedir", T_FDTDIR}, {"fdtdir", T_FDTDIR}, + {"fdtoverlays", T_FDTOVERLAYS}, {"ontimeout", T_ONTIMEOUT,}, {"ipappend", T_IPAPPEND,}, {"background", T_BACKGROUND,}, @@ -1322,6 +1421,11 @@ static int parse_label(char **c, struct pxe_menu *cfg) err = parse_sliteral(c, &label->fdtdir); break; + case T_FDTOVERLAYS: + if (!label->fdtoverlays) + err = parse_sliteral(c, &label->fdtoverlays); + break; + case T_LOCALBOOT: label->localboot = 1; err = parse_integer(c, &label->localboot_val); -- 2.21.0

2 2

[PATCH v2 12/21] dts: mtmips: add u-boot, dm-pre-reloc for some nodes in mt7628a.dtsi
by Weijie Gao 17 Jan '20

17 Jan '20

To enable DM support in SPL, some necessary nodes must be reserved for serial, clk, sysreset and other drivers. This patch adds u-boot,dm-pre-reloc for these nodes. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Changes since v1: newly added --- arch/mips/dts/mt7628a.dtsi | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/arch/mips/dts/mt7628a.dtsi b/arch/mips/dts/mt7628a.dtsi index 3d7b839e6d..744594c45a 100644 --- a/arch/mips/dts/mt7628a.dtsi +++ b/arch/mips/dts/mt7628a.dtsi @@ -23,11 +23,14 @@ #address-cells = <1>; #size-cells = <1>; + u-boot,dm-pre-reloc; + resetctl-reboot { compatible = "resetctl-reboot"; resets = <&rstctrl MT7628_SYS_RST>; reset-names = "sysreset"; + u-boot,dm-pre-reloc; }; clkctrl: clkctrl@0x2c { @@ -42,6 +45,7 @@ reg = <0x34 0x4>; compatible = "mediatek,mtmips-reset"; #reset-cells = <1>; + u-boot,dm-pre-reloc; }; pinctrl: pinctrl@60 { @@ -52,6 +56,8 @@ pinctrl-names = "default"; pinctrl-0 = <&state_default>; + u-boot,dm-pre-reloc; + state_default: pin_state { }; @@ -260,6 +266,8 @@ reset-names = "uart0"; reg-shift = <2>; + + u-boot,dm-pre-reloc; }; uart1: uart1@d00 { @@ -275,6 +283,8 @@ reset-names = "uart1"; reg-shift = <2>; + + u-boot,dm-pre-reloc; }; uart2: uart2@e00 { @@ -290,6 +300,8 @@ reset-names = "uart2"; reg-shift = <2>; + + u-boot,dm-pre-reloc; }; }; -- 2.17.1

2 1

[PATCH V3] stm32mp1: configs: Make all boot devices in distro boot conditional
by Marek Vasut 17 Jan '20

17 Jan '20

Not all systems have all the boot devices enabled, e.g. not all systems have MTD devices and thus do not enable UBI. Make all the boot devices in the distro bootcmd conditional to avoid failures. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrick Delaunay <patrick.delaunay(a)st.com> Cc: Patrice Chotard <patrice.chotard(a)st.com> --- V2: Drop the _DEVICE from BOOT_TARGET_DEVICE_* V3: Fix BOOT_TARGET_DEVICES, which was missing the _DEVICE in V2 --- include/configs/stm32mp1.h | 34 ++++++++++++++++++++++++++++------ 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index d42a7860be..655833428e 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -98,12 +98,34 @@ #if !defined(CONFIG_SPL_BUILD) -#define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 1) \ - func(UBIFS, ubifs, 0) \ - func(MMC, mmc, 0) \ - func(MMC, mmc, 2) \ - func(PXE, pxe, na) +#ifdef CONFIG_CMD_MMC +#define BOOT_TARGET_MMC0(func) func(MMC, mmc, 0) +#define BOOT_TARGET_MMC1(func) func(MMC, mmc, 1) +#define BOOT_TARGET_MMC2(func) func(MMC, mmc, 2) +#else +#define BOOT_TARGET_MMC0(func) +#define BOOT_TARGET_MMC1(func) +#define BOOT_TARGET_MMC2(func) +#endif + +#ifdef CONFIG_NET +#define BOOT_TARGET_PXE(func) func(PXE, pxe, na) +#else +#define BOOT_TARGET_PXE(func) +#endif + +#ifdef CONFIG_CMD_UBIFS +#define BOOT_TARGET_UBIFS(func) func(UBIFS, ubifs, 0) +#else +#define BOOT_TARGET_UBIFS(func) +#endif + +#define BOOT_TARGET_DEVICES(func) \ + BOOT_TARGET_MMC1(func) \ + BOOT_TARGET_UBIFS(func) \ + BOOT_TARGET_MMC0(func) \ + BOOT_TARGET_MMC2(func) \ + BOOT_TARGET_PXE(func) /* * bootcmd for stm32mp1: -- 2.24.1

3 4

[PATCH V2] ARM: stm32: Allow overriding setup_mac_address()
by Marek Vasut 17 Jan '20

17 Jan '20

Let board code override setup_mac_address(), which is useful e.g. if the board derives the MAC address from another source, like an I2C EEPROM. Signed-off-by: Marek Vasut <marex(a)denx.de> Cc: Patrick Delaunay <patrick.delaunay(a)st.com> Cc: Patrice Chotard <patrice.chotard(a)st.com> --- V2: Add prototype to sys_proto.h --- arch/arm/mach-stm32mp/cpu.c | 2 +- arch/arm/mach-stm32mp/include/mach/sys_proto.h | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/arm/mach-stm32mp/cpu.c b/arch/arm/mach-stm32mp/cpu.c index ed7d9f61dc..856c7ced7a 100644 --- a/arch/arm/mach-stm32mp/cpu.c +++ b/arch/arm/mach-stm32mp/cpu.c @@ -449,7 +449,7 @@ static void setup_boot_mode(void) * If there is no MAC address in the environment, then it will be initialized * (silently) from the value in the OTP. */ -static int setup_mac_address(void) +__weak int setup_mac_address(void) { #if defined(CONFIG_NET) int ret; diff --git a/arch/arm/mach-stm32mp/include/mach/sys_proto.h b/arch/arm/mach-stm32mp/include/mach/sys_proto.h index 99eefabf6e..47e57922d1 100644 --- a/arch/arm/mach-stm32mp/include/mach/sys_proto.h +++ b/arch/arm/mach-stm32mp/include/mach/sys_proto.h @@ -30,3 +30,5 @@ u32 get_cpu_package(void); /* return boot mode */ u32 get_bootmode(void); + +int setup_mac_address(void); -- 2.24.1

2 2

[PATCH] stm32mp: remove redundant SYS_TEXT_BASE prompt
by Thomas Hebb 17 Jan '20

17 Jan '20

The main prompt for this (defined in /Kconfig) is visible at all times, which means there's no reason to have an additional, machine-specific prompt to set the same option. Signed-off-by: Thomas Hebb <tommyhebb(a)gmail.com> --- arch/arm/mach-stm32mp/Kconfig | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arm/mach-stm32mp/Kconfig b/arch/arm/mach-stm32mp/Kconfig index ae28f6e206..bf8a18a0c3 100644 --- a/arch/arm/mach-stm32mp/Kconfig +++ b/arch/arm/mach-stm32mp/Kconfig @@ -80,12 +80,7 @@ config STM32MP1_OPTEE OP-TEE monitor provides ST SMC to access to secure resources config SYS_TEXT_BASE - prompt "U-Boot base address" default 0xC0100000 - help - configure the U-Boot base address - when DDR driver is used: - DDR + 1MB (0xC0100000) config NR_DRAM_BANKS default 1 -- 2.24.1

2 2

[PATCH v2 17/21] Makefile: add support to generate LZMA compressed u-boot image
by Weijie Gao 17 Jan '20

17 Jan '20

This patch adds support for generating LZMA compressed u-boot image. The compressed image can be used for SPL to reduce the size of the u-boot binary. Reviewed-by: Simon Glass <sjg(a)chromium.org> Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Changes since v1: none --- Makefile | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/Makefile b/Makefile index 3f332e6885..8013cbd9f9 100644 --- a/Makefile +++ b/Makefile @@ -952,6 +952,9 @@ append = cat $(filter-out $< $(PHONY), $^) >> $@ quiet_cmd_pad_cat = CAT $@ cmd_pad_cat = $(cmd_objcopy) && $(append) || rm -f $@ +quiet_cmd_lzma = LZMA $@ +cmd_lzma = lzma -c -z -k -9 $< > $@ + cfg: u-boot.cfg quiet_cmd_cfgcheck = CFGCHK $2 @@ -1334,6 +1337,16 @@ else UBOOT_BIN := u-boot.bin endif +MKIMAGEFLAGS_u-boot-lzma.img = -A $(ARCH) -T standalone -C lzma -O u-boot \ + -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ + -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" + +u-boot.bin.lzma: u-boot.bin FORCE + $(call if_changed,lzma) + +u-boot-lzma.img: u-boot.bin.lzma FORCE + $(call if_changed,mkimage) + u-boot-dtb.img u-boot.img u-boot.kwb u-boot.pbl u-boot-ivt.img: \ $(if $(CONFIG_SPL_LOAD_FIT),u-boot-nodtb.bin \ $(if $(CONFIG_OF_SEPARATE)$(CONFIG_OF_EMBED)$(CONFIG_OF_HOSTFILE),dts/dt.dtb) \ -- 2.17.1

2 1

[PATCH v2 15/21] mips: add an option to enable u_boot_list section for SPL loaders in u-boot-spl.lds
by Weijie Gao 17 Jan '20

17 Jan '20

u_boot_list is not only used by DM, but also by some SPL image load methods such as spl_nor.c. This patch adds an option CONFIG_SPL_LOADER_SUPPORT in conjunction with CONFIG_SPL_DM surrounding the u_boot_list section to make sure SPL image loaders can be correctly built into u-boot SPL without DM enabled. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Changes since v1: uses a new config instead of removing CONFIG_SPL_DM --- arch/mips/cpu/u-boot-spl.lds | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds index e467491639..28ea4f2a48 100644 --- a/arch/mips/cpu/u-boot-spl.lds +++ b/arch/mips/cpu/u-boot-spl.lds @@ -27,7 +27,7 @@ SECTIONS *(SORT_BY_ALIGNMENT(.sdata*)) } > .spl_mem -#ifdef CONFIG_SPL_DM +#if defined(CONFIG_SPL_DM) || defined(CONFIG_SPL_LOADER_SUPPORT) . = ALIGN(4); .u_boot_list : { KEEP(*(SORT(.u_boot_list*))); -- 2.17.1

2 1

[PATCH v2 14/21] mips: enable support for appending dtb to spl binary
by Weijie Gao 17 Jan '20

17 Jan '20

If CONFIG_SPL_OF_CONTROL is enabled for SPL and CONFIG_OF_SEPARATE is also enabled, the dtb will be appended to the u-boot-spl.bin. When calling dm_init_and_scan() in SPL, fdtdec_setup() will try to locate dtb at the end of u-boot-spl.bin, by referencing to _image_binary_end. However _image_binary_end is currently missing in u-boot-spl.lds. This patch adds _image_binary_end to u-boot-spl.lds to make sure linking u-boot-spl will not fail. Signed-off-by: Weijie Gao <weijie.gao(a)mediatek.com> --- Changes since v1: newly added --- arch/mips/cpu/u-boot-spl.lds | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/mips/cpu/u-boot-spl.lds b/arch/mips/cpu/u-boot-spl.lds index d08d6222c4..e467491639 100644 --- a/arch/mips/cpu/u-boot-spl.lds +++ b/arch/mips/cpu/u-boot-spl.lds @@ -37,6 +37,8 @@ SECTIONS . = ALIGN(4); __image_copy_end = .; + _image_binary_end = .; + .bss (NOLOAD) : { __bss_start = .; *(.bss*) -- 2.17.1

2 1