June 2019 - U-Boot

Re: [U-Boot] [PATCH v4] riscv: Add Microchip MPFS Icicle board support
by Rick Chen 04 Jun '19

04 Jun '19

> From: Auer, Lukas [mailto:lukas.auer@aisec.fraunhofer.de] > Sent: Saturday, June 01, 2019 12:13 AM > To: padmarao.begari(a)microchip.com; u-boot(a)lists.denx.de > Cc: Rick Jian-Zhi Chen(陳建志); cyril.jean(a)microchip.com; > bmeng.cn(a)gmail.com; anup.patel(a)wdc.com; lewis.hanly(a)microchip.com > Subject: Re: [PATCH v4] riscv: Add Microchip MPFS Icicle board support > > On Tue, 2019-05-28 at 15:47 +0530, Padmarao Begari wrote: > > This patch adds Microchip MPFS Icicle board support. > > For now, NS16550 serial driver is only enabled. > > The Microchip MPFS Icicle defconfig by default builds U-Boot for > > M-Mode with SMP support. > > > > Signed-off-by: Padmarao Begari <padmarao.begari(a)microchip.com> > > Reviewed-by: Bin Meng <bmeng.cn(a)gmail.com> > > --- > > Changes in V4 > > - Remove CONFIG_DISTRO_DEFAULTS from microchip_mpfs_icicle_defconfig > > > > Changes in v3 > > - Fix some typos > > - Remove CONFIG_DM, CONFIG_DM_SERIAL, CONFIG_BAUDRATE, > > CONFIG_SYS_NS16550, CONFIG_SYS_TEXT_BASE and > CONFIG_NR_DRAM_BANKS > > from microchip_mpfs_icicle_defconfig > > - Add config SYS_TEXT_BASE in board kconfig > > - Imply SYS_NS16550 in BOARD_SPECIFIC_OPTIONS > > - select BOARD_EARLY_INIT_F in BOARD_SPECIFIC_OPTIONS > > > > Changes in v2 > > - Fix some typos > > - Rename target board to TARGET_MICROCHIP_ICICLE > > - select CONFIG_BOARD_EARLY_INIT_F in BOARD_SPECIFIC_OPTIONS > > - Remove #ifdef CONFIG_BOARD_EARLY_INIT_F > > --- > > arch/riscv/Kconfig | 4 ++ > > board/microchip/mpfs_icicle/Kconfig | 26 +++++++++++++ > > board/microchip/mpfs_icicle/MAINTAINERS | 7 ++++ > > board/microchip/mpfs_icicle/Makefile | 7 ++++ > > board/microchip/mpfs_icicle/mpfs_icicle.c | 30 +++++++++++++++ > > configs/microchip_mpfs_icicle_defconfig | 8 ++++ > > include/configs/microchip_mpfs_icicle.h | 63 > +++++++++++++++++++++++++++++++ > > 7 files changed, 145 insertions(+) > > create mode 100644 board/microchip/mpfs_icicle/Kconfig > > create mode 100644 board/microchip/mpfs_icicle/MAINTAINERS > > create mode 100644 board/microchip/mpfs_icicle/Makefile > > create mode 100644 board/microchip/mpfs_icicle/mpfs_icicle.c > > create mode 100644 configs/microchip_mpfs_icicle_defconfig > > create mode 100644 include/configs/microchip_mpfs_icicle.h > > > > Reviewed-by: Lukas Auer <lukas.auer(a)aisec.fraunhofer.de> Applied to u-boot-riscv/master, thanks!

1 0

[U-Boot] [PATCH] efi_loader: re-organize UEFI-related configuration menu
by AKASHI Takahiro 04 Jun '19

04 Jun '19

More and more features are coming into UEFI support, while some people are worried about the growing size of the code. Adding a configuration option for each feature is a solution, but it will also make the configuration complicated and unreadable. With this patch, this issue will be addressed by 1.putting UEFI-related menu to a sub-menu, "UEFI API support" in addition, 2.moving EFI_LOADER option, along with USE_BOUND_BUFFER, to "Boot Images" 3.moving forward *non-functional* configurations, currently PLATFORM_LANG_CODES only, at the beginning (1) helps improve readability by separating UEFI-specific configs from other U-Boot features. For (2), "Boot Images" is a right place for EFI_LOADER with architecture-dependent configs. Lastly, coming functional features (runtime services, protocols and others) will be no doubt added to the last. Signed-off-by: AKASHI Takahiro <takahiro.akashi(a)linaro.org> --- Kconfig | 27 ++++++++++++++++++++++++ lib/efi_loader/Kconfig | 47 +++++++++++------------------------------- 2 files changed, 39 insertions(+), 35 deletions(-) diff --git a/Kconfig b/Kconfig index a02168690f5b..2bb3db6262fe 100644 --- a/Kconfig +++ b/Kconfig @@ -526,6 +526,33 @@ config ARCH_FIXUP_FDT_MEMORY used for booting OS with different memory setup where the part of the memory location should be used for different purpose. +config EFI_LOADER + bool "Support UEFI images" + depends on (ARM || X86 || RISCV || SANDBOX) && OF_LIBFDT + # We need EFI_STUB_64BIT to be set on x86_64 with EFI_STUB + depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT + # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB + depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT + default y + select LIB_UUID + select HAVE_BLOCK_DEVICE + select REGEX + imply CFB_CONSOLE_ANSI + help + Select this option if you want to run UEFI applications (like GNU + GRUB or iPXE) on top of U-Boot. If this option is enabled, U-Boot + will expose the UEFI API to a loaded application, enabling it to + reuse U-Boot's device drivers. + +config EFI_LOADER_BOUNCE_BUFFER + bool "EFI Applications use bounce buffers for DMA operations" + depends on EFI_LOADER && ARM64 + default n + help + Some hardware does not support DMA to full 64bit addresses. For this + hardware we can create a bounce buffer so that payloads don't have to + worry about platform details. + endmenu # Boot images source "api/Kconfig" diff --git a/lib/efi_loader/Kconfig b/lib/efi_loader/Kconfig index cd5436c576b1..8b9e85e9a534 100644 --- a/lib/efi_loader/Kconfig +++ b/lib/efi_loader/Kconfig @@ -1,23 +1,16 @@ -config EFI_LOADER - bool "Support running UEFI applications" - depends on (ARM || X86 || RISCV || SANDBOX) && OF_LIBFDT - # We need EFI_STUB_64BIT to be set on x86_64 with EFI_STUB - depends on !EFI_STUB || !X86_64 || EFI_STUB_64BIT - # We need EFI_STUB_32BIT to be set on x86_32 with EFI_STUB - depends on !EFI_STUB || !X86 || X86_64 || EFI_STUB_32BIT - default y - select LIB_UUID - select HAVE_BLOCK_DEVICE - select REGEX - imply CFB_CONSOLE_ANSI - help - Select this option if you want to run UEFI applications (like GNU - GRUB or iPXE) on top of U-Boot. If this option is enabled, U-Boot - will expose the UEFI API to a loaded application, enabling it to - reuse U-Boot's device drivers. - if EFI_LOADER +menu "UEFI API support" + +config EFI_PLATFORM_LANG_CODES + string "Language codes supported by firmware" + default "en-US" + help + This value is used to initialize the PlatformLangCodes variable. Its + value is a semicolon (;) separated list of language codes in native + RFC 4646 format, e.g. "en-US;de-DE". The first language code is used + to initialize the PlatformLang variable. + config EFI_GET_TIME bool "GetTime() runtime service" depends on DM_RTC @@ -83,22 +76,6 @@ config EFI_UNICODE_COLLATION_PROTOCOL endif -config EFI_LOADER_BOUNCE_BUFFER - bool "EFI Applications use bounce buffers for DMA operations" - depends on ARM64 - default n - help - Some hardware does not support DMA to full 64bit addresses. For this - hardware we can create a bounce buffer so that payloads don't have to - worry about platform details. - -config EFI_PLATFORM_LANG_CODES - string "Language codes supported by firmware" - default "en-US" - help - This value is used to initialize the PlatformLangCodes variable. Its - value is a semicolon (;) separated list of language codes in native - RFC 4646 format, e.g. "en-US;de-DE". The first language code is used - to initialize the PlatformLang variable. +endmenu endif -- 2.21.0

2 1

[U-Boot] [PATCH 1/2] riscv: qemu: Enable PCI host ECAM generic driver
by Bin Meng 04 Jun '19

04 Jun '19

QEMU 4.0.0 'virt' target integrates a generic ECAM PCI host. Enable the driver for it. Signed-off-by: Bin Meng <bmeng.cn(a)gmail.com> --- board/emulation/qemu-riscv/Kconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/board/emulation/qemu-riscv/Kconfig b/board/emulation/qemu-riscv/Kconfig index 20ea6dc..2a03e43 100644 --- a/board/emulation/qemu-riscv/Kconfig +++ b/board/emulation/qemu-riscv/Kconfig @@ -36,5 +36,9 @@ config BOARD_SPECIFIC_OPTIONS # dummy imply OF_BOARD_SETUP imply SIFIVE_SERIAL imply SMP + imply PCI + imply DM_PCI + imply PCIE_ECAM_GENERIC + imply CMD_PCI endif -- 2.7.4

2 4

[U-Boot] Question about cfi flash driver can not work well in cacheable region !
by Rick Chen 04 Jun '19

04 Jun '19

Hi Stefan and other seniors I encounter some problems about cfi flash driver. And hope you can give some comments to resolve it. Followings are the flash verification status and descriptions : When I verify cfi flash which it's address base is in cacheable region (0x88000000) and cache is enabled in system. The flash detection, write and erase action will be failure somehow. The failure messages will be as below: ################# # Detection failure # ################# Flash: ## Unknown flash on Bank 1 - Size = 0x00000000 = 0 MB 0 Bytes ########### # Erase fail # ########### protect off all; erase 0x88000000 0x8bffffff; Error: start and/or end address not on sector boundary RISC-V # ########### # Write fail # ########### RISC-V # cp.b 0x20000000 0x8bf00000 0x1444 RISC-V # But when I disable cache in system, they will all pass the verification. ################ # Detection pass # ################ Flash: 64 MiB ############# # erase pass # ############# protect off all; erase 0x88000000 0x8bffffff; Un-Protect Flash Bank # 1 ................................................ ................................................ ................................................ ................................................ ................................................ ................................................ ................................................ ................................................ ................................................ ................................................ ................................ done Erased 512 sectors RISC-V # ############## # write pass # ############## RISC-V # cp.b 0x20000000 0x8bf00000 0x1444 Copy to Flash... done RISC-V # How can I enable cache and let cfi flash can work fine to get better performance ? Do you have any comments ? Thanks Rick

2 2

[U-Boot] Distro bootcmd: Re: 5.2-rc1 boot on Unleashed
by Troy Benjegerdes 03 Jun '19

03 Jun '19

> On Jun 3, 2019, at 5:49 AM, Andreas Schwab <schwab(a)suse.de> wrote: > > On Mai 29 2019, Karsten Merker <merker(a)debian.org> wrote: > >> Mainline U-Boot already uses the distro bootcmd environment for >> the qemu "virt" machine and it works well. > > The distro_bootcmd doesn't work for the sifive platform yet because it > doesn't set the correct MAC address for booting. > > Andreas. > Before we go an use distro_bootcmd and drag in a bunch of legacy stuff we really should not be using, can we make some kind of effort to decide what the design goals and boot flow should look like instead using the default legacy behavior of a bunch of hard to read and maintain CPP macros? The first thing I notice is that the default dhcp target is ‘boot.scr.uimg’. What good does it do linux distros on RiscV to keep using the old boot script format, rather than just load a text file and use ‘env import’? Is there some benefit to this? Do we gain something from the .scr format, like maybe cryptographic signature support? How do we want to support secure boot into Debian, Fedora, and Suse, and does distro_bootcmd have a way to do this, or can we come up with some improvement that doesn’t depend on trying to do all the work in CPP macros and U-boot runtime scripts?

3 4

[U-Boot] [PATCH] arm: exynos: odroid: Fix the confict scripaddr extra env setting
by Anand Moon 03 Jun '19

03 Jun '19

Fix the confict of scriptaddr address with ramdisk_addr_r used in EXTRA_ENV_SETTINGS. Signed-off-by: Anand Moon <linux.amoon(a)gmail.com> --- Prevoius patch: [0] https://marc.info/?l=u-boot&m=155411969503169&w=2 changes from prevoius changes: drop: "pxefile_addr_r=0x51000000\0" \ U-Boot 2019.07-rc2-00199-g40920bdecc4-dirty (May 24 2019 - 06:39:42 +0000) CPU: Exynos4412 @ 1 GHz Model: Odroid based on Exynos4412 Type: u3 DRAM: 2 GiB LDO20(a)VDDQ_EMMC_1.8V: set 1800000 uV; enabling LDO22(a)VDDQ_EMMC_2.8V: set 2800000 uV; enabling LDO21(a)TFLASH_2.8V: set 2800000 uV; enabling MMC: SAMSUNG SDHCI: 1, EXYNOS DWMMC: 0 Loading Environment from MMC... Card did not respond to voltage select! *** Warning - No block device, using default environment Net: No ethernet found. Hit any key to stop autoboot: 0 switch to partitions #0, OK mmc1 is current device Scanning mmc 1:1... Found U-Boot script /boot/boot.scr 775 bytes read in 5 ms (151.4 KiB/s) 6688712 bytes read in 229 ms (27.9 MiB/s) 72645 bytes read in 41 ms (1.7 MiB/s) 6611360 bytes read in 227 ms (27.8 MiB/s) Kernel image @ 0x41000000 [ 0x000000 - 0x660fc8 ] Booting using the fdt blob at 0x40800000 Loading Ramdisk to 4f9b1000, end 4ffff1a0 ... OK Loading Device Tree to 4f99c000, end 4f9b0bc4 ... OK --- include/configs/odroid.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 9f2d43e3fa3..04bed6b0160 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -168,7 +168,7 @@ "consoleoff=set console console=ram; save; reset\0" \ "initrdname=uInitrd\0" \ "ramdisk_addr_r=0x42000000\0" \ - "scriptaddr=0x42000000\0" \ + "scriptaddr=0x50000000\0" \ "fdt_addr_r=0x40800000\0" \ "kernel_addr_r=0x41000000\0" \ BOOTENV -- 2.21.0

2 3

[U-Boot] [PATCH] mmc: implement SDHCI card detect
by Ibai Erkiaga 03 Jun '19

03 Jun '19

Card detect function implemented for SDHCI framework. Signed-off-by: Ibai Erkiaga <ibai.erkiaga-elorza(a)xilinx.com> --- drivers/mmc/sdhci.c | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/drivers/mmc/sdhci.c b/drivers/mmc/sdhci.c index e2bb90a..cb4db8d 100644 --- a/drivers/mmc/sdhci.c +++ b/drivers/mmc/sdhci.c @@ -390,6 +390,21 @@ static int sdhci_send_command(struct mmc *mmc, struct mmc_cmd *cmd, return -ECOMM; } +#if IS_ENABLED(CONFIG_DM_MMC) +static int sdhci_get_cd(struct udevice *dev) +{ + struct mmc *mmc = mmc_get_mmc_dev(dev); +#else +static int sdhci_get_cd(struct mmc *mmc) +{ +#endif + u32 state; + struct sdhci_host *host = mmc->priv; + + state = sdhci_readl(host, SDHCI_PRESENT_STATE); + return (state & SDHCI_CARD_PRESENT); +} + #if defined(CONFIG_DM_MMC) && defined(MMC_SUPPORTS_TUNING) static int sdhci_execute_tuning(struct udevice *dev, uint opcode) { @@ -627,6 +642,7 @@ int sdhci_probe(struct udevice *dev) const struct dm_mmc_ops sdhci_ops = { .send_cmd = sdhci_send_command, .set_ios = sdhci_set_ios, + .get_cd = sdhci_get_cd, #ifdef MMC_SUPPORTS_TUNING .execute_tuning = sdhci_execute_tuning, #endif @@ -635,6 +651,7 @@ const struct dm_mmc_ops sdhci_ops = { static const struct mmc_ops sdhci_ops = { .send_cmd = sdhci_send_command, .set_ios = sdhci_set_ios, + .get_cd = sdhci_get_cd, .init = sdhci_init, }; #endif -- 1.8.3.1

3 3

[U-Boot] Cannot boot mx6qsabred with 2019.07-rc2
by Fabio Estevam 03 Jun '19

03 Jun '19

Hi, I get the following error when trying to boot mx6q sabresd with 2019.07-rc2: U-Boot SPL 2019.07-rc2 (May 16 2019 - 14:28:55 -0300) Trying to boot from MMC1 spl: could not find mmc device 0. error: -19 SPL: failed to boot from all boot devices ### ERROR ### Please RESET the board ### I haven't debugged this yet. Does anyone have any ideas? Thanks, Fabio Estevam

14 57

[U-Boot] [v5, 0/5] Split fsl_esdhc driver for i.MX
by Yangbo Lu 03 Jun '19

03 Jun '19

The fsl_esdhc driver was for Freescale eSDHC on MPC83XX/MPC85XX initially. The later QoriQ series PowerPC processors (which were evolutions of MPC83XX/MPC85XX), QorIQ series ARM processors, and i.MX series processors were using this driver for their eSDHCs too. For the two series processors, the eSDHCs are becoming more and more different. We should have split it into two drivers, like them (sdhci-of-esdhc.c/sdhci-esdhc-imx.c) in linux kernel. It's ideal to keep common part for reusing. However, it's hard to find out a little which could be reused. The truth is there will be more and more different registers, bits and operatiing processes. Even some code is common now, it may have to be split in the future. So let's just split is as two drivers. Patch #2 just created a fsl_esdhc_imx driver which was a copy of fsl_esdhc driver for i.MX processors. Patch #3 converted i.MX platforms to use fsl_esdhc_imx. Patch #4 and #5 just dropped useless code for the two driver. There are still many cleaning up works needed to be done in the future, because the eSDHC driver is mess for a long time. Since I'm only owner for QorIQ eSDHC driver, I dropped only a little things which I'm sure for fsl_esdhc_imx. Let i.MX eSDHC owner do futhur cleaning up. Yangbo Lu (5): Move CONFIG_FSL_ESDHC to defconfig mmc: split fsl_esdhc driver for i.MX Convert to use fsl_esdhc_imx for i.MX platforms mmc: fsl_esdhc: drop i.MX code mmc: fsl_esdhc_imx: drop useless code arch/arm/cpu/arm1136/mx35/generic.c | 10 +- arch/arm/cpu/arm926ejs/mx25/generic.c | 8 +- arch/arm/cpu/armv7/vf610/generic.c | 10 +- arch/arm/cpu/armv8/s32v234/generic.c | 2 +- arch/arm/include/asm/global_data.h | 2 +- arch/arm/mach-imx/cpu.c | 6 +- arch/arm/mach-imx/mx6/litesom.c | 4 +- arch/arm/mach-imx/mx7/clock.c | 4 +- arch/arm/mach-imx/mx7ulp/clock.c | 2 +- arch/arm/mach-imx/speed.c | 4 +- arch/m68k/cpu/mcf5445x/cpu_init.c | 2 +- board/advantech/dms-ba16/dms-ba16.c | 4 +- board/aristainetos/aristainetos-v1.c | 2 +- board/aristainetos/aristainetos-v2.c | 2 +- board/aristainetos/aristainetos.c | 4 +- board/bachmann/ot1200/ot1200.c | 2 +- board/barco/platinum/platinum.c | 2 +- board/barco/titanium/titanium.c | 4 +- board/boundary/nitrogen6x/nitrogen6x.c | 4 +- board/ccv/xpress/xpress.c | 2 +- board/compulab/cl-som-imx7/cl-som-imx7.c | 6 +- board/compulab/cl-som-imx7/common.c | 6 +- board/compulab/cl-som-imx7/common.h | 8 +- board/compulab/cl-som-imx7/mux.c | 8 +- board/compulab/cl-som-imx7/spl.c | 6 +- board/compulab/cm_fx6/cm_fx6.c | 4 +- board/compulab/cm_fx6/common.c | 4 +- board/compulab/cm_fx6/spl.c | 2 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +- board/dhelectronics/dh_imx6/dh_imx6.c | 4 +- board/dhelectronics/dh_imx6/dh_imx6_spl.c | 2 +- board/el/el6x/el6x.c | 4 +- board/embest/mx6boards/mx6boards.c | 4 +- board/freescale/imx8mq_evk/imx8mq_evk.c | 2 +- board/freescale/imx8mq_evk/spl.c | 2 +- board/freescale/imx8qxp_mek/imx8qxp_mek.c | 2 +- board/freescale/m54418twr/m54418twr.c | 2 +- board/freescale/mx25pdk/mx25pdk.c | 6 +- board/freescale/mx35pdk/mx35pdk.c | 4 +- board/freescale/mx51evk/mx51evk.c | 6 +- board/freescale/mx53ard/mx53ard.c | 4 +- board/freescale/mx53evk/mx53evk.c | 4 +- board/freescale/mx53loco/mx53loco.c | 4 +- board/freescale/mx53smd/mx53smd.c | 4 +- board/freescale/mx6qarm2/mx6qarm2.c | 4 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 4 +- board/freescale/mx6sabresd/mx6sabresd.c | 4 +- board/freescale/mx6slevk/mx6slevk.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/freescale/mx7dsabresd/mx7dsabresd.c | 2 +- board/freescale/s32v234evb/s32v234evb.c | 4 +- board/freescale/vf610twr/vf610twr.c | 4 +- board/gateworks/gw_ventana/common.c | 6 +- board/gateworks/gw_ventana/gw_ventana.c | 2 +- board/ge/bx50v3/bx50v3.c | 2 +- board/ge/mx53ppd/mx53ppd.c | 2 +- board/grinn/liteboard/board.c | 4 +- board/inversepath/usbarmory/usbarmory.c | 2 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc.c | 4 +- board/k+p/kp_imx6q_tpc/kp_imx6q_tpc_spl.c | 2 +- board/kosagi/novena/novena.c | 4 +- board/kosagi/novena/novena_spl.c | 6 +- board/liebherr/display5/common.c | 2 +- board/liebherr/display5/display5.c | 6 +- board/liebherr/display5/spl.c | 2 +- board/liebherr/mccmon6/mccmon6.c | 2 +- board/liebherr/mccmon6/spl.c | 2 +- board/logicpd/imx6/imx6logic.c | 4 +- board/menlo/m53menlo/m53menlo.c | 4 +- board/phytec/pcl063/pcl063.c | 2 +- board/phytec/pcl063/spl.c | 6 +- board/phytec/pcm058/pcm058.c | 2 +- board/phytec/pfla02/pfla02.c | 2 +- board/samtec/vining_2000/vining_2000.c | 2 +- board/seco/common/mx6.c | 2 +- board/seco/mx6quq7/mx6quq7.c | 2 +- board/sks-kinkel/sksimx6/sksimx6.c | 2 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 2 +- board/tbs/tbs2910/tbs2910.c | 6 +- board/technexion/pico-imx6ul/spl.c | 2 +- board/technexion/pico-imx7d/spl.c | 2 +- board/technologic/ts4800/ts4800.c | 6 +- board/toradex/apalis_imx6/apalis_imx6.c | 6 +- board/toradex/colibri_imx6/colibri_imx6.c | 6 +- board/toradex/colibri_imx7/colibri_imx7.c | 2 +- board/tqc/tqma6/tqma6.c | 2 +- board/tqc/tqma6/tqma6_mba6.c | 2 +- board/tqc/tqma6/tqma6_wru4.c | 2 +- board/udoo/neo/neo.c | 2 +- board/udoo/udoo.c | 2 +- board/udoo/udoo_spl.c | 2 +- board/variscite/dart_6ul/dart_6ul.c | 2 +- board/variscite/dart_6ul/spl.c | 2 +- board/wandboard/spl.c | 2 +- board/warp/warp.c | 2 +- board/woodburn/woodburn.c | 4 +- configs/apalis_imx6_defconfig | 2 +- configs/aristainetos2_defconfig | 2 +- configs/aristainetos2b_defconfig | 2 +- configs/aristainetos_defconfig | 2 +- configs/bk4r1_defconfig | 2 +- configs/cgtqmx6eval_defconfig | 2 +- configs/cl-som-imx7_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/colibri-imx6ull_defconfig | 2 +- configs/colibri_imx6_defconfig | 2 +- configs/colibri_imx7_defconfig | 2 +- configs/colibri_imx7_emmc_defconfig | 2 +- configs/colibri_vf_defconfig | 2 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 2 +- configs/display5_factory_defconfig | 2 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/ge_bx50v3_defconfig | 2 +- configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6dl_mamoj_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 2 +- configs/imx6qdl_icore_mipi_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_rqs_defconfig | 2 +- configs/imx6ul_geam_mmc_defconfig | 2 +- configs/imx6ul_geam_nand_defconfig | 2 +- configs/imx6ul_isiot_emmc_defconfig | 2 +- configs/imx6ul_isiot_nand_defconfig | 2 +- configs/imx8mq_evk_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + configs/kp_imx53_defconfig | 2 +- configs/kp_imx6q_tpc_defconfig | 1 + configs/liteboard_defconfig | 2 +- configs/ls1012afrwy_qspi_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_qspi_defconfig | 1 + configs/ls1012afrwy_tfa_SECURE_BOOT_defconfig | 1 + configs/ls1012afrwy_tfa_defconfig | 1 + configs/m53menlo_defconfig | 2 +- configs/marsboard_defconfig | 2 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mx25pdk_defconfig | 2 +- configs/mx35pdk_defconfig | 2 +- configs/mx51evk_defconfig | 2 +- configs/mx53ard_defconfig | 2 +- configs/mx53cx9020_defconfig | 2 +- configs/mx53evk_defconfig | 2 +- configs/mx53loco_defconfig | 2 +- configs/mx53ppd_defconfig | 2 +- configs/mx53smd_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6dlarm2_defconfig | 2 +- configs/mx6dlarm2_lpddr2_defconfig | 2 +- configs/mx6qarm2_defconfig | 2 +- configs/mx6qarm2_lpddr2_defconfig | 2 +- configs/mx6qsabrelite_defconfig | 2 +- configs/mx6sabreauto_defconfig | 2 +- configs/mx6sabresd_defconfig | 2 +- configs/mx6slevk_defconfig | 2 +- configs/mx6slevk_spinor_defconfig | 2 +- configs/mx6slevk_spl_defconfig | 2 +- configs/mx6sllevk_defconfig | 2 +- configs/mx6sllevk_plugin_defconfig | 2 +- configs/mx6sxsabreauto_defconfig | 2 +- configs/mx6sxsabresd_defconfig | 2 +- configs/mx6sxsabresd_spl_defconfig | 2 +- configs/mx6ul_14x14_evk_defconfig | 2 +- configs/mx6ul_9x9_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_defconfig | 2 +- configs/mx6ull_14x14_evk_plugin_defconfig | 2 +- configs/mx7dsabresd_defconfig | 2 +- configs/mx7dsabresd_qspi_defconfig | 2 +- configs/mx7ulp_evk_defconfig | 2 +- configs/mx7ulp_evk_plugin_defconfig | 2 +- configs/nitrogen6dl2g_defconfig | 2 +- configs/nitrogen6dl_defconfig | 2 +- configs/nitrogen6q2g_defconfig | 2 +- configs/nitrogen6q_defconfig | 2 +- configs/nitrogen6s1g_defconfig | 2 +- configs/nitrogen6s_defconfig | 2 +- configs/novena_defconfig | 2 +- configs/opos6uldev_defconfig | 2 +- configs/ot1200_defconfig | 2 +- configs/ot1200_spl_defconfig | 2 +- configs/pcm052_defconfig | 2 +- configs/pcm058_defconfig | 2 +- configs/pfla02_defconfig | 2 +- configs/phycore_pcl063_defconfig | 2 +- configs/pico-hobbit-imx6ul_defconfig | 2 +- configs/pico-hobbit-imx7d_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/pico-imx7d_defconfig | 2 +- configs/pico-pi-imx6ul_defconfig | 2 +- configs/pico-pi-imx7d_defconfig | 2 +- configs/platinum_picon_defconfig | 2 +- configs/platinum_titanium_defconfig | 2 +- configs/riotboard_defconfig | 2 +- configs/riotboard_spl_defconfig | 2 +- configs/s32v234evb_defconfig | 2 +- configs/secomx6quq7_defconfig | 2 +- configs/sksimx6_defconfig | 2 +- configs/tbs2910_defconfig | 2 +- configs/titanium_defconfig | 2 +- configs/tqma6dl_mba6_mmc_defconfig | 2 +- configs/tqma6dl_mba6_spi_defconfig | 2 +- configs/tqma6q_mba6_mmc_defconfig | 2 +- configs/tqma6q_mba6_spi_defconfig | 2 +- configs/tqma6s_mba6_mmc_defconfig | 2 +- configs/tqma6s_mba6_spi_defconfig | 2 +- configs/tqma6s_wru4_mmc_defconfig | 2 +- configs/ts4800_defconfig | 2 +- configs/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/usbarmory_defconfig | 2 +- configs/variscite_dart6ul_defconfig | 2 +- configs/vf610twr_defconfig | 2 +- configs/vf610twr_nand_defconfig | 2 +- configs/vining_2000_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/warp7_bl33_defconfig | 2 +- configs/warp7_defconfig | 2 +- configs/warp_defconfig | 2 +- configs/woodburn_defconfig | 2 +- configs/woodburn_sd_defconfig | 2 +- configs/xpress_defconfig | 2 +- configs/xpress_spl_defconfig | 2 +- configs/zc5202_defconfig | 2 +- configs/zc5601_defconfig | 2 +- drivers/mmc/Kconfig | 10 +- drivers/mmc/Makefile | 1 + drivers/mmc/fsl_esdhc.c | 626 +--------------------- drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} | 72 +-- include/configs/imx8mq_evk.h | 1 - include/configs/imx8qm_mek.h | 1 - include/configs/imx8qxp_mek.h | 1 - include/configs/kp_imx6q_tpc.h | 1 - include/configs/ls1012afrwy.h | 1 - include/fsl_esdhc.h | 57 -- include/{fsl_esdhc.h => fsl_esdhc_imx.h} | 17 +- 245 files changed, 351 insertions(+), 1047 deletions(-) copy drivers/mmc/{fsl_esdhc.c => fsl_esdhc_imx.c} (95%) copy include/{fsl_esdhc.h => fsl_esdhc_imx.h} (97%) -- 2.7.4

1 5

[U-Boot] [PATCH 1/5] spl: dm: disable SPI DM flash for non-DM SPL
by Chuanhua Han 03 Jun '19

03 Jun '19

From: Pan Jiafei <Jiafei.Pan(a)freescale.com> This patch solves the problem that spiboot cannot be performed in non-DM SPL. Signed-off-by: Pan Jiafei <Jiafei.Pan(a)freescale.com> Signed-off-by: Chuanhua Han <chuanhua.han(a)nxp.com> --- depends on: - https://patchwork.ozlabs.org/project/uboot/list/?series=99439 include/config_uncmd_spl.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h index c2f9735ce7..da94b3d9df 100644 --- a/include/config_uncmd_spl.h +++ b/include/config_uncmd_spl.h @@ -15,6 +15,7 @@ #undef CONFIG_DM_GPIO #undef CONFIG_DM_I2C #undef CONFIG_DM_SPI +#undef CONFIG_DM_SPI_FLASH #endif #undef CONFIG_DM_WARN -- 2.17.1

3 20