December 2018 - U-Boot

[U-Boot] [PATCH V2 1/2] USB: musb-new: omap2430: Prep driver for Peripheral support.
by Adam Ford 21 Dec '18

21 Dec '18

The omap2430 driver only currently supports host only. In preparation for supporting peripheral mode, this patch makes the driver support only the host by creating a ofdata_to_platdata function host/peripheral agnostic with a host helper version. Signed-off-by: Adam Ford <aford173(a)gmail.com> --- V2: No Changes diff --git a/drivers/usb/musb-new/omap2430.c b/drivers/usb/musb-new/omap2430.c index 32743aa72c..b6e1320538 100644 --- a/drivers/usb/musb-new/omap2430.c +++ b/drivers/usb/musb-new/omap2430.c @@ -137,6 +137,12 @@ const struct musb_platform_ops omap2430_ops = { #if CONFIG_IS_ENABLED(DM_USB) +static const struct udevice_id omap2430_musb_ids[] = { + { .compatible = "ti,omap3-musb" }, + { .compatible = "ti,omap4-musb" }, + { } +}; + struct omap2430_musb_platdata { void *base; void *ctrl_mod_base; @@ -190,20 +196,6 @@ static int omap2430_musb_ofdata_to_platdata(struct udevice *dev) return -ENOENT; } -#if 0 /* In a perfect world, mode would be set to OTG, mode 3 from DT */ - platdata->plat.mode = fdtdec_get_int(fdt, node, - "mode", -1); - if (platdata->plat.mode < 0) { - pr_err("MUSB mode DT entry missing\n"); - return -ENOENT; - } -#else /* MUSB_OTG, it doesn't work */ -#ifdef CONFIG_USB_MUSB_HOST /* Host seems to be the only option that works */ - platdata->plat.mode = MUSB_HOST; -#else /* For that matter, MUSB_PERIPHERAL doesn't either */ - platdata->plat.mode = MUSB_PERIPHERAL; -#endif -#endif platdata->otg_board_data.dev = dev; platdata->plat.config = &platdata->musb_config; platdata->plat.platform_ops = &omap2430_ops; @@ -211,11 +203,10 @@ static int omap2430_musb_ofdata_to_platdata(struct udevice *dev) return 0; } +#ifdef CONFIG_USB_MUSB_HOST static int omap2430_musb_probe(struct udevice *dev) { -#ifdef CONFIG_USB_MUSB_HOST struct musb_host_data *host = dev_get_priv(dev); -#endif struct omap2430_musb_platdata *platdata = dev_get_platdata(dev); struct usb_bus_priv *priv = dev_get_uclass_priv(dev); struct omap_musb_board_data *otg_board_data; @@ -226,7 +217,6 @@ static int omap2430_musb_probe(struct udevice *dev) otg_board_data = &platdata->otg_board_data; -#ifdef CONFIG_USB_MUSB_HOST host->host = musb_init_controller(&platdata->plat, (struct device *)otg_board_data, platdata->base); @@ -235,11 +225,7 @@ static int omap2430_musb_probe(struct udevice *dev) } ret = musb_lowlevel_init(host); -#else - ret = musb_register(&platdata->plat, - (struct device *)otg_board_data, - platdata->base); -#endif + return ret; } @@ -252,28 +238,40 @@ static int omap2430_musb_remove(struct udevice *dev) return 0; } -static const struct udevice_id omap2430_musb_ids[] = { - { .compatible = "ti,omap3-musb" }, - { .compatible = "ti,omap4-musb" }, - { } -}; +#if CONFIG_IS_ENABLED(OF_CONTROL) +static int omap2430_musb_host_ofdata_to_platdata(struct udevice *dev) +{ + struct ti_musb_platdata *platdata = dev_get_platdata(dev); + const void *fdt = gd->fdt_blob; + int node = dev_of_offset(dev); + int ret; + + ret = omap2430_musb_ofdata_to_platdata(dev); + if (ret) { + pr_err("platdata dt parse error\n"); + return ret; + } + + platdata->plat.mode = MUSB_HOST; + + return 0; +} +#endif U_BOOT_DRIVER(omap2430_musb) = { .name = "omap2430-musb", -#ifdef CONFIG_USB_MUSB_HOST .id = UCLASS_USB, -#else - .id = UCLASS_USB_GADGET_GENERIC, -#endif .of_match = omap2430_musb_ids, - .ofdata_to_platdata = omap2430_musb_ofdata_to_platdata, +#if CONFIG_IS_ENABLED(OF_CONTROL) + .ofdata_to_platdata = omap2430_musb_host_ofdata_to_platdata, +#endif .probe = omap2430_musb_probe, .remove = omap2430_musb_remove, -#ifdef CONFIG_USB_MUSB_HOST .ops = &musb_usb_ops, -#endif .platdata_auto_alloc_size = sizeof(struct omap2430_musb_platdata), .priv_auto_alloc_size = sizeof(struct musb_host_data), }; +#endif + #endif /* CONFIG_IS_ENABLED(DM_USB) */ -- 2.17.1

1 1

[U-Boot] [PATCH v2 1/1] arm64: dts: marvell: mcbin: reserve PSCI area
by Heinrich Schuchardt 21 Dec '18

21 Dec '18

The memory area [0x4000000-0x4200000[ is occupied by the PSCI firmware. Any attempt to access it from U-Boot leads to an immediate crash. So let's make the same memory reservation as the vendor device tree. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cf. https://lkml.org/lkml/2018/12/21/253 v2 add missing right brace --- arch/arm/dts/armada-8040-mcbin.dts | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/arch/arm/dts/armada-8040-mcbin.dts b/arch/arm/dts/armada-8040-mcbin.dts index f912596c2c..a039f5a790 100644 --- a/arch/arm/dts/armada-8040-mcbin.dts +++ b/arch/arm/dts/armada-8040-mcbin.dts @@ -28,6 +28,17 @@ reg = <0x0 0x0 0x0 0x80000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + psci_reserved: psci-area@4000000 { + reg = <0x0 0x4000000 0x0 0x200000>; + no-map; + }; + }; + simple-bus { compatible = "simple-bus"; #address-cells = <1>; -- 2.19.2

2 2

[U-Boot] [PATCH] ARM: mvebu: remove out of date comment
by Chris Packham 21 Dec '18

21 Dec '18

The Marvell DDR3 training code is now part of the U-Boot SPL so the comment saying it needs porting is no longer correct. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- arch/arm/mach-mvebu/cpu.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/arch/arm/mach-mvebu/cpu.c b/arch/arm/mach-mvebu/cpu.c index aa1be8ebabcb..919d05c88c77 100644 --- a/arch/arm/mach-mvebu/cpu.c +++ b/arch/arm/mach-mvebu/cpu.c @@ -283,10 +283,8 @@ int print_cpuinfo(void) * and sets the correct windows sizes and base addresses accordingly. * * These values are set in the scratch registers by the Marvell - * DDR3 training code, which is executed by the BootROM before the - * main payload (U-Boot) is executed. This training code is currently - * only available in the Marvell U-Boot version. It needs to be - * ported to mainline U-Boot SPL at some point. + * DDR3 training code, which is executed by the SPL before the + * main payload (U-Boot) is executed. */ static void update_sdram_window_sizes(void) { -- 2.19.2

2 2

[U-Boot] [PATCH] ARM: mvebu: define CONFIG_BLK for db-88f6820-amc
by Chris Packham 21 Dec '18

21 Dec '18

db-88f6820-amc uses CONFIG_DM_USB and CONFIG_USB_STORAGE already so define CONFIG_BLK to prepare it for full conversion to DM. Signed-off-by: Chris Packham <judge.packham(a)gmail.com> --- configs/db-88f6820-amc_defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/configs/db-88f6820-amc_defconfig b/configs/db-88f6820-amc_defconfig index dd58198a5469..9068a584060a 100644 --- a/configs/db-88f6820-amc_defconfig +++ b/configs/db-88f6820-amc_defconfig @@ -43,6 +43,9 @@ CONFIG_EFI_PARTITION=y CONFIG_DEFAULT_DEVICE_TREE="armada-385-amc" CONFIG_ENV_IS_IN_SPI_FLASH=y CONFIG_SPL_OF_TRANSLATE=y +CONFIG_BLK=y +# CONFIG_SPL_BLK is not set +# CONFIG_BLOCK_CACHE is not set CONFIG_DM_I2C=y CONFIG_SYS_I2C_MVTWSI=y # CONFIG_MMC is not set -- 2.19.2

2 2

[U-Boot] [PATCH] arm: configs: helios4: Change U-Boot offset on SPI Flash
by Aditya Prayoga 21 Dec '18

21 Dec '18

SPI flash support on Helios4 [1] has been merge to u-boot/master on commit 8cb8c0c6a83bef ("Merge git://git.denx.de/u-boot-marvell") However, the SPI image build failed after the merge with following message: COPY spl/u-boot-spl.bin MKIMAGE u-boot-spl.kwb Error: Image header (incl. SPL image) too big! header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000! Increase CONFIG_SYS_U_BOOT_OFFS! Error: Image header (incl. SPL image) too big! header=0x20816 CONFIG_SYS_U_BOOT_OFFS=0x20000! Increase CONFIG_SYS_U_BOOT_OFFS! Could not create image Makefile:1162: recipe for target 'u-boot-spl.kwb' failed make: *** [u-boot-spl.kwb] Error 1 Let's increase the u-boot offset to 0x30000 to accommodate SPL changes and leave some margin for future changes. [1] https://patchwork.ozlabs.org/patch/1007762/ Signed-off-by: Aditya Prayoga <aditya(a)kobol.io> --- Notes * After doing git bisect, I found out if the SPI flash support patch applied after commit 6f57c34473d37b ("serial: ns16550: fix debug uart putc called before init") SPI image build would failed because of the SPL+header size * To build SPI image: make mrproper make helios4_defconfig sed -i "s/CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC=y/"\ "# CONFIG_MVEBU_SPL_BOOT_DEVICE_MMC is not set/g" .config sed -i "s/# CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI is not set/"\ "CONFIG_MVEBU_SPL_BOOT_DEVICE_SPI=y/g" .config sed -i "s/CONFIG_ENV_IS_IN_MMC=y/"\ "# CONFIG_ENV_IS_IN_MMC is not set/g" .config sed -i "s/# CONFIG_ENV_IS_IN_SPI_FLASH is not set/"\ "CONFIG_ENV_IS_IN_SPI_FLASH=y/g" .config make --- include/configs/helios4.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/helios4.h b/include/configs/helios4.h index 3157225..4e98f19 100644 --- a/include/configs/helios4.h +++ b/include/configs/helios4.h @@ -118,7 +118,7 @@ #define CONFIG_SPL_SPI_FLASH_SUPPORT #define CONFIG_SPL_SPI_LOAD #define CONFIG_SPL_SPI_SUPPORT -#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x20000 +#define CONFIG_SYS_SPI_U_BOOT_OFFS 0x30000 #define CONFIG_SYS_U_BOOT_OFFS CONFIG_SYS_SPI_U_BOOT_OFFS #endif -- 2.7.4

2 2

[U-Boot] [PATCH] riscv: bootm: Support booting VxWorks
by Bin Meng 21 Dec '18

21 Dec '18

Register the 'bootm' function for booting VxWorks kernel. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- arch/riscv/lib/bootm.c | 8 +++++++- common/bootm_os.c | 2 +- include/bootm.h | 2 ++ 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/arch/riscv/lib/bootm.c b/arch/riscv/lib/bootm.c index 60b32cc..f36b870 100644 --- a/arch/riscv/lib/bootm.c +++ b/arch/riscv/lib/bootm.c @@ -86,7 +86,7 @@ static void boot_jump_linux(bootm_headers_t *images, int flag) bootstage_mark(BOOTSTAGE_ID_RUN_OS); - debug("## Transferring control to Linux (at address %08lx) ...\n", + debug("## Transferring control to kernel (at address %08lx) ...\n", (ulong)kernel); announce_and_cleanup(fake); @@ -118,3 +118,9 @@ int do_bootm_linux(int flag, int argc, char * const argv[], boot_jump_linux(images, flag); return 0; } + +int do_bootm_vxworks(int flag, int argc, char * const argv[], + bootm_headers_t *images) +{ + return do_bootm_linux(flag, argc, argv, images); +} diff --git a/common/bootm_os.c b/common/bootm_os.c index f302135..2001c86 100644 --- a/common/bootm_os.c +++ b/common/bootm_os.c @@ -482,7 +482,7 @@ static boot_os_fn *boot_os[] = { [IH_OS_PLAN9] = do_bootm_plan9, #endif #if defined(CONFIG_BOOTM_VXWORKS) && \ - (defined(CONFIG_PPC) || defined(CONFIG_ARM)) + (defined(CONFIG_PPC) || defined(CONFIG_ARM) || defined(CONFIG_RISCV)) [IH_OS_VXWORKS] = do_bootm_vxworks, #endif #if defined(CONFIG_CMD_ELF) diff --git a/include/bootm.h b/include/bootm.h index 0501414..dbd6f49 100644 --- a/include/bootm.h +++ b/include/bootm.h @@ -35,6 +35,8 @@ typedef int boot_os_fn(int flag, int argc, char * const argv[], bootm_headers_t *images); extern boot_os_fn do_bootm_linux; +extern boot_os_fn do_bootm_vxworks; + int do_bootelf(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]); void lynxkdi_boot(image_header_t *hdr); -- 2.7.4

1 0

[U-Boot] list files on tftp / large kernel-image
by Frank Wunderlich 21 Dec '18

21 Dec '18

Hi, is it possible to list files on tftp so i can write a script to let user select kernel-image to load? have anybody tried to load a kernelimage larger than 20MB? i use dnsmasq as tftp and uboot 2014-version (because 2018-11 für mt7623 currently has no ethernetdriver). If kernelimage is larger than ~20MB loading file hangs...tried setting blocksize, but it's the same behaviour, only more/less #-symbols. I don't know how much data is loaded, because there is loadedbytes-counter (i only can count the # and multiply with blocksize if i know it). do i have any chance to debug that or is this already known/fixed? regards Frank

3 15

[U-Boot] [PATCH 1/1] arm64: dts: marvell: mcbin: reserve PSCI area
by Heinrich Schuchardt 21 Dec '18

21 Dec '18

The memory area [0x4000000-0x4200000[ is occupied by the PSCI firmware. Any attempt to access it from U-Boot leads to an immediate crash. So let's make the same memory reservation as the vendor device tree. Signed-off-by: Heinrich Schuchardt <xypron.glpk(a)gmx.de> --- cf. https://lkml.org/lkml/2018/12/21/253 --- arch/arm/dts/armada-8040-mcbin.dts | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/arch/arm/dts/armada-8040-mcbin.dts b/arch/arm/dts/armada-8040-mcbin.dts index f912596c2c..57ca5e7d98 100644 --- a/arch/arm/dts/armada-8040-mcbin.dts +++ b/arch/arm/dts/armada-8040-mcbin.dts @@ -28,6 +28,16 @@ reg = <0x0 0x0 0x0 0x80000000>; }; + reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + psci_reserved: psci-area@4000000 { + reg = <0x0 0x4000000 0x0 0x200000>; + no-map; + }; + simple-bus { compatible = "simple-bus"; #address-cells = <1>; -- 2.19.2

1 0

[U-Boot] 0001-mmc-Add-missing-ifdef
by Mikhail Lappo 21 Dec '18

21 Dec '18

-- Mikhail Lappo (Software Engineer) ESR Labs AG E-mail: mikhail.lappo(a)esrlabs.com www.esrlabs.com --

1 0

[U-Boot] [PATCH 1/2] configs: igep: Define default mtdids/mtdparts
by Boris Brezillon 21 Dec '18

21 Dec '18

We are trying to get rid of the weak board_mtdparts_default() function and we need to make sure igep defconfigs have proper proper CONFIG_MTD{IDS,PARTS}_DEFAULT before doing that. Signed-off-by: Boris Brezillon <boris.brezillon(a)bootlin.com> --- configs/igep0032_defconfig | 2 ++ configs/igep00x0_defconfig | 2 ++ 2 files changed, 4 insertions(+) diff --git a/configs/igep0032_defconfig b/configs/igep0032_defconfig index 383648789c53..d2a614c98f6d 100644 --- a/configs/igep0032_defconfig +++ b/configs/igep0032_defconfig @@ -28,6 +28,8 @@ CONFIG_CMD_SPI=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand,onenand0=omap2-onenand" +CONFIG_MTDPARTS_DEFAULT="omap2-nand:512k(SPL),-(UBI);omap2-onenand:512k(SPL),-(UBI)" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y diff --git a/configs/igep00x0_defconfig b/configs/igep00x0_defconfig index f2989e34e12e..5d3e109ee3c2 100644 --- a/configs/igep00x0_defconfig +++ b/configs/igep00x0_defconfig @@ -28,6 +28,8 @@ CONFIG_CMD_SPI=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_MTDPARTS=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand,onenand0=omap2-onenand" +CONFIG_MTDPARTS_DEFAULT="omap2-nand:512k(SPL),-(UBI);omap2-onenand:512k(SPL),-(UBI)" CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_NET_RANDOM_ETHADDR=y -- 2.17.1

3 9