September 2019 - U-Boot

[U-Boot] [PATCH] configs: rk3288: Increase bootm length
by Jagan Teki 18 Sep '19

18 Sep '19

Increase bootm length to 64MB satisfy max gunzip size, even other rockchip and know SoC are following same length check. Reported-by: Michael Trimarchi <michael(a)amarulasolutions.com> Signed-off-by: Jagan Teki <jagan(a)amarulasolutions.com> --- include/configs/rk3288_common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index bcda769af5..910fe58822 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -9,7 +9,7 @@ #include <asm/arch-rockchip/hardware.h> #include "rockchip-common.h" -#define CONFIG_SYS_BOOTM_LEN (16 << 20) /* 16MB */ +#define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64MB */ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY #define CONFIG_SYS_CBSIZE 1024 -- 2.18.0.321.gffc6fa0e3

2 1

[U-Boot] [PATCH] armv8: ls1028a: add more personalities support
by Yuantian Tang 18 Sep '19

18 Sep '19

Add three more personalities support to LS1028A processor soc family. LS1028A processor is the prime personality of LS1028A soc family. LS1027A processor is a lower funtionality version of QorIQ LS1028A which does not support the multimedia subsystems, such as LCD controller, GPU, and eDP PHY. The QorIQ LS1018A and LS1017A are low power versions of the QorIQ LS1028A and LS1027A processors, respectively which integrate single 64-bit Arm A72 core. Signed-off-by: Tang Yuantian <andy.tang(a)nxp.com> --- arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 3 +++ arch/arm/include/asm/arch-fsl-layerscape/soc.h | 3 +++ 2 files changed, 6 insertions(+) diff --git a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c index 3e2a24fe80..dee96afe2d 100644 --- a/arch/arm/cpu/armv8/fsl-layerscape/cpu.c +++ b/arch/arm/cpu/armv8/fsl-layerscape/cpu.c @@ -58,6 +58,9 @@ static struct cpu_type cpu_type_list[] = { CPU_TYPE_ENTRY(LS1026A, LS1026A, 2), CPU_TYPE_ENTRY(LS2040A, LS2040A, 4), CPU_TYPE_ENTRY(LS1012A, LS1012A, 1), + CPU_TYPE_ENTRY(LS1017A, LS1017A, 1), + CPU_TYPE_ENTRY(LS1018A, LS1018A, 1), + CPU_TYPE_ENTRY(LS1027A, LS1027A, 2), CPU_TYPE_ENTRY(LS1028A, LS1028A, 2), CPU_TYPE_ENTRY(LS1088A, LS1088A, 8), CPU_TYPE_ENTRY(LS1084A, LS1084A, 8), diff --git a/arch/arm/include/asm/arch-fsl-layerscape/soc.h b/arch/arm/include/asm/arch-fsl-layerscape/soc.h index 8d6541cb94..8bbf342d90 100644 --- a/arch/arm/include/asm/arch-fsl-layerscape/soc.h +++ b/arch/arm/include/asm/arch-fsl-layerscape/soc.h @@ -83,6 +83,9 @@ enum boot_src get_boot_src(void); /* LS1043A/LS1023A 23x23 package silicon has different value of VAR_PER */ #define SVR_LS1043A_P23 0x879202 #define SVR_LS1023A_P23 0x87920A +#define SVR_LS1017A 0x870B24 +#define SVR_LS1018A 0x870B20 +#define SVR_LS1027A 0x870B04 #define SVR_LS1028A 0x870B00 #define SVR_LS1046A 0x870700 #define SVR_LS1026A 0x870708 -- 2.17.1

3 2

[U-Boot] [PATCH v2 0/2] efi_loader: support APPEND_WRITE
by AKASHI Takahiro 18 Sep '19

18 Sep '19

Changes in v2 (Sept 6, 2019) * add a check against read-only variable to delete with APPEND_WRITE * add a check against non-existent variable to append * add/modify APPEND_WRITE tests AKASHI Takahiro (2): efi_loader: variable: support APPEND_WRITE efi_loader: selftest: enable APPEND_WRITE tests lib/efi_loader/efi_variable.c | 70 ++++++++++++++--------- lib/efi_selftest/efi_selftest_variables.c | 20 ++++++- 2 files changed, 63 insertions(+), 27 deletions(-) -- 2.21.0

3 6

[U-Boot] pull request u-boot-fsl-qoriq
by Priyanka Jain 18 Sep '19

18 Sep '19

Dear Tom, Please find my pull-request for u-boot-fsl-qoriq/master https://travis-ci.org/p-priyanka-jain/u-boot/builds/584428184 Summary Add emmc hs200 support Few bug fixes related to serdes, I2C, ethernet, etc priyankajain ----------------------------- The following changes since commit 001c8ea94ae710d8340829237a7d788b25ce2ae7: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2019-09-10 08:52:00 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to 737c016d25d6c45e9c003fca9df2ca75f0b1e772: lx2160: Correct serdes frequency print. (2019-09-12 16:15:42 +0530) ---------------------------------------------------------------- The following changes since commit 002c8ea94ae710d8340829237a7d788b25ce2ae7: Merge https://gitlab.denx.de/u-boot/custodians/u-boot-x86 (2019-09-10 08:52:00 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-fsl-qoriq.git HEAD for you to fetch changes up to 737c016d25d6c45e9c003fca9df2ca75f0b1e772: lx2160: Correct serdes frequency print. (2019-09-12 16:15:42 +0530) ---------------------------------------------------------------- Alex Marginean (1): arm: dts: ls1028a-qds: define the MDIO MUX Chuanhua Han (1): armv8: fsl-layerscape: Update I2C clock divider Florin Chiculita (2): board: lx2160aqds: fix ethernet-phy compatible property board: lx2160aqds: add support for SerDes protocol 14 Hou Zhiqiang (2): armv8: fsl-layerscape: Fix typo in Layerscape PCIe config entry armv8: ls1028a: Updated serdes configuration for 0x13BB Meenakshi Aggarwal (1): lx2160: Correct serdes frequency print. Pankaj Bansal (2): board/lx2160a: Fix MC firmware loading for SD boot board: fsl: lx2160a: implement board_fix_fdt Thomas Schaefer (2): armv8: ls1028a: configure PMU's PCTBENR to enable WDT watchdog: sp805_wdt: add expire_now method Yinbo Zhu (7): fsl-layerscape: Add fsl_esdhc peripheral clock support mmc: Kconfig: Add FSL_ESDHC_USE_PERIPHERAL_CLK option dts: armv8: add emmc hs200 support for ls1012ardb dts: armv8: add emmc hs200 support for lx2160ardb dts: armv8: add emmc hs200 support for ls1028ardb mmc: fsl_esdhc: Add emmc hs200 support configs/ls1012ardb,lx2160ardb,ls1028ardb: add esdhc hs200 config arch/arm/cpu/armv8/fsl-layerscape/Kconfig | 4 ++ arch/arm/cpu/armv8/fsl-layerscape/cpu.c | 6 +- arch/arm/cpu/armv8/fsl-layerscape/fdt.c | 2 +- .../arm/cpu/armv8/fsl-layerscape/fsl_lsch2_speed.c | 49 +++++++++------ .../arm/cpu/armv8/fsl-layerscape/fsl_lsch3_speed.c | 45 +++++++++++++- arch/arm/cpu/armv8/fsl-layerscape/ls1028a_serdes.c | 2 +- arch/arm/dts/fsl-ls1012a-rdb.dtsi | 4 ++ arch/arm/dts/fsl-ls1028a-qds.dts | 56 ++++++++++++++++- arch/arm/dts/fsl-ls1028a-rdb.dts | 1 + arch/arm/dts/fsl-lx2160a-rdb.dts | 1 + .../include/asm/arch-fsl-layerscape/immap_lsch2.h | 2 +- .../include/asm/arch-fsl-layerscape/immap_lsch3.h | 1 + board/freescale/lx2160a/eth_lx2160aqds.c | 6 +- board/freescale/lx2160a/lx2160a.c | 70 +++++++++++++++++++++- configs/ls1012ardb_tfa_defconfig | 2 + configs/ls1028ardb_tfa_defconfig | 2 + configs/lx2160aqds_tfa_defconfig | 1 + configs/lx2160ardb_tfa_defconfig | 3 + drivers/mmc/Kconfig | 10 +++- drivers/mmc/fsl_esdhc.c | 34 ++++++----- drivers/watchdog/sp805_wdt.c | 10 +++- include/configs/lx2160a_common.h | 12 ++-- include/fsl_esdhc.h | 4 ++ 23 files changed, 275 insertions(+), 52 deletions(-)

2 1

[U-Boot] Pull request: u-boot-spi/master
by Jagan Teki 18 Sep '19

18 Sep '19

Hi Tom, Please pull this for v2019.10 release. Summary: - fix mvebu_a3700_spi clock prescale (Marek Behún) - unmark MXS_SPI, DEPRECATED (Lukasz) - add spi_write_then_read (Jagan) - fix SST26* flash ICs (Eugeniy) - fix soft_spi data abort (Christophe) The following changes since commit 23b93e33adde0a8313388eda7c78d1d0786e3c92: Merge branch '2019-09-13-ti-imports' (2019-09-14 19:53:24 -0400) are available in the Git repository at: https://gitlab.denx.de/u-boot/custodians/u-boot-spi.git master for you to fetch changes up to ce704ea11f29b0ee8c195f17370a4048b6be29a9: doc: driver-model: Update SPI migration status (2019-09-16 08:09:22 +0530) ---------------------------------------------------------------- Christophe Kerello (1): spi: soft_spi: Fix data abort if slave is not probed Eugeniy Paltsev (2): mtd: spi-nor: add missing SST26* flash IC protection ops mtd: spi-nor: enable protection ops for SST26 flash series Jagan Teki (4): spi: Add spi_write_then_read mtd: spi_dataflash: Use spi read then write mtd: spi: Drop sf.c doc: driver-model: Update SPI migration status Lukasz Majewski (1): spi: Kconfig: Unmark DEPRECATED for MXS_SPI Marek Behún (1): spi: mvebu_a3700_spi: Fix clock prescale computation doc/driver-model/migration.rst | 3 +- drivers/mtd/spi/Makefile | 2 +- drivers/mtd/spi/sf.c | 53 ------------ drivers/mtd/spi/sf_dataflash.c | 22 +++-- drivers/mtd/spi/sf_internal.h | 19 +---- drivers/mtd/spi/spi-nor-core.c | 181 +++++++++++++++++++++++++++++++++++++++++ drivers/mtd/spi/spi-nor-ids.c | 8 +- drivers/spi/Kconfig | 1 - drivers/spi/mvebu_a3700_spi.c | 5 +- drivers/spi/soft_spi.c | 4 +- drivers/spi/spi-uclass.c | 24 ++++++ include/linux/mtd/spi-nor.h | 4 + include/spi.h | 20 +++++ 13 files changed, 253 insertions(+), 93 deletions(-) delete mode 100644 drivers/mtd/spi/sf.c

2 1

[U-Boot] [PATCH 00/17] Convert some imx6 boards to DM_VIDEO
by Anatolij Gustschin 17 Sep '19

17 Sep '19

This series starts conversion of ipuv3 driver to DM_VIDEO. It has been tested on apalis_imx6 module with LVDS display attached and on wandboard with HDMI display. With applied "[PATCH 17/17] imx6: wandboard: convert to DM_MMC" building wandboard target doesn't work. To fix this please apply patches [1], [2] and enable CONFIG_AHCI and CONFIG_DM_SCSI in wandboard_defconfig. [1] http://patchwork.ozlabs.org/patch/1050141 [2] http://patchwork.ozlabs.org/patch/1050143 Anatolij Gustschin (17): video: ipuv3: add DM_VIDEO support video: move ipuv3 files to subdirectory imx: move CONFIG_VIDEO_IPUV3 to defconfigs imx6: dts: add 'u-boot,dm-pre-reloc' to soc and ipu nodes apalis_imx6: convert to DM_VIDEO imx6: icore: convert to DM_VIDEO imx6: ge_bx50v3: convert to DM_VIDEO colibri_imx6: convert to DM_VIDEO mx6sabresd: convert to DM_VIDEO mx6sabreauto: convert to DM_VIDEO imx6: wandboard: add device tree imx6: wandboard: convert to DM_GPIO and enable pinctrl driver imx6: wandboard: convert to DM_USB imx6: wandboard: convert to DM_VIDEO imx6: wandboard: convert to DM_PMIC imx6: wandboard: convert to DM_I2C imx6: wandboard: convert to DM_MMC arch/arm/dts/imx6dl-wandboard-revb1.dts | 18 + arch/arm/dts/imx6qdl-wandboard-revb1.dtsi | 41 +++ arch/arm/dts/imx6qdl-wandboard.dtsi | 380 ++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 2 + arch/arm/include/asm/mach-imx/video.h | 1 + arch/arm/mach-imx/video.c | 25 +- board/wandboard/MAINTAINERS | 3 + board/wandboard/spl.c | 92 ++++++ board/wandboard/wandboard.c | 160 +++------ configs/apalis_imx6_defconfig | 4 +- configs/aristainetos2_defconfig | 1 + configs/aristainetos2b_defconfig | 1 + configs/aristainetos_defconfig | 1 + configs/cgtqmx6eval_defconfig | 1 + configs/cm_fx6_defconfig | 1 + configs/colibri_imx6_defconfig | 3 +- configs/dms-ba16-1g_defconfig | 1 + configs/dms-ba16_defconfig | 1 + configs/ge_bx50v3_defconfig | 2 + configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6qdl_icore_mmc_defconfig | 2 +- configs/imx6qdl_icore_nand_defconfig | 2 +- configs/m53menlo_defconfig | 1 + configs/marsboard_defconfig | 1 + configs/mx51evk_defconfig | 1 + configs/mx53cx9020_defconfig | 1 + configs/mx53loco_defconfig | 1 + configs/mx53ppd_defconfig | 1 + configs/mx6cuboxi_defconfig | 1 + configs/mx6qsabrelite_defconfig | 1 + configs/mx6sabreauto_defconfig | 3 +- configs/mx6sabresd_defconfig | 3 +- configs/nitrogen6dl2g_defconfig | 1 + configs/nitrogen6dl_defconfig | 1 + configs/nitrogen6q2g_defconfig | 1 + configs/nitrogen6q_defconfig | 1 + configs/nitrogen6s1g_defconfig | 1 + configs/nitrogen6s_defconfig | 1 + configs/novena_defconfig | 1 + configs/riotboard_defconfig | 1 + configs/riotboard_spl_defconfig | 1 + configs/tbs2910_defconfig | 1 + configs/wandboard_defconfig | 18 +- drivers/video/Kconfig | 9 +- drivers/video/Makefile | 2 +- drivers/video/imx/Kconfig | 8 + drivers/video/imx/Makefile | 6 + drivers/video/{ => imx}/ipu.h | 0 drivers/video/{ => imx}/ipu_common.c | 0 drivers/video/{ => imx}/ipu_disp.c | 0 drivers/video/{ => imx}/ipu_regs.h | 0 drivers/video/{ => imx}/mxc_ipuv3_fb.c | 89 ++++- drivers/video/{ => imx}/mxcfb.h | 0 include/configs/advantech_dms-ba16.h | 1 - include/configs/apalis_imx6.h | 1 - include/configs/aristainetos-common.h | 1 - include/configs/cgtqmx6eval.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/embestmx6boards.h | 1 - include/configs/ge_bx50v3.h | 8 - include/configs/gw_ventana.h | 1 - include/configs/m53menlo.h | 1 - include/configs/mx51evk.h | 1 - include/configs/mx53cx9020.h | 1 - include/configs/mx53loco.h | 1 - include/configs/mx53ppd.h | 5 - include/configs/mx6cuboxi.h | 1 - include/configs/mx6sabre_common.h | 1 - include/configs/nitrogen6x.h | 1 - include/configs/novena.h | 1 - include/configs/tbs2910.h | 1 - include/configs/wandboard.h | 18 - 77 files changed, 766 insertions(+), 187 deletions(-) create mode 100644 arch/arm/dts/imx6dl-wandboard-revb1.dts create mode 100644 arch/arm/dts/imx6qdl-wandboard-revb1.dtsi create mode 100644 arch/arm/dts/imx6qdl-wandboard.dtsi create mode 100644 drivers/video/imx/Kconfig create mode 100644 drivers/video/imx/Makefile rename drivers/video/{ => imx}/ipu.h (100%) rename drivers/video/{ => imx}/ipu_common.c (100%) rename drivers/video/{ => imx}/ipu_disp.c (100%) rename drivers/video/{ => imx}/ipu_regs.h (100%) rename drivers/video/{ => imx}/mxc_ipuv3_fb.c (88%) rename drivers/video/{ => imx}/mxcfb.h (100%) -- 2.17.1

3 43

[U-Boot] [PATCH v2 1/2] Revert "configs: Remove am335x_boneblack_defconfig"
by Sam Protsenko 17 Sep '19

17 Sep '19

Commit 8fa7f65dd02c ("configs: Remove am335x_boneblack_defconfig") removes defconfig for BeagleBone Black board, and it's advised to use am335x_evm_defconfig for all AM335x boards. But it's impossible to store environment in eMMC with am335x_evm_defconfig without modifications (NAND must be disabled, MMC enabled, etc). This is inconvenient for user to do such modifications via menuconfig (only developer knows what should be done). Furthermore, enabling MMC options in am335x_evm_defconfig leads to wrong pin-muxing scheme in board/ti/am335x/mux.c, because both NAND and MMC options are enabled in the config, so that pins are muxed for BBB with NAND cape, which in turn leads to non-functioning eMMC. There is no way to make the single defconfig working for both eMMC and NAND use-cases, because we can't figure out in run-time which board configuration is used by user (EVM, BBB, or BBB with NAND cape). Hence we rely on CONFIG options to figure out which configuration is used. Because of this we can't use single defconfig for AM335x EVM and BBB. All that said, let's bring back am335x_boneblack_defconfig, because right now users are not able to use U-Boot for BBB. Further patch will update this defconfig by enabling Driver Model and pulling some other useful options from am335x_evm_defconfig. Fixes: 8fa7f65dd02c ("configs: Remove am335x_boneblack_defconfig") Signed-off-by: Sam Protsenko <semen.protsenko(a)linaro.org> --- Changes in v2: - improve commit message by saying explicitly about eMMC env configs/am335x_boneblack_defconfig | 50 ++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 configs/am335x_boneblack_defconfig diff --git a/configs/am335x_boneblack_defconfig b/configs/am335x_boneblack_defconfig new file mode 100644 index 0000000000..439d0cba05 --- /dev/null +++ b/configs/am335x_boneblack_defconfig @@ -0,0 +1,50 @@ +CONFIG_ARM=y +CONFIG_ARCH_OMAP2PLUS=y +CONFIG_TI_COMMON_CMD_OPTIONS=y +CONFIG_AM33XX=y +CONFIG_SPL=y +CONFIG_DISTRO_DEFAULTS=y +CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT" +CONFIG_BOOTCOMMAND="if test ${boot_fit} -eq 1; then run update_to_fit; fi; run findfdt; run init_console; run envboot; run distro_bootcmd" +CONFIG_SYS_CONSOLE_INFO_QUIET=y +CONFIG_VERSION_VARIABLE=y +CONFIG_ARCH_MISC_INIT=y +CONFIG_SPL_MUSB_NEW_SUPPORT=y +# CONFIG_SPL_NAND_SUPPORT is not set +CONFIG_SPL_OS_BOOT=y +CONFIG_AUTOBOOT_KEYED=y +CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n" +CONFIG_AUTOBOOT_DELAY_STR="d" +CONFIG_AUTOBOOT_STOP_STR=" " +CONFIG_CMD_SPL=y +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y +CONFIG_BOOTCOUNT_LIMIT=y +CONFIG_DFU_TFTP=y +CONFIG_DFU_MMC=y +CONFIG_DFU_RAM=y +CONFIG_USB_FUNCTION_FASTBOOT=y +CONFIG_FASTBOOT_FLASH=y +CONFIG_FASTBOOT_FLASH_MMC_DEV=1 +CONFIG_FASTBOOT_CMD_OEM_FORMAT=y +CONFIG_MMC_OMAP_HS=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_WINBOND=y +CONFIG_MII=y +CONFIG_DRIVER_TI_CPSW=y +CONFIG_SPI=y +CONFIG_OMAP3_SPI=y +CONFIG_USB=y +CONFIG_USB_MUSB_HOST=y +CONFIG_USB_MUSB_GADGET=y +CONFIG_USB_MUSB_DSPS=y +CONFIG_USB_GADGET=y +CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" +CONFIG_USB_GADGET_VENDOR_NUM=0x0451 +CONFIG_USB_GADGET_PRODUCT_NUM=0xd022 +CONFIG_USB_ETHER=y +CONFIG_USBNET_HOST_ADDR="de:ad:be:af:00:00" +CONFIG_LZO=y +CONFIG_OF_LIBFDT=y -- 2.23.0

2 6

[U-Boot] Raspberry PI Compute Module - UART Issue
by Lee Annamalai 17 Sep '19

17 Sep '19

Hi I am using a Raspberry PI compute module (CM 3+), which seems to be running U-Boot - U-Boot 2019.04-dirty (Aug 21 2019 - 14:41:54 +0000) The CM3+ is communicating on the UART at boot, before the Kernel loads: U-Boot 2019.04-dirty (Aug 21 2019 - 14:41:54 +0000) DRAM: 948 MiB RPI Compute Module 3 (0xa220a0) MMC: mmc@7e202000: 0, sdhci@7e300000: 1 Loading Environment from FAT... WARNING at drivers/mmc/bcm2835_sdhost.c:408/bcm2835_send_command()! WARNING at drivers/mmc/bcm2835_sdhost.c:408/bcm2835_send_OK In: serial Out: serial 1 0 WARNING at drivers/mmc/bcm2835_sdhost.c:408/bcm2835_send_command()! WARNING at drivers/mmc/bcm2835_sdhost.c:408/bcm2835_send_command()! switch to partitions #0, OK mmc0(part 0) is current device LOADBOOTENV Running uenvcmd ... ENVCMD 6697472 bytes read in 285 ms (22.4 MiB/s) 3647066 bytes read in 155 ms (22.4 MiB/s) 42064 bytes read in 12 ms (3.3 MiB/s) Kernel image @ 0x200000 [ 0x000000 - 0x663200 ] ## Flattened Device Tree blob at 02000000 Booting using the fdt blob at OK Loa Starting kern I however have a serial device connected to the UART and it starts communicating on power on to the UART. This is causing the boot process to stop. I would like to find out how to stop U-BOOT from reading messages on the UART at boot? Regards Lee Annamalai

2 2

[U-Boot] [PATCH] mmc: dw_mmc: Clean up variable name
by Michael Trimarchi 17 Sep '19

17 Sep '19

Signed-off-by: Michael Trimarchi <michael(a)amarulasolutions.com> --- drivers/mmc/dw_mmc.c | 4 ++-- include/dwmmc.h | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c index ebe7bcdd90..e5b532a862 100644 --- a/drivers/mmc/dw_mmc.c +++ b/drivers/mmc/dw_mmc.c @@ -86,7 +86,7 @@ static void dwmci_prepare_data(struct dwmci_host *host, flush_dcache_range(data_start, roundup(data_end, ARCH_DMA_MINALIGN)); ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl |= DWMCI_IDMAC_EN | DWMCI_DMA_EN; + ctrl |= DWMCI_CTRL_USE_IDMAC | DWMCI_CTRL_DMA_EN; dwmci_writel(host, DWMCI_CTRL, ctrl); ctrl = dwmci_readl(host, DWMCI_BMOD); @@ -383,7 +383,7 @@ static int dwmci_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd, dwmci_writel(host, DWMCI_IDSTS, DWMCI_IDINTEN_MASK); ctrl = dwmci_readl(host, DWMCI_CTRL); - ctrl &= ~(DWMCI_DMA_EN); + ctrl &= ~(DWMCI_CTRL_DMA_EN); dwmci_writel(host, DWMCI_CTRL, ctrl); bounce_buffer_stop(&bbstate); } diff --git a/include/dwmmc.h b/include/dwmmc.h index f06720dc0d..2f57b6e774 100644 --- a/include/dwmmc.h +++ b/include/dwmmc.h @@ -75,9 +75,9 @@ #define DWMCI_CTRL_RESET (1 << 0) #define DWMCI_CTRL_FIFO_RESET (1 << 1) #define DWMCI_CTRL_DMA_RESET (1 << 2) -#define DWMCI_DMA_EN (1 << 5) +#define DWMCI_CTRL_DMA_EN (1 << 5) #define DWMCI_CTRL_SEND_AS_CCSD (1 << 10) -#define DWMCI_IDMAC_EN (1 << 25) +#define DWMCI_CTRL_USE_IDMAC (1 << 25) #define DWMCI_RESET_ALL (DWMCI_CTRL_RESET | DWMCI_CTRL_FIFO_RESET |\ DWMCI_CTRL_DMA_RESET) -- 2.17.1

3 2

[U-Boot] [PATCH] spl: add a generic function board_init_r
by Philippe Reynes 17 Sep '19

17 Sep '19

This commit add a generic function board_init_r that only initialize some device (for example serial). It avoid to define a board function only to launch the serial configuration. Signed-off-by: Philippe Reynes <philippe.reynes(a)softathome.com> --- common/spl/Kconfig | 8 ++++++++ common/spl/spl.c | 19 +++++++++++++++++++ 2 files changed, 27 insertions(+) diff --git a/common/spl/Kconfig b/common/spl/Kconfig index f467eca..d5b331a 100644 --- a/common/spl/Kconfig +++ b/common/spl/Kconfig @@ -25,6 +25,14 @@ config SPL_FRAMEWORK supports MMC, NAND and YMODEM and other methods loading of U-Boot and the Linux Kernel. If unsure, say Y. +config SPL_FRAMEWORK_BOARD_INIT_F + bool "Define a generic function board_init_f" + depends on SPL_FRAMEWORK + default n + help + Define a generic function board_init_f, unless you want to + provide your own board_init_f, you should say Y. + config SPL_SIZE_LIMIT int "Maximum size of SPL image" depends on SPL diff --git a/common/spl/spl.c b/common/spl/spl.c index 082fa2b..73bf984 100644 --- a/common/spl/spl.c +++ b/common/spl/spl.c @@ -566,6 +566,25 @@ static int boot_from_devices(struct spl_image_info *spl_image, return -ENODEV; } +#if defined(CONFIG_SPL_FRAMEWORK_BOARD_INIT_F) +void board_init_f(ulong dummy) +{ +#if CONFIG_IS_ENABLED(OF_CONTROL) + int ret; + + ret = spl_early_init(); + if (ret) { + debug("spl_early_init() failed: %d\n", ret); + hang(); + } +#endif + +#if CONFIG_IS_ENABLED(SERIAL_SUPPORT) + preloader_console_init(); +#endif +} +#endif + void board_init_r(gd_t *dummy1, ulong dummy2) { u32 spl_boot_list[] = { -- 2.7.4

3 2