January 2018 - U-Boot

[U-Boot] [PATCH] ARC: AXS10x: DTS: remove unused interrupts properties
by Eugeniy Paltsev 23 Jan '18

23 Jan '18

Some device tree nodes (like ethernet, ohci, ehci) in axs10x_mb.dtsi were copied from linux device tree, so they have interrupts properties. As we don't use interrupts in uboot we don't have interrupt controller node in AXS10x device tree. In result we get warnings when we compile such device tree. So remove unused interrupts properties to get rid of this warnings. Signed-off-by: Eugeniy Paltsev <Eugeniy.Paltsev(a)synopsys.com> --- arch/arc/dts/axs10x_mb.dtsi | 5 ----- 1 file changed, 5 deletions(-) diff --git a/arch/arc/dts/axs10x_mb.dtsi b/arch/arc/dts/axs10x_mb.dtsi index b74d3c8..17ef656 100644 --- a/arch/arc/dts/axs10x_mb.dtsi +++ b/arch/arc/dts/axs10x_mb.dtsi @@ -31,11 +31,8 @@ }; ethernet@18000 { - #interrupt-cells = <1>; compatible = "altr,socfpga-stmmac"; reg = < 0x18000 0x2000 >; - interrupts = < 25 >; - interrupt-names = "macirq"; phy-mode = "gmii"; snps,pbl = < 32 >; clocks = <&apbclk>; @@ -46,13 +43,11 @@ ehci@0x40000 { compatible = "generic-ehci"; reg = < 0x40000 0x100 >; - interrupts = < 8 >; }; ohci@0x60000 { compatible = "generic-ohci"; reg = < 0x60000 0x100 >; - interrupts = < 8 >; }; uart0: serial0@22000 { -- 2.9.3

1 0

[U-Boot] [PATCH] mx8mqevk: Update README with additional info
by Diego Dorta 23 Jan '18

23 Jan '18

The main reason for this update is due the currently README has no enough info to boot the board. Add a few more steps that make the board bootable. Signed-off-by: Diego Dorta <diego.dorta(a)nxp.com> --- This patch depends on Peng Fan's patch series: https://patchwork.ozlabs.org/cover/857942/ board/freescale/mx8mq_evk/README | 92 +++++++++++++++++++++++++++------------- 1 file changed, 63 insertions(+), 29 deletions(-) diff --git a/board/freescale/mx8mq_evk/README b/board/freescale/mx8mq_evk/README index 5a6e8b84d7..cd7e67eec5 100644 --- a/board/freescale/mx8mq_evk/README +++ b/board/freescale/mx8mq_evk/README @@ -1,47 +1,81 @@ U-Boot for the NXP i.MX8MQ EVK board Quick Start -==================== -- Build the ARM Trusted firmware binary +=========== + - Build U-Boot -- Get ddr fimware and tools +- Build the ARM Trusted firmware binary +- Get DDR firmware and mkimage tool - Generate flash.bin using imx-mkimage +- Flash the binary into the SD card - Boot -Get and Build the ARM Trusted firmware -==================== -Get ATF from: https://source.codeaurora.org/external/imx/imx-atf -$ make PLAT=imx8mq bl31 - Build U-Boot -==================== -$ export ARCH=arm64 -$ export CROSS_COMPILE=aarch64-poky-linux- +============ + $ make mx8mq_evk_defconfig $ make -Get the ddr firmware and tools -==================== -Note: Better to use NXP released yocto to get the firmware in case - there is new releases. -https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.2.bin -imx-mkimage: https://source.codeaurora.org/external/imx/imx-mkimage/ +Get and Build the ARM Trusted firmware +====================================== + +$ git clone https://source.codeaurora.org/external/imx/imx-atf +$ cd imx-atf/ +$ git checkout origin/imx_4.9.51_imx8m_beta +$ make PLAT=imx8mq bl31 + +Get the DDR firmware and mkimage tool +============================== + +$ wget https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.2.bin +$ chmod +x firmware-imx-7.2.bin +$ ./firmware-imx-7.2.bin + +Download the imx-mkimage tool: + +$ git clone https://source.codeaurora.org/external/imx/imx-mkimage/ +$ cd imx-mkimage/ +$ git checkout origin/imx_4.9.51_imx8m_beta + Generate flash.bin using imx-mkimage -==================== -Copy bl31.bin u-boot-nodtb.bin u-boot-spl.bin fsl-imx8mq-evk.dtb to - imx-mkimage/iMX8M -Copy lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin - lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin to - imx-mkimage/iMX8M -If you want to run with HDMI, copy signed_hdmi_imx8m.bin to imx-mkimage/iMX8M +==================================== + +Copy the following binaries to imx-mkimage/iMX8M folder: + +$ cp imx-atf/build/imx8mq/release/bl31.bin imx-mkimage/iMX8M/ +$ cp u-boot/u-boot-nodtb.bin imx-mkimage/iMX8M/ +$ cp u-boot/spl/u-boot-spl.bin imx-mkimage/iMX8M/ +$ cp u-boot/arch/arm/dts/fsl-imx8mq-evk.dtb imx-mkimage/iMX8M/ + +Copy the following firmwares to imx-mkimage/iMX8 folder : + +$ cp firmware-imx-7.2/firmware/ddr/synopsys/lpddr4_pmu_train_1d_dmem.bin imx-mkimage/iMX8M/ +$ cp firmware-imx-7.2/firmware/ddr/synopsys/lpddr4_pmu_train_1d_imem.bin imx-mkimage/iMX8M/ +$ cp firmware-imx-7.2/firmware/ddr/synopsys/lpddr4_pmu_train_2d_dmem.bin imx-mkimage/iMX8M/ +$ cp firmware-imx-7.2/firmware/ddr/synopsys/lpddr4_pmu_train_2d_imem.bin imx-mkimage/iMX8M/ + +If you want to run with HDMI, copy signed_hdmi_imx8m.bin to imx-mkimage/iMX8M. + +Before generating the flash.bin, transfer the mkimage generated by U-Boot to iMX8M folder: + +$ cp u-boot/tools/mkimage imx-mkimage/iMX8M/ +$ mv imx-mkimage/iMX8M/mkimage imx-mkimage/iMX8M/mkimage_uboot + +$ cd imx-mkimage/ +$ make SOC=iMX8M flash_spl_uboot + +Or for using HDMI: + +$ make SOC=iMX8M flash_hdmi_spl_uboot + +Flash the binary into the SD card +================================= -make SOC=iMX8M flash_hdmi_spl_uboot or make SOC=iMX8M flash_spl_uboot to -generate flash.bin. +Burn the flash.bin binary to SD card offset 33KB: -Burn the flash.bin to MicroSD card offset 33KB -$sudo dd if=iMX8M/flash.bin of=/dev/sd[x] bs=1024 seek=33 +$ sudo dd if=iMX8M/flash.bin of=/dev/sd[x] bs=1024 seek=33 Boot -==================== +==== Set Boot switch SW801: 1100 and Bmode: 10 to boot from Micro SD. -- 2.15.1

1 0

[U-Boot] [PATCH v2 0/3] cadence-quadspi: Fix issues with non 32bit aligned accesses
by Vignesh R 23 Jan '18

23 Jan '18

This series reverts use of bounce_buf.c for non-DMA related alignment restriction and replaces it with local bounce buffer to handle problems with non 32 bit aligned writes on TI platforms. Based on top of Jason's series: https://patchwork.ozlabs.org/cover/856431/ Tested on K2G EVM. Goldschmidt Simon (1): Revert "spi: cadence_qspi_apb: Use 32 bit indirect read transaction when possible" Vignesh R (2): Revert "spi: cadence_qspi_apb: Use 32 bit indirect write transaction when possible" spi: cadence_qspi_apb: Make flash writes 32 bit aligned drivers/spi/cadence_qspi_apb.c | 49 ++++++++++++++++++---------------------- include/configs/k2g_evm.h | 1 - include/configs/socfpga_common.h | 1 - include/configs/stv0991.h | 1 - 4 files changed, 22 insertions(+), 30 deletions(-) -- 2.15.1

5 16

Re: [U-Boot] [PATCH V5 31/31] imx: add i.MX8MQ EVK support
by Peng Fan 23 Jan '18

23 Jan '18

Hi Stefano, On Mon, Jan 22, 2018 at 01:13:17PM +0100, Stefano Babic wrote: >Hi Peng, > >On 10/01/2018 06:20, Peng Fan wrote: >> Add i.MX8MQ EVK support. SPL will initialize ddr and load ddr phy >> firmware. Then loading FIT image, ATF to OCRAM, U-Boot and DTB to >> DRAM. >> >> The boot log with Arm trusted firmware console enabled: >> " >> U-Boot SPL 2018.01-00038-gbd426c08ea (Jan 10 2018 - 13:14:56) >> PMIC: PFUZE100 ID=0x10 >> Normal Boot >> Trying to boot from MMC2 >> NOTICE: Configureing TZASC380 >> NOTICE: BL31: v1.4(release):o8.0.0_1.3.0_8m-prc-20171211-6-g54fb0797-dirty >> NOTICE: BL31: Built : 07:17:16, Jan 8 2018 >> NOTICE: sip svc init >> >> U-Boot 2018.01-00038-gbd426c08ea (Jan 10 2018 - 13:14:56 +0800) >> >> CPU: Freescale i.MX8MQ rev2.0 at 1000 MHz >> Reset cause: POR >> Model: Freescale i.MX8MQ EVK >> DRAM: 3 GiB >> MMC: FSL_SDHC: 0, FSL_SDHC: 1 >> Using default environment >> >> In: serial >> Out: serial >> Err: serial >> Net: No ethernet found. >> Hit any key to stop autoboot: 0 >> u-boot=> >> " > >If I see the output here, I am expecting the setup forthe working >peripherals. Without ethernet working, why do we activate FEC and set >the PHY ? > >I would suggest to start with the minimal (=that is, all that is >working), adding later when peripherals will be successfully added and >tested. ok. I'll minimize the changes. > >> >> Signed-off-by: Peng Fan <peng.fan(a)nxp.com> >> Cc: Fabio Estevam <fabio.estevam(a)nxp.com> >> Cc: Stefano Babic <sbabic(a)denx.de> >> --- >> arch/arm/dts/Makefile | 2 + >> arch/arm/dts/fsl-imx8mq-evk.dts | 424 +++++++++ >> arch/arm/include/asm/arch-mx8m/ddr.h | 9 + >> arch/arm/mach-imx/mx8m/Kconfig | 12 + >> board/freescale/mx8mq_evk/Kconfig | 12 + >> board/freescale/mx8mq_evk/Makefile | 12 + >> board/freescale/mx8mq_evk/README | 47 + >> board/freescale/mx8mq_evk/ddr/ddr_init.c | 246 +++++ >> board/freescale/mx8mq_evk/ddr/ddrphy_train.c | 1272 ++++++++++++++++++++++++++ >> board/freescale/mx8mq_evk/ddr/helper.c | 101 ++ >> board/freescale/mx8mq_evk/mx8mq_evk.c | 156 ++++ >> board/freescale/mx8mq_evk/spl.c | 230 +++++ >> configs/mx8mq_evk_defconfig | 27 + >> include/configs/mx8mq_evk.h | 269 ++++++ >> 14 files changed, 2819 insertions(+) >> create mode 100644 arch/arm/dts/fsl-imx8mq-evk.dts >> create mode 100644 board/freescale/mx8mq_evk/Kconfig >> create mode 100644 board/freescale/mx8mq_evk/Makefile >> create mode 100644 board/freescale/mx8mq_evk/README >> create mode 100644 board/freescale/mx8mq_evk/ddr/ddr_init.c >> create mode 100644 board/freescale/mx8mq_evk/ddr/ddrphy_train.c >> create mode 100644 board/freescale/mx8mq_evk/ddr/helper.c >> create mode 100644 board/freescale/mx8mq_evk/mx8mq_evk.c >> create mode 100644 board/freescale/mx8mq_evk/spl.c >> create mode 100644 configs/mx8mq_evk_defconfig >> create mode 100644 include/configs/mx8mq_evk.h >> >> diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile >> index a895c70284..299107977f 100644 >> --- a/arch/arm/dts/Makefile >> +++ b/arch/arm/dts/Makefile >> @@ -391,6 +391,8 @@ dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ >> >> dtb-$(CONFIG_ARCH_MX7ULP) += imx7ulp-evk.dtb >> >> +dtb-$(CONFIG_ARCH_MX8M) += fsl-imx8mq-evk.dtb >> + >> dtb-$(CONFIG_RCAR_GEN3) += \ >> r8a7795-h3ulcb.dtb \ >> r8a7795-salvator-x.dtb \ >> diff --git a/arch/arm/dts/fsl-imx8mq-evk.dts b/arch/arm/dts/fsl-imx8mq-evk.dts >> new file mode 100644 >> index 0000000000..f0aa3485e6 >> --- /dev/null >> +++ b/arch/arm/dts/fsl-imx8mq-evk.dts >> @@ -0,0 +1,424 @@ >> +/* >> + * Copyright (C) 2016 Freescale Semiconductor, Inc. >> + * Copyright 2017 NXP >> + * >> + * This program is free software; you can redistribute it and/or >> + * modify it under the terms of the GNU General Public License >> + * as published by the Free Software Foundation; either version 2 >> + * of the License, or (at your option) any later version. >> + * >> + * This program is distributed in the hope that it will be useful, >> + * but WITHOUT ANY WARRANTY; without even the implied warranty of >> + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the >> + * GNU General Public License for more details. >> + */ >> + >> +/dts-v1/; >> + >> +/* First 128KB is for PSCI ATF. */ >> +/memreserve/ 0x40000000 0x00020000; >> + >> +#include "fsl-imx8mq.dtsi" >> + >> +/ { >> + model = "Freescale i.MX8MQ EVK"; >> + compatible = "fsl,imx8mq-evk", "fsl,imx8mq"; >> + >> + chosen { >> + bootargs = "console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200"; >> + }; >> + >> + regulators { >> + compatible = "simple-bus"; >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + reg_usdhc2_vmmc: usdhc2_vmmc { >> + compatible = "regulator-fixed"; >> + regulator-name = "VSD_3V3"; >> + regulator-min-microvolt = <3300000>; >> + regulator-max-microvolt = <3300000>; >> + gpio = <&gpio2 19 GPIO_ACTIVE_HIGH>; >> + enable-active-high; >> + }; >> + }; >> + >> + pwmleds { >> + compatible = "pwm-leds"; >> + >> + ledpwm2 { >> + label = "PWM2"; >> + pwms = <&pwm2 0 50000>; >> + max-brightness = <255>; >> + }; >> + }; >> +}; >> + >> +&iomuxc { >> + pinctrl-names = "default"; >> + >> + imx8mq-evk { >> + pinctrl_fec1: fec1grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC 0x3 >> + MX8MQ_IOMUXC_ENET_MDIO_ENET1_MDIO 0x23 >> + MX8MQ_IOMUXC_ENET_TD3_ENET1_RGMII_TD3 0x1f >> + MX8MQ_IOMUXC_ENET_TD2_ENET1_RGMII_TD2 0x1f >> + MX8MQ_IOMUXC_ENET_TD1_ENET1_RGMII_TD1 0x1f >> + MX8MQ_IOMUXC_ENET_TD0_ENET1_RGMII_TD0 0x1f >> + MX8MQ_IOMUXC_ENET_RD3_ENET1_RGMII_RD3 0x91 >> + MX8MQ_IOMUXC_ENET_RD2_ENET1_RGMII_RD2 0x91 >> + MX8MQ_IOMUXC_ENET_RD1_ENET1_RGMII_RD1 0x91 >> + MX8MQ_IOMUXC_ENET_RD0_ENET1_RGMII_RD0 0x91 >> + MX8MQ_IOMUXC_ENET_TXC_ENET1_RGMII_TXC 0x1f >> + MX8MQ_IOMUXC_ENET_RXC_ENET1_RGMII_RXC 0x91 >> + MX8MQ_IOMUXC_ENET_RX_CTL_ENET1_RGMII_RX_CTL 0x91 >> + MX8MQ_IOMUXC_ENET_TX_CTL_ENET1_RGMII_TX_CTL 0x1f >> + MX8MQ_IOMUXC_GPIO1_IO09_GPIO1_IO9 0x19 >> + >; >> + }; >> + >> + pinctrl_i2c1: i2c1grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_I2C1_SCL_I2C1_SCL 0x4000007f >> + MX8MQ_IOMUXC_I2C1_SDA_I2C1_SDA 0x4000007f >> + >; >> + }; >> + >> + pinctrl_i2c2: i2c2grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_I2C2_SCL_I2C2_SCL 0x4000007f >> + MX8MQ_IOMUXC_I2C2_SDA_I2C2_SDA 0x4000007f >> + >; >> + }; >> + >> + pinctrl_pwm2: pwm2grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_GPIO1_IO13_PWM2_OUT 0x16 >> + >; >> + }; >> + >> + pinctrl_qspi: qspigrp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_NAND_ALE_QSPI_A_SCLK 0x82 >> + MX8MQ_IOMUXC_NAND_CE0_B_QSPI_A_SS0_B 0x82 >> + MX8MQ_IOMUXC_NAND_DATA00_QSPI_A_DATA0 0x82 >> + MX8MQ_IOMUXC_NAND_DATA01_QSPI_A_DATA1 0x82 >> + MX8MQ_IOMUXC_NAND_DATA02_QSPI_A_DATA2 0x82 >> + MX8MQ_IOMUXC_NAND_DATA03_QSPI_A_DATA3 0x82 >> + >> + >; >> + }; >> + >> + pinctrl_usdhc1: usdhc1grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK 0x83 >> + MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6 0xc3 >> + MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7 0xc3 >> + MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x83 >> + MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B 0xc1 >> + >; >> + }; >> + >> + pinctrl_usdhc1_100mhz: usdhc1grp100mhz { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK 0x85 >> + MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6 0xc5 >> + MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7 0xc5 >> + MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x85 >> + MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B 0xc1 >> + >; >> + }; >> + >> + pinctrl_usdhc1_200mhz: usdhc1grp200mhz { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD1_CLK_USDHC1_CLK 0x87 >> + MX8MQ_IOMUXC_SD1_CMD_USDHC1_CMD 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA0_USDHC1_DATA0 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA1_USDHC1_DATA1 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA2_USDHC1_DATA2 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA3_USDHC1_DATA3 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA4_USDHC1_DATA4 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA5_USDHC1_DATA5 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA6_USDHC1_DATA6 0xc7 >> + MX8MQ_IOMUXC_SD1_DATA7_USDHC1_DATA7 0xc7 >> + MX8MQ_IOMUXC_SD1_STROBE_USDHC1_STROBE 0x87 >> + MX8MQ_IOMUXC_SD1_RESET_B_USDHC1_RESET_B 0xc1 >> + >; >> + }; >> + >> + pinctrl_usdhc2_gpio: usdhc2grpgpio { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD2_CD_B_GPIO2_IO12 0x41 >> + MX8MQ_IOMUXC_SD2_RESET_B_GPIO2_IO19 0x41 >> + >; >> + }; >> + >> + pinctrl_usdhc2: usdhc2grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK 0x83 >> + MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD 0xc3 >> + MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0 0xc3 >> + MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1 0xc3 >> + MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2 0xc3 >> + MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3 0xc3 >> + MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xc1 >> + >; >> + }; >> + >> + pinctrl_usdhc2_100mhz: usdhc2grp100mhz { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK 0x85 >> + MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD 0xc5 >> + MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0 0xc5 >> + MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1 0xc5 >> + MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2 0xc5 >> + MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3 0xc5 >> + MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xc1 >> + >; >> + }; >> + >> + pinctrl_usdhc2_200mhz: usdhc2grp200mhz { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SD2_CLK_USDHC2_CLK 0x87 >> + MX8MQ_IOMUXC_SD2_CMD_USDHC2_CMD 0xc7 >> + MX8MQ_IOMUXC_SD2_DATA0_USDHC2_DATA0 0xc7 >> + MX8MQ_IOMUXC_SD2_DATA1_USDHC2_DATA1 0xc7 >> + MX8MQ_IOMUXC_SD2_DATA2_USDHC2_DATA2 0xc7 >> + MX8MQ_IOMUXC_SD2_DATA3_USDHC2_DATA3 0xc7 >> + MX8MQ_IOMUXC_GPIO1_IO04_USDHC2_VSELECT 0xc1 >> + >; >> + }; >> + >> + pinctrl_sai2: sai2grp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_SAI2_TXFS_SAI2_TX_SYNC 0xd6 >> + MX8MQ_IOMUXC_SAI2_TXC_SAI2_TX_BCLK 0xd6 >> + MX8MQ_IOMUXC_SAI2_MCLK_SAI2_MCLK 0xd6 >> + MX8MQ_IOMUXC_SAI2_TXD0_SAI2_TX_DATA0 0xd6 >> + MX8MQ_IOMUXC_GPIO1_IO08_GPIO1_IO8 0xd6 >> + >; >> + }; >> + >> + pinctrl_wdog: wdoggrp { >> + fsl,pins = < >> + MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B 0xc6 >> + >; >> + }; >> + }; >> +}; >> + >> +&fec1 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_fec1>; >> + phy-mode = "rgmii-id"; >> + phy-handle = <&ethphy0>; >> + fsl,magic-packet; >> + status = "okay"; >> + >> + mdio { >> + #address-cells = <1>; >> + #size-cells = <0>; >> + >> + ethphy0: ethernet-phy@0 { >> + compatible = "ethernet-phy-ieee802.3-c22"; >> + reg = <0>; >> + at803x,led-act-blind-workaround; >> + at803x,eee-disabled; >> + }; >> + }; >> +}; >> + >> +&i2c1 { >> + clock-frequency = <100000>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c1>; >> + status = "okay"; >> + >> + pmic: pfuze100@08 { >> + compatible = "fsl,pfuze100"; >> + reg = <0x08>; >> + >> + regulators { >> + sw1a_reg: sw1ab { >> + regulator-min-microvolt = <300000>; >> + regulator-max-microvolt = <1875000>; >> + regulator-always-on; >> + }; >> + >> + sw1c_reg: sw1c { >> + regulator-min-microvolt = <300000>; >> + regulator-max-microvolt = <1875000>; >> + regulator-always-on; >> + }; >> + >> + sw2_reg: sw2 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + sw3a_reg: sw3ab { >> + regulator-min-microvolt = <400000>; >> + regulator-max-microvolt = <1975000>; >> + regulator-always-on; >> + }; >> + >> + sw4_reg: sw4 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + swbst_reg: swbst { >> + regulator-min-microvolt = <5000000>; >> + regulator-max-microvolt = <5150000>; >> + }; >> + >> + snvs_reg: vsnvs { >> + regulator-min-microvolt = <1000000>; >> + regulator-max-microvolt = <3000000>; >> + regulator-always-on; >> + }; >> + >> + vref_reg: vrefddr { >> + regulator-always-on; >> + }; >> + >> + vgen1_reg: vgen1 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <1550000>; >> + }; >> + >> + vgen2_reg: vgen2 { >> + regulator-min-microvolt = <800000>; >> + regulator-max-microvolt = <1550000>; >> + regulator-always-on; >> + }; >> + >> + vgen3_reg: vgen3 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vgen4_reg: vgen4 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vgen5_reg: vgen5 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + regulator-always-on; >> + }; >> + >> + vgen6_reg: vgen6 { >> + regulator-min-microvolt = <1800000>; >> + regulator-max-microvolt = <3300000>; >> + }; >> + }; >> + }; >> +}; >> + >> +&i2c2 { >> + clock-frequency = <100000>; >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_i2c2>; >> + status = "disabled"; >> +}; >> + >> +&pwm2 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_pwm2>; >> + status = "okay"; >> +}; >> + >> +&lcdif { >> + status = "okay"; >> + disp-dev = "mipi_dsi_northwest"; >> + display = <&display0>; >> + >> + display0: display@0 { >> + bits-per-pixel = <24>; >> + bus-width = <24>; >> + >> + display-timings { >> + native-mode = <&timing0>; >> + timing0: timing0 { >> + clock-frequency = <9200000>; >> + hactive = <480>; >> + vactive = <272>; >> + hfront-porch = <8>; >> + hback-porch = <4>; >> + hsync-len = <41>; >> + vback-porch = <2>; >> + vfront-porch = <4>; >> + vsync-len = <10>; >> + >> + hsync-active = <0>; >> + vsync-active = <0>; >> + de-active = <1>; >> + pixelclk-active = <0>; >> + }; >> + }; >> + }; >> +}; >> + >> +&qspi { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_qspi>; >> + status = "okay"; >> + >> + flash0: n25q256a@0 { >> + reg = <0>; >> + #address-cells = <1>; >> + #size-cells = <1>; >> + compatible = "micron,n25q256a"; >> + spi-max-frequency = <29000000>; >> + spi-nor,ddr-quad-read-dummy = <6>; >> + }; >> +}; >> + >> +&usdhc1 { >> + pinctrl-names = "default", "state_100mhz", "state_200mhz"; >> + pinctrl-0 = <&pinctrl_usdhc1>; >> + pinctrl-1 = <&pinctrl_usdhc1_100mhz>; >> + pinctrl-2 = <&pinctrl_usdhc1_200mhz>; >> + bus-width = <8>; >> + non-removable; >> + status = "okay"; >> +}; >> + >> +&usdhc2 { >> + pinctrl-names = "default", "state_100mhz", "state_200mhz"; >> + pinctrl-0 = <&pinctrl_usdhc2>, <&pinctrl_usdhc2_gpio>; >> + pinctrl-1 = <&pinctrl_usdhc2_100mhz>, <&pinctrl_usdhc2_gpio>; >> + pinctrl-2 = <&pinctrl_usdhc2_200mhz>, <&pinctrl_usdhc2_gpio>; >> + bus-width = <4>; >> + cd-gpios = <&gpio2 12 GPIO_ACTIVE_LOW>; >> + vmmc-supply = <&reg_usdhc2_vmmc>; >> + status = "okay"; >> +}; >> + >> +&wdog1 { >> + pinctrl-names = "default"; >> + pinctrl-0 = <&pinctrl_wdog>; >> + fsl,ext-reset-output; >> + status = "okay"; >> +}; >> diff --git a/arch/arm/include/asm/arch-mx8m/ddr.h b/arch/arm/include/asm/arch-mx8m/ddr.h >> index b37382eab0..11016c9278 100644 >> --- a/arch/arm/include/asm/arch-mx8m/ddr.h >> +++ b/arch/arm/include/asm/arch-mx8m/ddr.h >> @@ -353,4 +353,13 @@ enum msg_response { >> TRAIN_FAIL = 0xff, >> }; >> >> +enum fw_type { >> + FW_1D_IMAGE, >> + FW_2D_IMAGE, >> +}; >> + >> +void ddr_init(void); >> +void ddr_load_train_code(enum fw_type type); >> +void lpddr4_800M_cfg_phy(void); >> +void dram_pll_init(void); >> #endif >> diff --git a/arch/arm/mach-imx/mx8m/Kconfig b/arch/arm/mach-imx/mx8m/Kconfig >> index 3a84c2f2b0..e3b57b7915 100644 >> --- a/arch/arm/mach-imx/mx8m/Kconfig >> +++ b/arch/arm/mach-imx/mx8m/Kconfig >> @@ -7,4 +7,16 @@ config MX8M >> config SYS_SOC >> default "mx8m" >> >> +choice >> + prompt "NXP i.MX8M board select" >> + optional >> + >> +config TARGET_MX8MQ_EVK >> + bool "mx8mq_evk" >> + select MX8M >> + >> +endchoice >> + >> +source "board/freescale/mx8mq_evk/Kconfig" >> + >> endif >> diff --git a/board/freescale/mx8mq_evk/Kconfig b/board/freescale/mx8mq_evk/Kconfig >> new file mode 100644 >> index 0000000000..4e23002803 >> --- /dev/null >> +++ b/board/freescale/mx8mq_evk/Kconfig >> @@ -0,0 +1,12 @@ >> +if TARGET_MX8MQ_EVK >> + >> +config SYS_BOARD >> + default "mx8mq_evk" >> + >> +config SYS_VENDOR >> + default "freescale" >> + >> +config SYS_CONFIG_NAME >> + default "mx8mq_evk" >> + >> +endif >> diff --git a/board/freescale/mx8mq_evk/Makefile b/board/freescale/mx8mq_evk/Makefile >> new file mode 100644 >> index 0000000000..286396ee96 >> --- /dev/null >> +++ b/board/freescale/mx8mq_evk/Makefile >> @@ -0,0 +1,12 @@ >> +# >> +# Copyright 2017 NXP >> +# >> +# SPDX-License-Identifier: GPL-2.0+ >> +# >> + >> +obj-y += mx8mq_evk.o >> + >> +ifdef CONFIG_SPL_BUILD >> +obj-y += spl.o >> +obj-y += ddr/ddr_init.o ddr/ddrphy_train.o ddr/helper.o >> +endif >> diff --git a/board/freescale/mx8mq_evk/README b/board/freescale/mx8mq_evk/README >> new file mode 100644 >> index 0000000000..e214401a8a >> --- /dev/null >> +++ b/board/freescale/mx8mq_evk/README >> @@ -0,0 +1,47 @@ >> +U-Boot for the NXP i.MX8MQ EVK board >> + >> +Quick Start >> +==================== >> +- Build the ARM Trusted firmware binary >> +- Build U-Boot >> +- Get ddr fimware and tools >> +- Generate flash.bin using imx-mkimage >> +- Boot >> + >> +Get and Build the ARM Trusted firmware >> +==================== >> +Get ATF from: https://source.codeaurora.org/external/imx/imx-atf >> +$ make PLAT=imx8mq bl31 >> + >> +Build U-Boot >> +==================== >> +$ export ARCH=arm64 >> +$ export CROSS_COMPILE=aarch64-poky-linux- >> +$ make mx8mq_evk_defconfig >> +$ make >> + >> +Get the ddr firmware and tools >> +==================== >> +Note: Better to use NXP released yocto to get the firmware in case >> + there is new releases. >> +https://www.nxp.com/lgfiles/NMG/MAD/YOCTO/firmware-imx-7.2.bin >> +imx-mkimage: https://source.codeaurora.org/external/imx/imx-mkimage/ > > >I am just asking which is the plan here. This is a fork of U-Boot's >mkimage tool. I did not see attempts to push changes to imximage mainline. > >Any thoughts ? This means that it is not possible inside U-Boot to >produce a U-Boot image, but we need an external tool that was *based* on >U-Boot code.... There are many containers, for i.MX8MQ, there are two containers. For i.MX8QM, there are more and more containers. Also take secure boot into consideration, it is hard to extend the current mkimage. For long run, I could look into the support in u-boot, but I could not commit. > >> + >> +Generate flash.bin using imx-mkimage >> +==================== >> +Copy bl31.bin u-boot-nodtb.bin u-boot-spl.bin fsl-imx8mq-evk.dtb to >> + imx-mkimage/iMX8M >> +Copy lpddr4_pmu_train_1d_dmem.bin lpddr4_pmu_train_1d_imem.bin >> + lpddr4_pmu_train_2d_dmem.bin lpddr4_pmu_train_2d_imem.bin to >> + imx-mkimage/iMX8M >> +If you want to run with HDMI, copy signed_hdmi_imx8m.bin to imx-mkimage/iMX8M >> + >> +make SOC=iMX8M flash_hdmi_spl_uboot or make SOC=iMX8M flash_spl_uboot to >> +generate flash.bin. >> + >> +Burn the flash.bin to MicroSD card offset 33KB >> +$sudo dd if=iMX8M/flash.bin of=/dev/sd[x] bs=1024 seek=33 >> + >> +Boot >> +==================== >> +Set Boot switch SW801: 1100 and Bmode: 10 to boot from Micro SD. >> diff --git a/board/freescale/mx8mq_evk/ddr/ddr_init.c b/board/freescale/mx8mq_evk/ddr/ddr_init.c >> new file mode 100644 >> index 0000000000..9ff4341bd9 >> --- /dev/null >> +++ b/board/freescale/mx8mq_evk/ddr/ddr_init.c >> @@ -0,0 +1,246 @@ >> +/* >> + * Copyright 2017 NXP >> + * >> + * SPDX-License-Identifier: GPL-2.0+ >> + */ >> + >> +#include <common.h> >> +#include <errno.h> >> +#include <asm/io.h> >> +#include <asm/arch/clock.h> >> +#include <asm/arch/ddr.h> >> +#include <asm/arch/sys_proto.h> >> +#include <linux/iopoll.h> >> + >> +struct imx8m_ddrc_regs *ddrc_regs = (struct imx8m_ddrc_regs *)DDRC_IPS_BASE_ADDR(0); >> +static struct gpc_reg *gpc_reg = (struct gpc_reg *)GPC_BASE_ADDR; >> +static struct src *src = (struct src *)SRC_BASE_ADDR; >> + >> +void lpddr4_800mhz_cfg_umctl2(void) >> +{ >> + writel(0x00000001, &ddrc_regs->dbg1); >> + writel(0x00000001, &ddrc_regs->pwrctl); >> + writel(0x83080020, &ddrc_regs->mstr); >> + writel(0x006180e0, &ddrc_regs->rfshtmg); >> + writel(0xc003061b, &ddrc_regs->init0); >> + writel(0x009d0000, &ddrc_regs->init1); >> + writel(0x0000fe05, &ddrc_regs->init2); >> + writel(0x00d4002d, &ddrc_regs->init3); >> + writel(0x00310008, &ddrc_regs->init4); >> + writel(0x00040009, &ddrc_regs->init5); >> + writel(0x0046004d, &ddrc_regs->init6); >> + writel(0x0005004d, &ddrc_regs->init7); >> + writel(0x00000979, &ddrc_regs->rankctl); >> + writel(0x1a203522, &ddrc_regs->dramtmg0); > >I guess we will not have any improvement here, at least for first version. I'll give a try to improve the ddr controller part. For ddr phy part, it is impossible to do that, it was autogenerated by tool from synopsys. Thanks, Peng

2 1

[U-Boot] [RFC PATCH] mmc: Skipping the MMC initialization at the boot time
by Siva Durga Prasad Paladugu 23 Jan '18

23 Jan '18

From: Vipul Kumar <vipul.kumar(a)xilinx.com> By enabling CONFIG_SKIP_EARLY_MMC_INIT config, user can skip the MMC initialization at the boot time. After getting the u-boot console, user can select the device using mmc dev and can communicate with that. This is useful where user don't want to perform mmc initialization while booting and can do explicitly later as per choice. Signed-off-by: Vipul Kumar <vipulk(a)xilinx.com> Signed-off-by: Siva Durga Prasad Paladugu <sivadur(a)xilinx.com> --- common/board_r.c | 4 ++-- drivers/mmc/Kconfig | 7 +++++++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/common/board_r.c b/common/board_r.c index 2a9df6b..8727b93 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -421,7 +421,7 @@ static int initr_onenand(void) } #endif -#ifdef CONFIG_MMC +#if defined(CONFIG_MMC) && !defined(CONFIG_SKIP_EARLY_MMC_INIT) static int initr_mmc(void) { puts("MMC: "); @@ -768,7 +768,7 @@ static init_fnc_t init_sequence_r[] = { #ifdef CONFIG_CMD_ONENAND initr_onenand, #endif -#ifdef CONFIG_MMC +#if defined(CONFIG_MMC) && !defined(CONFIG_SKIP_EARLY_MMC_INIT) initr_mmc, #endif initr_env, diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index ab0627a..05b1503 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -40,6 +40,13 @@ config SPL_DM_MMC if MMC +config SKIP_EARLY_MMC_INIT + bool "Skip the MMC initialization at boot time" + help + Skip the MMC initialization at the boot time. After getting the u-boot + console, user need to set mmc device and after setting the mmc dev, user + can communicate with that device. + config ARM_PL180_MMCI bool "ARM AMBA Multimedia Card Interface and compatible support" depends on DM_MMC && OF_CONTROL -- 2.7.4 This email and any attachments are intended for the sole use of the named recipient(s) and contain(s) confidential information that may be proprietary, privileged or copyrighted under applicable law. If you are not the intended recipient, do not read, copy, or forward this email message or any attachments. Delete this email message and any attachments immediately.

4 6

[U-Boot] STM32F746 Discovery - No serial output?
by Francois Dugast 23 Jan '18

23 Jan '18

Hi, I am trying to run the master on a STM32F746 Discovery board [1] by using stm32f746-disco_defconfig. It was built with gcc-arm-none-eabi-5_4-2016q3 [2] and flashed with OpenOCD [3]. A USB-serial adapter is connected to USART6_RX and USART6_TX (pins D0 and D1 of the Arduino connector) and configured for 115200 8N1. No output coming out through the serial interface. It is unlikely to be a hardware issue as output is coming out normally this way when using the U-Boot repository from Emcraft. I do not know what I am doing wrong, can you help me out? Cheers, Francois [1] http://www.st.com/en/evaluation-tools/32f746gdiscovery.html [2] https://launchpad.net/gcc-arm-embedded [3] http://openocd.org [4] https://github.com/EmcraftSystems/u-boot

3 5

[U-Boot] u-boot-mmc fails on almost every Tegra board
by Stephen Warren 23 Jan '18

23 Jan '18

Jaehoon, The latest commit in u-boot-mmc.git master branch fails on almost every Tegra board. The MMC device experiences an error during initialization and hence isn't available: U-Boot 2018.01-05974-gb9b4f146c9 (Jan 22 2018 - 09:18:42 -0700), Build: jenkins-u-boot-denx_uboot_mmc-master-build-U_BOOT_BOARD=p2371-2180-151 TEGRA210 Model: NVIDIA P2371-2180 Board: NVIDIA P2371-2180 DRAM: 3.5 GiB MMC: sdhci@700b0000: 1, sdhci@700b0600: 0 tegra_mmc_send_cmd_bounced: waiting for status update mmc_init: -110, time 1068 *** Warning - No block device, using default environment

2 3

[U-Boot] [PATCH] travis-ci: Add qemu-x86_64 target
by Tom Rini 23 Jan '18

23 Jan '18

Add qemu-x86_64 to the list of targets we use for test.py runs. Signed-off-by: Tom Rini <trini(a)konsulko.com> --- .travis.yml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.travis.yml b/.travis.yml index 48b7b101f1c6..dab55f34e51d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -311,6 +311,13 @@ matrix: TOOLCHAIN="x86_64" BUILD_ROM="yes" - env: + - TEST_PY_BD="qemu-x86_64" + TEST_PY_TEST_SPEC="not sleep" + QEMU_TARGET="x86_64-softmmu" + BUILDMAN="^qemu-x86_64$" + TOOLCHAIN="x86_64" + BUILD_ROM="yes" + - env: - TEST_PY_BD="zynq_zc702" TEST_PY_TEST_SPEC="not sleep" QEMU_TARGET="arm-softmmu" -- 1.9.1

1 2

[U-Boot] [PATCH V5] Convert CONFIG_SOC_DA8XX et al to Kconfig
by Adam Ford 23 Jan '18

23 Jan '18

This converts the following to Kconfig: CONFIG_SOC_DA8XX CONFIG_SOC_DA850 CONFIG_DA850_LOWLEVEL CONFIG_MACH_DAVINCI_DA850_EVM CONFIG_SYS_DA850_PLL_INIT CONFIG_SYS_DA850_DDR_INIT Signed-off-by: Adam Ford <aford173(a)gmail.com> --- Change V5: Select SYS_DA850_PLL_INIT and DDR_INIT when either SUPPORT_SPL or DA850_LOWLEVEL are selected Rebase against origin/master Changes in V4: Rebase against origin/master Changes in V3: Add bool for DA850_LOWLEVEL and make it select DA850_PLL_INIT and DA850_DDR_INIT README | 2 -- arch/arm/mach-davinci/Kconfig | 36 +++++++++++++++++++++++++---------- configs/calimain_defconfig | 1 + configs/da850evm_direct_nor_defconfig | 1 + include/configs/calimain.h | 3 --- include/configs/da850evm.h | 4 ---- include/configs/ea20.h | 3 --- include/configs/ipam390.h | 3 --- include/configs/legoev3.h | 3 --- include/configs/omapl138_lcdk.h | 1 - scripts/config_whitelist.txt | 4 ---- 11 files changed, 28 insertions(+), 33 deletions(-) diff --git a/README b/README index 06f3ed0..ea7923e 100644 --- a/README +++ b/README @@ -2351,8 +2351,6 @@ The following options need to be configured: CONFIG_AT91SAM9XE enable special bootcounter support on at91sam9xe based boards. - CONFIG_SOC_DA8XX - enable special bootcounter support on da850 based boards. CONFIG_BOOTCOUNT_RAM enable support for the bootcounter in RAM CONFIG_BOOTCOUNT_I2C diff --git a/arch/arm/mach-davinci/Kconfig b/arch/arm/mach-davinci/Kconfig index 35e4e9b..ae9c0fd 100644 --- a/arch/arm/mach-davinci/Kconfig +++ b/arch/arm/mach-davinci/Kconfig @@ -6,47 +6,63 @@ choice config TARGET_IPAM390 bool "IPAM390 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SUPPORT_SPL - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT config TARGET_DA850EVM bool "DA850 EVM board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select SUPPORT_SPL - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT config TARGET_EA20 bool "EA20 board" + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 select BOARD_LATE_INIT config TARGET_OMAPL138_LCDK bool "OMAPL138 LCDK" + select SOC_DA8XX select SUPPORT_SPL - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT config TARGET_CALIMAIN bool "Calimain board" - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT + select SOC_DA850 config TARGET_LEGOEV3 bool "LEGO MINDSTORMS EV3" - select SYS_DA850_PLL_INIT - select SYS_DA850_DDR_INIT + select MACH_DAVINCI_DA850_EVM + select SOC_DA850 endchoice config SYS_SOC default "davinci" +config DA850_LOWLEVEL + bool "Enable Lowlevel DA850 initialization" + depends on SOC_DA850 + config SYS_DA850_PLL_INIT bool config SYS_DA850_DDR_INIT bool +config SOC_DA850 + bool + select SOC_DA8XX + select SYS_DA850_PLL_INIT if SUPPORT_SPL || DA850_LOWLEVEL + select SYS_DA850_DDR_INIT if SUPPORT_SPL || DA850_LOWLEVEL + +config SOC_DA8XX + bool + +config MACH_DAVINCI_DA850_EVM + bool + source "board/Barix/ipam390/Kconfig" source "board/davinci/da8xxevm/Kconfig" source "board/davinci/ea20/Kconfig" diff --git a/configs/calimain_defconfig b/configs/calimain_defconfig index a02926c..d8ab012 100644 --- a/configs/calimain_defconfig +++ b/configs/calimain_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_CALIMAIN=y +CONFIG_DA850_LOWLEVEL=y CONFIG_BOOTDELAY=0 CONFIG_VERSION_VARIABLE=y # CONFIG_DISPLAY_CPUINFO is not set diff --git a/configs/da850evm_direct_nor_defconfig b/configs/da850evm_direct_nor_defconfig index b00eea7..19e7244 100644 --- a/configs/da850evm_direct_nor_defconfig +++ b/configs/da850evm_direct_nor_defconfig @@ -1,6 +1,7 @@ CONFIG_ARM=y CONFIG_ARCH_DAVINCI=y CONFIG_TARGET_DA850EVM=y +CONFIG_DA850_LOWLEVEL=y CONFIG_TI_COMMON_CMD_OPTIONS=y CONFIG_DEFAULT_DEVICE_TREE="da850-evm" # CONFIG_SYS_MALLOC_F is not set diff --git a/include/configs/calimain.h b/include/configs/calimain.h index 7686592..7dfc1fa 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -21,15 +21,12 @@ /* * SoC Configuration */ -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ calimain_get_osc_freq() #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE #define CONFIG_SYS_HZ_CLOCK clk_get(DAVINCI_AUXCLK_CLKID) #define CONFIG_SYS_TEXT_BASE 0x60000000 -#define CONFIG_DA850_LOWLEVEL #define CONFIG_ARCH_CPU_INIT #define CONFIG_DA8XX_GPIO #define CONFIG_HW_WATCHDOG diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index 4364649..5159a6f 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -33,9 +33,6 @@ /* * SoC Configuration */ -#define CONFIG_MACH_DAVINCI_DA850_EVM -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ 24000000 @@ -47,7 +44,6 @@ #define CONFIG_DA8XX_GPIO #define CONFIG_SYS_TEXT_BASE 0x60000000 #define CONFIG_SYS_DV_NOR_BOOT_CFG (0x11) -#define CONFIG_DA850_LOWLEVEL #else #define CONFIG_SYS_TEXT_BASE 0xc1080000 #endif diff --git a/include/configs/ea20.h b/include/configs/ea20.h index c5e6e9e..9b5856e 100644 --- a/include/configs/ea20.h +++ b/include/configs/ea20.h @@ -24,9 +24,6 @@ /* * SoC Configuration */ -#define CONFIG_MACH_DAVINCI_DA850_EVM -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE diff --git a/include/configs/ipam390.h b/include/configs/ipam390.h index 1683855..618bf72 100644 --- a/include/configs/ipam390.h +++ b/include/configs/ipam390.h @@ -24,9 +24,6 @@ /* * SoC Configuration */ -#define CONFIG_MACH_DAVINCI_DA850_EVM -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ 24000000 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index c27373c..105429b 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -18,9 +18,6 @@ /* * SoC Configuration */ -#define CONFIG_MACH_DAVINCI_DA850_EVM -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ -#define CONFIG_SOC_DA850 /* TI DA850 SoC */ #define CONFIG_SYS_EXCEPTION_VECTORS_HIGH #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ 24000000 diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 5dba7d2..570322e 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -24,7 +24,6 @@ */ #define CONFIG_MACH_OMAPL138_LCDK #define CONFIG_ARM926EJS /* arm926ejs CPU core */ -#define CONFIG_SOC_DA8XX /* TI DA8xx SoC */ #define CONFIG_SYS_CLK_FREQ clk_get(DAVINCI_ARM_CLKID) #define CONFIG_SYS_OSCIN_FREQ 24000000 #define CONFIG_SYS_TIMERBASE DAVINCI_TIMER0_BASE diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 4e87d66..7e99a7a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -348,7 +348,6 @@ CONFIG_CYRUS CONFIG_D2NET_V2 CONFIG_DA850_AM18X_EVM CONFIG_DA850_EVM_MAX_CPU_CLK -CONFIG_DA850_LOWLEVEL CONFIG_DA8XX_GPIO CONFIG_DAVINCI_SPI CONFIG_DBAU1000 @@ -1289,7 +1288,6 @@ CONFIG_MACB1_PHY CONFIG_MACB2_PHY CONFIG_MACB3_PHY CONFIG_MACB_SEARCH_PHY -CONFIG_MACH_DAVINCI_DA850_EVM CONFIG_MACH_OMAPL138_LCDK CONFIG_MACH_SPECIFIC CONFIG_MACH_TYPE @@ -1992,8 +1990,6 @@ CONFIG_SOC_AU1100 CONFIG_SOC_AU1500 CONFIG_SOC_AU1550 CONFIG_SOC_AU1X00 -CONFIG_SOC_DA850 -CONFIG_SOC_DA8XX CONFIG_SOC_DM355 CONFIG_SOC_DM365 CONFIG_SOC_DM644X -- 2.7.4

3 2

[U-Boot] [PATCH 1/5] fs: Migrate ext4 to Kconfig
by Tuomas Tynkkynen 23 Jan '18

23 Jan '18

Migrate the following symbols to Kconfig: CONFIG_FS_EXT4 CONFIG_EXT4_WRITE The definitions in config_fallbacks.h can now be expressed in Kconfig. Signed-off-by: Tuomas Tynkkynen <tuomas(a)tuxera.com> --- cmd/Kconfig | 3 +++ configs/ds109_defconfig | 1 + configs/mx25pdk_defconfig | 1 + doc/README.ext4 | 22 +++++++++++----------- fs/ext4/Kconfig | 13 +++++++++++++ include/config_fallbacks.h | 9 --------- include/configs/am335x_shc.h | 2 -- include/configs/brppt1.h | 8 -------- include/configs/hikey.h | 2 -- include/configs/mx25pdk.h | 5 ----- include/configs/pic32mzdask.h | 3 --- include/configs/rcar-gen2-common.h | 2 -- include/configs/rcar-gen3-common.h | 2 -- include/configs/rk3128_common.h | 1 - include/configs/rk3328_common.h | 1 - include/configs/rk3399_common.h | 1 - include/configs/s5p_goni.h | 5 ----- include/configs/sandbox.h | 2 -- include/configs/tegra-common-post.h | 5 ----- scripts/config_whitelist.txt | 2 -- 20 files changed, 29 insertions(+), 61 deletions(-) diff --git cmd/Kconfig cmd/Kconfig index c033223526..797f4bf597 100644 --- cmd/Kconfig +++ cmd/Kconfig @@ -1357,17 +1357,20 @@ config CMD_CRAMFS config CMD_EXT2 bool "ext2 command support" + select FS_EXT4 help Enables EXT2 FS command config CMD_EXT4 bool "ext4 command support" + select FS_EXT4 help Enables EXT4 FS command config CMD_EXT4_WRITE depends on CMD_EXT4 bool "ext4 write command support" + select EXT4_WRITE help Enables EXT4 FS write command diff --git configs/ds109_defconfig configs/ds109_defconfig index 6d513cf584..428ac8ce64 100644 --- configs/ds109_defconfig +++ configs/ds109_defconfig @@ -22,3 +22,4 @@ CONFIG_SPI_FLASH_STMICRO=y CONFIG_SYS_NS16550=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_FS_EXT4=y diff --git configs/mx25pdk_defconfig configs/mx25pdk_defconfig index 2905614c28..563c7acd60 100644 --- configs/mx25pdk_defconfig +++ configs/mx25pdk_defconfig @@ -17,5 +17,6 @@ CONFIG_CMD_DATE=y CONFIG_CMD_FS_GENERIC=y CONFIG_DOS_PARTITION=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_FS_EXT4=y CONFIG_FS_FAT=y CONFIG_OF_LIBFDT=y diff --git doc/README.ext4 doc/README.ext4 index 2b0eab5dde..8ecd21eee3 100644 --- doc/README.ext4 +++ doc/README.ext4 @@ -2,10 +2,10 @@ U-Boot supports access of both ext2 and ext4 filesystems, either in read-only mode or in read-write mode. First, to enable support for both ext4 (and, automatically, ext2 as well), -but without selecting the corresponding commands, use one of: +but without selecting the corresponding commands, enable one of the following: - #define CONFIG_FS_EXT4 (for read-only) - #define CONFIG_EXT4_WRITE (for read-write) + CONFIG_FS_EXT4 (for read-only) + CONFIG_EXT4_WRITE (for read-write) Next, to select the ext2-related commands: @@ -20,22 +20,22 @@ or ext4-related commands: use one or both of: - #define CONFIG_CMD_EXT2 - #define CONFIG_CMD_EXT4 + CONFIG_CMD_EXT2 + CONFIG_CMD_EXT4 -Selecting either of the above automatically defines CONFIG_FS_EXT4 if it -wasn't defined already. +Selecting either of the above automatically selects CONFIG_FS_EXT4 if it +wasn't enabled already. -In addition, to get the write access command "ext4write", use: +In addition, to get the write access command "ext4write", enable: - #define CONFIG_CMD_EXT4_WRITE + CONFIG_CMD_EXT4_WRITE -which automatically defines CONFIG_EXT4_WRITE if it wasn't defined +which automatically selects CONFIG_EXT4_WRITE if it wasn't defined already. Also relevant are the generic filesystem commands, selected by: - #define CONFIG_CMD_FS_GENERIC + CONFIG_CMD_FS_GENERIC This does not automatically enable EXT4 support for you, you still need to do that yourself. diff --git fs/ext4/Kconfig fs/ext4/Kconfig index e69de29bb2..1a913d2b6d 100644 --- fs/ext4/Kconfig +++ fs/ext4/Kconfig @@ -0,0 +1,13 @@ +config FS_EXT4 + bool "Enable ext4 filesystem support" + help + This provides support for reading images from the ext4 filesystem. + ext4 is a widely used general-purpose filesystem for Linux. + You can also enable CMD_EXT4 to get access to ext4 commands. + +config EXT4_WRITE + bool "Enable ext4 filesystem write support" + depends on FS_EXT4 + help + This provides support for creating and writing new files to an + existing ext4 filesystem partition. diff --git include/config_fallbacks.h include/config_fallbacks.h index 2c4d43d672..527dfc71fa 100644 --- include/config_fallbacks.h +++ include/config_fallbacks.h @@ -33,15 +33,6 @@ #define CONFIG_FS_FAT #endif -#if (defined(CONFIG_CMD_EXT4) || defined(CONFIG_CMD_EXT2)) && \ - !defined(CONFIG_FS_EXT4) -#define CONFIG_FS_EXT4 -#endif - -#if defined(CONFIG_CMD_EXT4_WRITE) && !defined(CONFIG_EXT4_WRITE) -#define CONFIG_EXT4_WRITE -#endif - /* Rather than repeat this expression each time, add a define for it */ #if defined(CONFIG_IDE) || \ defined(CONFIG_SATA) || \ diff --git include/configs/am335x_shc.h include/configs/am335x_shc.h index 32439f5c47..e2d329acab 100644 --- include/configs/am335x_shc.h +++ include/configs/am335x_shc.h @@ -17,8 +17,6 @@ /* settings we don;t want on this board */ #undef CONFIG_SPL_AM33XX_ENABLE_RTC32K_OSC -#undef CONFIG_CMD_EXT4 -#undef CONFIG_CMD_EXT4_WRITE #undef CONFIG_CMD_SPI #define CONFIG_CMD_CACHE diff --git include/configs/brppt1.h include/configs/brppt1.h index 2dadcaecf5..ad83753647 100644 --- include/configs/brppt1.h +++ include/configs/brppt1.h @@ -245,13 +245,5 @@ MMCARGS #else #error "no storage for Environment defined!" #endif -/* - * Common filesystems support. When we have removable storage we - * enabled a number of useful commands and support. - */ -#if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) -#define CONFIG_FS_EXT4 -#define CONFIG_EXT4_WRITE -#endif /* CONFIG_MMC, ... */ #endif /* ! __CONFIG_BRPPT1_H__ */ diff --git include/configs/hikey.h include/configs/hikey.h index 7eaa6e4667..130c7694bf 100644 --- include/configs/hikey.h +++ include/configs/hikey.h @@ -66,8 +66,6 @@ /* SD/MMC configuration */ #define CONFIG_BOUNCE_BUFFER -#define CONFIG_FS_EXT4 - /* Command line configuration */ #define CONFIG_MTD_PARTITIONS diff --git include/configs/mx25pdk.h include/configs/mx25pdk.h index 8e8946a6b4..f82c4ccbde 100644 --- include/configs/mx25pdk.h +++ include/configs/mx25pdk.h @@ -65,11 +65,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP -/* U-Boot commands */ - -/* Filesystem support */ -#define CONFIG_FS_EXT4 - /* Ethernet */ #define CONFIG_FEC_MXC #define CONFIG_FEC_MXC_PHYADDR 0x1f diff --git include/configs/pic32mzdask.h include/configs/pic32mzdask.h index 97636fee38..cf31a38c86 100644 --- include/configs/pic32mzdask.h +++ include/configs/pic32mzdask.h @@ -88,9 +88,6 @@ /* FAT FS */ #define CONFIG_SUPPORT_VFAT -/* EXT4 FS */ -#define CONFIG_FS_EXT4 - /* ------------------------------------------------- * Environment */ diff --git include/configs/rcar-gen2-common.h include/configs/rcar-gen2-common.h index 2c10e6152d..19c4c4c72b 100644 --- include/configs/rcar-gen2-common.h +++ include/configs/rcar-gen2-common.h @@ -13,8 +13,6 @@ /* Support File sytems */ #define CONFIG_SUPPORT_VFAT -#define CONFIG_FS_EXT4 -#define CONFIG_EXT4_WRITE #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git include/configs/rcar-gen3-common.h include/configs/rcar-gen3-common.h index 30a98b8ada..7e23b5e054 100644 --- include/configs/rcar-gen3-common.h +++ include/configs/rcar-gen3-common.h @@ -19,8 +19,6 @@ /* Support File sytems */ #define CONFIG_SUPPORT_VFAT -#define CONFIG_FS_EXT4 -#define CONFIG_EXT4_WRITE #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS diff --git include/configs/rk3128_common.h include/configs/rk3128_common.h index e915a562b9..b83528edd1 100644 --- include/configs/rk3128_common.h +++ include/configs/rk3128_common.h @@ -31,7 +31,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_SUPPORT_VFAT -#define CONFIG_FS_EXT4 /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git include/configs/rk3328_common.h include/configs/rk3328_common.h index af556323f8..8c1a0e9260 100644 --- include/configs/rk3328_common.h +++ include/configs/rk3328_common.h @@ -25,7 +25,6 @@ #define CONFIG_BOUNCE_BUFFER #define CONFIG_SUPPORT_VFAT -#define CONFIG_FS_EXT4 /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git include/configs/rk3399_common.h include/configs/rk3399_common.h index 561bfa73b6..21395bab8a 100644 --- include/configs/rk3399_common.h +++ include/configs/rk3399_common.h @@ -39,7 +39,6 @@ #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 #define CONFIG_SUPPORT_VFAT -#define CONFIG_FS_EXT4 /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git include/configs/s5p_goni.h include/configs/s5p_goni.h index 86835e735e..fef4d55351 100644 --- include/configs/s5p_goni.h +++ include/configs/s5p_goni.h @@ -188,11 +188,6 @@ #define CONFIG_SAMSUNG_ONENAND 1 #define CONFIG_SYS_ONENAND_BASE 0xB0000000 -/* write support for filesystems */ -#define CONFIG_EXT4_WRITE - -/* GPT */ - #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) #define CONFIG_USB_GADGET_DWC2_OTG_PHY diff --git include/configs/sandbox.h include/configs/sandbox.h index f0426567fd..cfb3e7affd 100644 --- include/configs/sandbox.h +++ include/configs/sandbox.h @@ -25,8 +25,6 @@ #define CONFIG_LMB -#define CONFIG_FS_EXT4 -#define CONFIG_EXT4_WRITE #define CONFIG_HOST_MAX_DEVICES 4 /* diff --git include/configs/tegra-common-post.h include/configs/tegra-common-post.h index 743be6bb56..aea8f1fb8e 100644 --- include/configs/tegra-common-post.h +++ include/configs/tegra-common-post.h @@ -113,11 +113,6 @@ #ifdef CONFIG_CMD_I2C #endif -/* remove partitions/filesystems */ -#ifdef CONFIG_FS_EXT4 -#undef CONFIG_FS_EXT4 -#endif - /* remove USB */ #ifdef CONFIG_USB_EHCI_TEGRA #undef CONFIG_USB_EHCI_TEGRA diff --git scripts/config_whitelist.txt scripts/config_whitelist.txt index 43a4ff0892..0433399a88 100644 --- scripts/config_whitelist.txt +++ scripts/config_whitelist.txt @@ -610,7 +610,6 @@ CONFIG_ETHER_ON_FCC3 CONFIG_ETHPRIME CONFIG_ETH_BUFSIZE CONFIG_ETH_RXSIZE -CONFIG_EXT4_WRITE CONFIG_EXTRA_BOOTARGS CONFIG_EXTRA_CLOCK CONFIG_EXTRA_ENV @@ -760,7 +759,6 @@ CONFIG_FSL_VIA CONFIG_FSMC_NAND_BASE CONFIG_FSMTDBLK CONFIG_FSNOTIFY -CONFIG_FS_EXT4 CONFIG_FS_POSIX_ACL CONFIG_FTAHBC020S CONFIG_FTAHBC020S_BASE -- 2.15.0

2 9