ARM: i.MX6: Add proper CONFIG names
Subsystems (25)
v2 cover ARM: i.MX6: Add proper CONFIG names
This series add proper CONFIG names for i.MX6 architecture code, where CONFIG_MX6 become CONFIG_ARCH_IMX6 and rest of SOC types like CONFIG_MX6Q become CONFIG_SOC_IMX6Q which is similar to Linux.
patch 1: Update new CONFIG names globally to all files for i.MX6 code
patch 2: Change SYS_SOC from mx6 to imx6
patch 3: Add separate u-boot dtsi files for i.MX6QDL dt files
patch 4: Move imx6ul-isiot usdhc2 into dtsi
patch 5: Add separate u-boot dtsi files for i.MX6UL dt files
patch 6: Build dtbs based on the SOC types
Changes for v2:
- Add new patch "ARM: dts: imx6ul-isiot: Move usdhc2 into dtsi"
- Fixed *u-boot.dtsi files
- Fixed board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg to use imx6
Jagan Teki (6):
i.MX6: Add proper CONFIG_SOC_ names for MX6 architectures i.MX6: Change SYS_SOC from mx6 to imx6
ARM: dts: i.MX6QDL: U-Boot specific dts for u-boot,dm-spl
ARM: dts: imx6ul-isiot: Move usdhc2 into dtsi
ARM: dts: i.MX6UL: U-Boot specific dts for u-boot,dm-spl
ARM: i.MX6: dts: Build dtb based on SOC type
.travis.yml | 4 +-
Makefile | 2 +-
arch/arm/Kconfig | 8 +-
arch/arm/Makefile | 4 +-
arch/arm/dts/Makefile | 44 +++++----
arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi | 11 +++
arch/arm/dts/imx6dl-icore-mipi.dts | 1 -
arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi | 7 ++
arch/arm/dts/imx6dl-icore-u-boot.dtsi | 7 ++
arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi | 11 +++
arch/arm/dts/imx6q-icore-mipi.dts | 1 -
arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi | 7 ++
arch/arm/dts/imx6q-icore-u-boot.dtsi | 7 ++
arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi | 23 +++++
arch/arm/dts/imx6qdl-icore-rqs.dtsi | 4 -
arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 19 ++++
arch/arm/dts/imx6qdl-icore.dtsi | 3 -
arch/arm/dts/imx6qdl-u-boot.dtsi | 27 ++++++
arch/arm/dts/imx6qdl.dtsi | 5 -
arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi | 25 +++++
arch/arm/dts/imx6ul-geam-kit.dts | 4 -
arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi | 11 +++
arch/arm/dts/imx6ul-isiot-emmc.dts | 25 +----
arch/arm/dts/imx6ul-isiot-nand.dts | 1 +
arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 19 ++++
arch/arm/dts/imx6ul-isiot.dtsi | 29 +++++-
arch/arm/dts/imx6ul-u-boot.dtsi | 31 +++++++
arch/arm/dts/imx6ul.dtsi | 6 --
.../include/asm/{arch-mx6 => arch-imx6}/clock.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/crm_regs.h | 46 +++++-----
.../arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h | 4 +-
.../include/asm/{arch-mx6 => arch-imx6}/imx-regs.h | 69 +++++++-------
.../include/asm/{arch-mx6 => arch-imx6}/iomux.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/litesom.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h | 20 ++--
.../include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h | 18 ++--
.../asm/{arch-mx6 => arch-imx6}/mx6_plugin.S | 6 +-
.../asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h | 4 +-
.../asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h | 2 +-
.../asm/{arch-mx6 => arch-imx6}/mx6q_pins.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h | 2 +-
.../asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h | 2 +-
.../asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h | 2 +-
.../asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h | 0
.../asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h | 0
.../include/asm/{arch-mx6 => arch-imx6}/opos6ul.h | 0
.../asm/{arch-mx6 => arch-imx6}/sys_proto.h | 0
arch/arm/include/asm/mach-imx/dma.h | 2 +-
arch/arm/include/asm/mach-imx/iomux-v3.h | 11 ++-
arch/arm/include/asm/mach-imx/mxc_i2c.h | 2 +-
arch/arm/include/asm/mach-imx/regs-apbh.h | 6 +-
arch/arm/include/asm/mach-imx/regs-bch.h | 4 +-
arch/arm/include/asm/mach-imx/regs-lcdif.h | 21 ++---
arch/arm/include/asm/mach-imx/sys_proto.h | 6 +-
arch/arm/mach-imx/Kconfig | 12 +--
arch/arm/mach-imx/Makefile | 10 +-
arch/arm/mach-imx/cache.c | 2 +-
arch/arm/mach-imx/cpu.c | 6 +-
arch/arm/mach-imx/{mx6 => imx6}/Kconfig | 102 ++++++++++-----------
arch/arm/mach-imx/{mx6 => imx6}/Makefile | 4 +-
arch/arm/mach-imx/{mx6 => imx6}/clock.c | 14 +--
arch/arm/mach-imx/{mx6 => imx6}/ddr.c | 20 ++--
arch/arm/mach-imx/{mx6 => imx6}/litesom.c | 0
arch/arm/mach-imx/{mx6 => imx6}/mp.c | 0
arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c | 0
arch/arm/mach-imx/{mx6 => imx6}/soc.c | 6 +-
arch/arm/mach-imx/init.c | 2 +-
arch/arm/mach-imx/iomux-v3.c | 6 +-
arch/arm/mach-imx/spl.c | 8 +-
arch/arm/mach-imx/timer.c | 2 +-
board/advantech/dms-ba16/Kconfig | 2 +-
board/bachmann/ot1200/ot1200_spl.c | 4 +-
board/barco/platinum/spl_picon.c | 4 +-
board/barco/platinum/spl_titanium.c | 4 +-
board/boundary/nitrogen6x/ddr-setup.cfg | 8 +-
board/compulab/cm_fx6/cm_fx6.c | 6 +-
board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +-
board/dhelectronics/dh_imx6/dh_imx6.c | 4 +-
board/engicam/common/spl.c | 24 ++---
board/engicam/imx6q/MAINTAINERS | 11 ++-
board/engicam/imx6ul/MAINTAINERS | 5 +
board/freescale/mx6memcal/spl.c | 6 +-
board/freescale/mx6qarm2/mx6qarm2.c | 8 +-
board/freescale/mx6sabreauto/mx6sabreauto.c | 8 +-
board/freescale/mx6sabresd/mx6sabresd.c | 8 +-
board/freescale/mx6sllevk/mx6sllevk.c | 2 +-
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +-
board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +-
board/freescale/mx6ul_14x14_evk/README | 6 +-
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +-
board/freescale/mx6ullevk/README | 6 +-
board/freescale/mx6ullevk/mx6ullevk.c | 2 +-
board/gateworks/gw_ventana/gw_ventana_spl.c | 4 +-
board/ge/bx50v3/Kconfig | 2 +-
board/kosagi/novena/novena_spl.c | 4 +-
board/liebherr/display5/Kconfig | 2 +-
board/liebherr/mccmon6/spl.c | 4 +-
board/logicpd/imx6/imx6logic.c | 2 +-
board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 6 +-
board/seco/Kconfig | 6 +-
board/solidrun/mx6cuboxi/mx6cuboxi.c | 10 +-
board/tbs/tbs2910/Kconfig | 2 +-
board/technexion/pico-imx6ul/Kconfig | 2 +-
board/toradex/apalis_imx6/Kconfig | 2 +-
board/toradex/apalis_imx6/ddr-setup.cfg | 8 +-
board/toradex/colibri_imx6/Kconfig | 2 +-
board/toradex/colibri_imx6/ddr-setup.cfg | 8 +-
board/tqc/tqma6/Kconfig | 6 +-
board/udoo/README | 4 +-
board/udoo/udoo.c | 4 +-
board/udoo/udoo_spl.c | 4 +-
board/wandboard/spl.c | 8 +-
board/wandboard/wandboard.c | 6 +-
cmd/fastboot/Kconfig | 3 +-
common/spl/Kconfig | 6 +-
common/spl/spl.c | 2 +-
configs/apalis_imx6_defconfig | 4 +-
configs/apalis_imx6_nospl_com_defconfig | 4 +-
configs/apalis_imx6_nospl_it_defconfig | 4 +-
configs/aristainetos2_defconfig | 4 +-
configs/aristainetos2b_defconfig | 4 +-
configs/aristainetos_defconfig | 4 +-
configs/cgtqmx6eval_defconfig | 2 +-
configs/cm_fx6_defconfig | 2 +-
configs/colibri_imx6_defconfig | 4 +-
configs/colibri_imx6_nospl_defconfig | 4 +-
configs/dh_imx6_defconfig | 2 +-
configs/display5_defconfig | 4 +-
configs/display5_factory_defconfig | 4 +-
configs/dms-ba16-1g_defconfig | 2 +-
configs/dms-ba16_defconfig | 2 +-
configs/ge_b450v3_defconfig | 2 +-
configs/ge_b650v3_defconfig | 2 +-
configs/ge_b850v3_defconfig | 2 +-
configs/gwventana_emmc_defconfig | 2 +-
configs/gwventana_gw5904_defconfig | 2 +-
configs/gwventana_nand_defconfig | 2 +-
configs/imx6dl_icore_nand_defconfig | 2 +-
configs/imx6q_icore_nand_defconfig | 2 +-
configs/imx6q_logic_defconfig | 4 +-
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/liteboard_defconfig | 2 +-
configs/marsboard_defconfig | 4 +-
configs/mccmon6_nor_defconfig | 2 +-
configs/mccmon6_sd_defconfig | 2 +-
configs/mx6cuboxi_defconfig | 2 +-
configs/mx6dlarm2_defconfig | 4 +-
configs/mx6dlarm2_lpddr2_defconfig | 4 +-
configs/mx6memcal_defconfig | 4 +-
configs/mx6qarm2_defconfig | 4 +-
configs/mx6qarm2_lpddr2_defconfig | 4 +-
configs/mx6qsabrelite_defconfig | 4 +-
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/nitrogen6dl2g_defconfig | 4 +-
configs/nitrogen6dl_defconfig | 4 +-
configs/nitrogen6q2g_defconfig | 4 +-
configs/nitrogen6q_defconfig | 4 +-
configs/nitrogen6s1g_defconfig | 4 +-
configs/nitrogen6s_defconfig | 4 +-
configs/novena_defconfig | 4 +-
configs/opos6uldev_defconfig | 2 +-
configs/ot1200_defconfig | 4 +-
configs/ot1200_spl_defconfig | 4 +-
configs/pcm058_defconfig | 4 +-
configs/pfla02_defconfig | 2 +-
configs/pico-imx6ul_defconfig | 2 +-
configs/platinum_picon_defconfig | 4 +-
configs/platinum_titanium_defconfig | 4 +-
configs/riotboard_defconfig | 4 +-
configs/secomx6quq7_defconfig | 4 +-
configs/sksimx6_defconfig | 4 +-
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/udoo_defconfig | 2 +-
configs/udoo_neo_defconfig | 2 +-
configs/vining_2000_defconfig | 2 +-
configs/wandboard_defconfig | 2 +-
configs/warp_defconfig | 2 +-
configs/xpress_defconfig | 2 +-
configs/xpress_spl_defconfig | 2 +-
configs/zc5202_defconfig | 4 +-
configs/zc5601_defconfig | 4 +-
doc/README.imx6 | 2 +-
doc/README.imximage | 4 +-
drivers/ata/dwc_ahsata.c | 2 +-
drivers/crypto/fsl/jobdesc.c | 2 +-
drivers/dma/Kconfig | 2 +-
drivers/dma/apbh_dma.c | 2 +-
drivers/gpio/mxc_gpio.c | 23 ++---
drivers/i2c/Kconfig | 2 +-
drivers/misc/mxc_ocotp.c | 8 +-
drivers/mmc/Kconfig | 6 +-
drivers/mtd/nand/Kconfig | 6 +-
drivers/mtd/nand/mxs_nand.c | 2 +-
drivers/net/Kconfig | 2 +-
drivers/net/fec_mxc.c | 2 +-
drivers/net/fec_mxc.h | 4 +-
drivers/pci/pcie_imx.c | 14 +--
drivers/pinctrl/nxp/Kconfig | 2 +-
drivers/pwm/pwm-imx-util.c | 4 +-
drivers/serial/Kconfig | 2 +-
drivers/spi/fsl_qspi.c | 18 ++--
drivers/thermal/Kconfig | 2 +-
drivers/thermal/imx_thermal.c | 2 +-
drivers/usb/host/Kconfig | 4 +-
drivers/usb/host/ehci-mx6.c | 8 +-
drivers/video/Kconfig | 2 +-
drivers/video/ipu_regs.h | 2 +-
drivers/watchdog/Makefile | 2 +-
env/Kconfig | 2 +-
include/configs/cgtqmx6eval.h | 4 +-
include/configs/cm_fx6.h | 2 +-
include/configs/ge_bx50v3.h | 2 +-
include/configs/imx6-engicam.h | 4 +-
include/configs/imx6_spl.h | 4 +-
include/configs/mx6_common.h | 12 +--
include/configs/mx6cuboxi.h | 12 +--
include/configs/mx6memcal.h | 2 +-
include/configs/mx6sabre_common.h | 12 +--
include/configs/titanium.h | 2 +-
include/configs/udoo.h | 4 +-
include/configs/wandboard.h | 14 +--
include/fsl_sec.h | 8 +-
lib/rsa/Kconfig | 4 +-
258 files changed, 845 insertions(+), 634 deletions(-)
create mode 100644 arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6dl-icore-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6q-icore-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6qdl-icore-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6qdl-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6ul-isiot-u-boot.dtsi
create mode 100644 arch/arm/dts/imx6ul-u-boot.dtsi
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h (98%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h (78%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h (95%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h (96%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h (77%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S (97%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h (97%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h (98%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h (97%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h (97%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h (95%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/Kconfig (89%)
rename arch/arm/mach-imx/{mx6 => imx6}/Makefile (74%)
rename arch/arm/mach-imx/{mx6 => imx6}/clock.c (99%)
rename arch/arm/mach-imx/{mx6 => imx6}/ddr.c (98%)
rename arch/arm/mach-imx/{mx6 => imx6}/litesom.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/mp.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/soc.c (98%)Signature · 1 line
2.14.3
PATCH v2 1/6 i.MX6: Add proper CONFIG_SOC_ names for MX6 architectures
ARCH_MX6 -> ARCH_IMX6
MX6 -> SOC_IMX6
MX6D -> SOC_IMX6D
MX6DL -> SOC_IMX6DL
MX6Q -> SOC_IMX6Q
MX6S -> SOC_IMX6S
MX6SL -> SOC_IMX6SL
MX6Sx -> SOC_IMX6SX
MX6SLL -> SOC_IMX6SLL
MX6UL -> SOC_IMX6ULMX6UL_LITESOM -> SOC_IMX6UL_LITESOMMX6UL_OPOS6UL -> SOC_IMX6UL_OPOS6UL
MX6ULL -> SOC_IMX6ULL
"MX6" -> "i.MX6"
Signed-off-by Jagan Teki <[email protected]>
--- Makefile | 2 +- arch/arm/Kconfig | 6 +- arch/arm/dts/Makefile | 2 +- arch/arm/include/asm/arch-mx6/crm_regs.h | 46 +++++----- arch/arm/include/asm/arch-mx6/imx-rdc.h | 4 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 69 ++++++++------- arch/arm/include/asm/arch-mx6/mx6-ddr.h | 20 ++--- arch/arm/include/asm/arch-mx6/mx6-pins.h | 18 ++-- arch/arm/include/asm/arch-mx6/mx6_plugin.S | 6 +- arch/arm/include/asm/arch-mx6/mx6dl-ddr.h | 4 +- arch/arm/include/asm/arch-mx6/mx6q-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sl-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6sx-ddr.h | 2 +- arch/arm/include/asm/arch-mx6/mx6ul-ddr.h | 2 +- arch/arm/include/asm/mach-imx/dma.h | 2 +- arch/arm/include/asm/mach-imx/iomux-v3.h | 11 +-- arch/arm/include/asm/mach-imx/mxc_i2c.h | 2 +- arch/arm/include/asm/mach-imx/regs-apbh.h | 6 +- arch/arm/include/asm/mach-imx/regs-bch.h | 4 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 21 +++-- arch/arm/include/asm/mach-imx/sys_proto.h | 6 +- arch/arm/mach-imx/Kconfig | 12 +-- arch/arm/mach-imx/Makefile | 2 +- arch/arm/mach-imx/cache.c | 2 +- arch/arm/mach-imx/cpu.c | 6 +- arch/arm/mach-imx/init.c | 2 +- arch/arm/mach-imx/iomux-v3.c | 6 +- arch/arm/mach-imx/mx6/Kconfig | 100 +++++++++++----------- arch/arm/mach-imx/mx6/Makefile | 4 +- arch/arm/mach-imx/mx6/clock.c | 14 +-- arch/arm/mach-imx/mx6/ddr.c | 20 +++-- arch/arm/mach-imx/mx6/soc.c | 6 +- arch/arm/mach-imx/spl.c | 8 +- arch/arm/mach-imx/timer.c | 2 +- board/bachmann/ot1200/ot1200_spl.c | 4 +- board/barco/platinum/spl_picon.c | 4 +- board/barco/platinum/spl_titanium.c | 4 +- board/boundary/nitrogen6x/ddr-setup.cfg | 8 +- board/compulab/cm_fx6/cm_fx6.c | 6 +- board/congatec/cgtqmx6eval/cgtqmx6eval.c | 4 +- board/dhelectronics/dh_imx6/dh_imx6.c | 4 +- board/engicam/common/spl.c | 24 +++--- board/freescale/mx6memcal/spl.c | 6 +- board/freescale/mx6qarm2/mx6qarm2.c | 8 +- board/freescale/mx6sabreauto/mx6sabreauto.c | 8 +- board/freescale/mx6sabresd/mx6sabresd.c | 8 +- board/freescale/mx6sllevk/mx6sllevk.c | 2 +- board/freescale/mx6sxsabreauto/mx6sxsabreauto.c | 2 +- board/freescale/mx6sxsabresd/mx6sxsabresd.c | 2 +- board/freescale/mx6ul_14x14_evk/README | 6 +- board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c | 4 +- board/freescale/mx6ullevk/README | 6 +- board/freescale/mx6ullevk/mx6ullevk.c | 2 +- board/gateworks/gw_ventana/gw_ventana_spl.c | 4 +- board/kosagi/novena/novena_spl.c | 4 +- board/liebherr/mccmon6/spl.c | 4 +- board/logicpd/imx6/imx6logic.c | 2 +- board/seco/Kconfig | 6 +- board/solidrun/mx6cuboxi/mx6cuboxi.c | 10 +-- board/tbs/tbs2910/Kconfig | 2 +- board/toradex/apalis_imx6/ddr-setup.cfg | 8 +- board/toradex/colibri_imx6/ddr-setup.cfg | 8 +- board/tqc/tqma6/Kconfig | 6 +- board/udoo/README | 4 +- board/udoo/udoo.c | 4 +- board/udoo/udoo_spl.c | 4 +- board/wandboard/spl.c | 8 +- board/wandboard/wandboard.c | 6 +- cmd/fastboot/Kconfig | 3 +- common/spl/Kconfig | 6 +- common/spl/spl.c | 2 +- configs/apalis_imx6_defconfig | 4 +- configs/apalis_imx6_nospl_com_defconfig | 4 +- configs/apalis_imx6_nospl_it_defconfig | 4 +- configs/aristainetos2_defconfig | 4 +- configs/aristainetos2b_defconfig | 4 +- configs/aristainetos_defconfig | 4 +- configs/cgtqmx6eval_defconfig | 2 +- configs/cm_fx6_defconfig | 2 +- configs/colibri_imx6_defconfig | 4 +- configs/colibri_imx6_nospl_defconfig | 4 +- configs/dh_imx6_defconfig | 2 +- configs/display5_defconfig | 4 +- configs/display5_factory_defconfig | 4 +- configs/dms-ba16-1g_defconfig | 2 +- configs/dms-ba16_defconfig | 2 +- configs/ge_b450v3_defconfig | 2 +- configs/ge_b650v3_defconfig | 2 +- configs/ge_b850v3_defconfig | 2 +- configs/gwventana_emmc_defconfig | 2 +- configs/gwventana_gw5904_defconfig | 2 +- configs/gwventana_nand_defconfig | 2 +- configs/imx6dl_icore_nand_defconfig | 2 +- configs/imx6q_icore_nand_defconfig | 2 +- configs/imx6q_logic_defconfig | 4 +- 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/liteboard_defconfig | 2 +- configs/marsboard_defconfig | 4 +- configs/mccmon6_nor_defconfig | 2 +- configs/mccmon6_sd_defconfig | 2 +- configs/mx6cuboxi_defconfig | 2 +- configs/mx6dlarm2_defconfig | 4 +- configs/mx6dlarm2_lpddr2_defconfig | 4 +- configs/mx6memcal_defconfig | 4 +- configs/mx6qarm2_defconfig | 4 +- configs/mx6qarm2_lpddr2_defconfig | 4 +- configs/mx6qsabrelite_defconfig | 4 +- 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/nitrogen6dl2g_defconfig | 4 +- configs/nitrogen6dl_defconfig | 4 +- configs/nitrogen6q2g_defconfig | 4 +- configs/nitrogen6q_defconfig | 4 +- configs/nitrogen6s1g_defconfig | 4 +- configs/nitrogen6s_defconfig | 4 +- configs/novena_defconfig | 4 +- configs/opos6uldev_defconfig | 2 +- configs/ot1200_defconfig | 4 +- configs/ot1200_spl_defconfig | 4 +- configs/pcm058_defconfig | 4 +- configs/pfla02_defconfig | 2 +- configs/pico-imx6ul_defconfig | 2 +- configs/platinum_picon_defconfig | 4 +- configs/platinum_titanium_defconfig | 4 +- configs/riotboard_defconfig | 4 +- configs/secomx6quq7_defconfig | 4 +- configs/sksimx6_defconfig | 4 +- 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/udoo_defconfig | 2 +- configs/udoo_neo_defconfig | 2 +- configs/vining_2000_defconfig | 2 +- configs/wandboard_defconfig | 2 +- configs/warp_defconfig | 2 +- configs/xpress_defconfig | 2 +- configs/xpress_spl_defconfig | 2 +- configs/zc5202_defconfig | 4 +- configs/zc5601_defconfig | 4 +- doc/README.imx6 | 2 +- doc/README.imximage | 4 +- drivers/ata/dwc_ahsata.c | 2 +- drivers/crypto/fsl/jobdesc.c | 2 +- drivers/dma/Kconfig | 2 +- drivers/dma/apbh_dma.c | 2 +- drivers/gpio/mxc_gpio.c | 23 ++--- drivers/i2c/Kconfig | 2 +- drivers/misc/mxc_ocotp.c | 8 +- drivers/mmc/Kconfig | 6 +- drivers/mtd/nand/Kconfig | 6 +- drivers/mtd/nand/mxs_nand.c | 2 +- drivers/net/Kconfig | 2 +- drivers/net/fec_mxc.c | 2 +- drivers/net/fec_mxc.h | 4 +- drivers/pci/pcie_imx.c | 14 +-- drivers/pinctrl/nxp/Kconfig | 2 +- drivers/pwm/pwm-imx-util.c | 4 +- drivers/serial/Kconfig | 2 +- drivers/spi/fsl_qspi.c | 18 ++-- drivers/thermal/Kconfig | 2 +- drivers/thermal/imx_thermal.c | 2 +- drivers/usb/host/Kconfig | 4 +- drivers/usb/host/ehci-mx6.c | 8 +- drivers/video/Kconfig | 2 +- drivers/video/ipu_regs.h | 2 +- env/Kconfig | 2 +- include/configs/cgtqmx6eval.h | 4 +- include/configs/cm_fx6.h | 2 +- include/configs/ge_bx50v3.h | 2 +- include/configs/imx6-engicam.h | 4 +- include/configs/imx6_spl.h | 4 +- include/configs/mx6_common.h | 12 +-- include/configs/mx6cuboxi.h | 12 +-- include/configs/mx6memcal.h | 2 +- include/configs/mx6sabre_common.h | 12 +-- include/configs/titanium.h | 2 +- include/configs/udoo.h | 4 +- include/configs/wandboard.h | 14 +-- include/fsl_sec.h | 8 +- lib/rsa/Kconfig | 4 +- 205 files changed, 552 insertions(+), 545 deletions(-)
Makefile +1 -1
@@ -778,7 +778,7 @@ ALL-$(CONFIG_RAMBOOT_PBL) += u-boot.pbl endif endif ALL-$(CONFIG_SPL) += spl/u-boot-spl.bin -ifeq ($(CONFIG_MX6)$(CONFIG_SECURE_BOOT), yy) +ifeq ($(CONFIG_SOC_IMX6)$(CONFIG_SECURE_BOOT), yy) ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot-ivt.img else ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.img
arch/arm/Kconfig +3 -3
@@ -641,8 +641,8 @@ config ARCH_MX7 select ARCH_MISC_INIT imply MXC_GPIO -config ARCH_MX6 - bool "Freescale MX6" +config ARCH_IMX6 + bool "Freescale i.MX6" select CPU_V7 select SYS_FSL_HAS_SEC if SECURE_BOOT select SYS_FSL_SEC_COMPAT_4
@@ -650,7 +650,7 @@ config ARCH_MX6 select SYS_THUMB_BUILD if SPL imply MXC_GPIO -if ARCH_MX6 +if ARCH_IMX6 config SPL_LDSCRIPT default "arch/arm/mach-omap2/u-boot-spl.lds" endif
arch/arm/dts/Makefile +1 -1
@@ -385,7 +385,7 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb -dtb-$(CONFIG_MX6) += imx6ull-14x14-evk.dtb \ +dtb-$(CONFIG_SOC_IMX6) += imx6ull-14x14-evk.dtb \ imx6sl-evk.dtb \ imx6sll-evk.dtb \ imx6dl-icore.dtb \
arch/arm/include/asm/arch-mx6/crm_regs.h +23 -23
183 lines not on this page · raw message
arch/arm/include/asm/arch-mx6/imx-rdc.h +2 -2
@@ -7,10 +7,10 @@#ifndef __IMX_RDC_H__#define __IMX_RDC_H__ -#if defined(CONFIG_MX6SX ) +#if defined(CONFIG_SOC_IMX6SX )#include "mx6sx_rdc.h" #else #error "Please select cpu" -#endif /* CONFIG_MX6SX */ +#endif /* CONFIG_SOC_IMX6SX */ #endif /* __IMX_RDC_H__*/
arch/arm/include/asm/arch-mx6/imx-regs.h +36 -33
213 lines not on this page · raw message
arch/arm/include/asm/arch-mx6/mx6-ddr.h +10 -10
@@ -7,27 +7,27 @@#define __ASM_ARCH_MX6_DDR_H__#ifndef CONFIG_SPL_BUILD -#ifdef CONFIG_MX6Q +#ifdef CONFIG_SOC_IMX6Q #include "mx6q-ddr.h" #else -#if defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S ) +#if defined(CONFIG_SOC_IMX6DL ) || defined(CONFIG_SOC_IMX6S )#include "mx6dl-ddr.h" #else -#ifdef CONFIG_MX6SX +#ifdef CONFIG_SOC_IMX6SX #include "mx6sx-ddr.h" #else -#if defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) +#if defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL )#include "mx6ul-ddr.h" #else -#ifdef CONFIG_MX6SL +#ifdef CONFIG_SOC_IMX6SL #include "mx6sl-ddr.h" #else #error "Please select cpu" -#endif /* CONFIG_MX6SL */ -#endif /* CONFIG_MX6UL */ -#endif /* CONFIG_MX6SX */ -#endif /* CONFIG_MX6DL or CONFIG_MX6S */ -#endif /* CONFIG_MX6Q */ +#endif /* CONFIG_SOC_IMX6SL */ +#endif /* CONFIG_SOC_IMX6UL */ +#endif /* CONFIG_SOC_IMX6SX */ +#endif /* CONFIG_SOC_IMX6DL or CONFIG_SOC_IMX6S */ +#endif /* CONFIG_SOC_IMX6Q */ #else enum {
arch/arm/include/asm/arch-mx6/mx6-pins.h +9 -9
@@ -11,7 +11,7 @@#define MX6_PAD_DECLARE (prefix, name, pco, mc, mm, sio, si, pc) \ prefix##name = IOMUX_PAD(pco, mc, mm, sio, si, pc) -#ifdef CONFIG_MX6QDL +#ifdef CONFIG_SOC_IMX6QDL enum {#define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \ MX6_PAD_DECLARE(MX6Q_PAD_,name, pco, mc, mm, sio, si, pc),
@@ -21,30 +21,30 @@ enum { MX6_PAD_DECLARE(MX6DL_PAD_,name, pco, mc, mm, sio, si, pc),#include "mx6dl_pins.h" }; -#elif defined(CONFIG_MX6Q ) +#elif defined(CONFIG_SOC_IMX6Q ) enum { #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \ MX6_PAD_DECLARE(MX6_PAD_,name, pco, mc, mm, sio, si, pc),#include "mx6q_pins.h" }; -#elif defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S ) +#elif defined(CONFIG_SOC_IMX6DL ) || defined(CONFIG_SOC_IMX6S ) enum { #define MX6_PAD_DECL(name, pco, mc, mm, sio, si, pc) \ MX6_PAD_DECLARE(MX6_PAD_,name, pco, mc, mm, sio, si, pc),#include "mx6dl_pins.h" }; -#elif defined(CONFIG_MX6SLL ) +#elif defined(CONFIG_SOC_IMX6SLL )#include "mx6sll_pins.h" -#elif defined(CONFIG_MX6SL ) +#elif defined(CONFIG_SOC_IMX6SL )#include "mx6sl_pins.h" -#elif defined(CONFIG_MX6SX ) +#elif defined(CONFIG_SOC_IMX6SX )#include "mx6sx_pins.h" -#elif defined(CONFIG_MX6ULL ) +#elif defined(CONFIG_SOC_IMX6ULL )#include "mx6ull_pins.h" -#elif defined(CONFIG_MX6UL ) +#elif defined(CONFIG_SOC_IMX6UL )#include "mx6ul_pins.h" #else #error "Please select cpu" -#endif /* CONFIG_MX6Q */ +#endif /* CONFIG_SOC_IMX6Q */ #endif /*__ASM_ARCH_MX6_PINS_H__ */
arch/arm/include/asm/arch-mx6/mx6_plugin.S +3 -3
@@ -43,7 +43,7 @@ plugin_start: adr r2, boot_data2 #ifdef CONFIG_NOR_BOOT -#ifdef CONFIG_MX6SX +#ifdef CONFIG_SOC_IMX6SX ldr r3, =ROM_VERSION_OFFSET ldr r4, [r3] cmp r4, #ROM_VERSION_TO10
@@ -64,12 +64,12 @@ plugin_start: before_calling_rom___pu_irom_hwcnfg_setup: ldr r3, =ROM_VERSION_OFFSET ldr r4, [r3] -#if defined(CONFIG_MX6SOLO) || defined(CONFIG_MX6DL) +#if defined(CONFIG_MX6SOLO) || defined(CONFIG_SOC_IMX6DL) ldr r3, =ROM_VERSION_TO12 cmp r4, r3 ldrge r3, =ROM_API_TABLE_BASE_ADDR_MX6DL_TO12 ldrlt r3, =ROM_API_TABLE_BASE_ADDR_LEGACY -#elif defined(CONFIG_MX6Q) +#elif defined(CONFIG_SOC_IMX6Q) ldr r3, =ROM_VERSION_TO15 cmp r4, r3 ldrge r3, =ROM_API_TABLE_BASE_ADDR_MX6DQ_TO15
arch/arm/include/asm/arch-mx6/mx6dl-ddr.h +2 -2
@@ -6,8 +6,8 @@#ifndef __ASM_ARCH_MX6DLS_DDR_H__#define __ASM_ARCH_MX6DLS_DDR_H__ -#ifndef CONFIG_MX6DL -#ifndef CONFIG_MX6S +#ifndef CONFIG_SOC_IMX6DL +#ifndef CONFIG_SOC_IMX6S #error "wrong CPU"#endif #endif
arch/arm/include/asm/arch-mx6/mx6q-ddr.h +1 -1
@@ -6,7 +6,7 @@#ifndef __ASM_ARCH_MX6Q_DDR_H__#define __ASM_ARCH_MX6Q_DDR_H__ -#ifndef CONFIG_MX6Q +#ifndef CONFIG_SOC_IMX6Q #error "wrong CPU"#endif
arch/arm/include/asm/arch-mx6/mx6sl-ddr.h +1 -1
@@ -7,7 +7,7 @@#ifndef __ASM_ARCH_MX6SL_DDR_H__#define __ASM_ARCH_MX6SL_DDR_H__ -#ifndef CONFIG_MX6SL +#ifndef CONFIG_SOC_IMX6SL #error "wrong CPU"#endif
arch/arm/include/asm/arch-mx6/mx6sx-ddr.h +1 -1
@@ -7,7 +7,7 @@#ifndef __ASM_ARCH_MX6SX_DDR_H__#define __ASM_ARCH_MX6SX_DDR_H__ -#ifndef CONFIG_MX6SX +#ifndef CONFIG_SOC_IMX6SX #error "wrong CPU"#endif
arch/arm/include/asm/arch-mx6/mx6ul-ddr.h +1 -1
@@ -7,7 +7,7 @@#ifndef __ASM_ARCH_MX6UL_DDR_H__#define __ASM_ARCH_MX6UL_DDR_H__ -#if !(defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL )) +#if !(defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL ))#error "wrong CPU"#endif
arch/arm/include/asm/mach-imx/dma.h +1 -1
@@ -54,7 +54,7 @@ enum {MXS_DMA_CHANNEL_AHB_APBH_RESERVED1 , MXS_MAX_DMA_CHANNELS, }; -#elif defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) +#elif defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 )enum {MXS_DMA_CHANNEL_AHB_APBH_GPMI0 =0 , MXS_DMA_CHANNEL_AHB_APBH_GPMI1,
arch/arm/include/asm/mach-imx/iomux-v3.h +6 -5
@@ -134,7 +134,7 @@ typedef u64 iomux_v3_cfg_t;#else -#ifdef CONFIG_MX6 +#ifdef CONFIG_SOC_IMX6 #define PAD_CTL_HYS (1 << 16)
@@ -147,7 +147,8 @@ typedef u64 iomux_v3_cfg_t;#define PAD_CTL_ODE (1 << 11) -#if defined(CONFIG_MX6SX ) || defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) +#if defined(CONFIG_SOC_IMX6SX ) || defined(CONFIG_SOC_IMX6UL ) || \ + defined(CONFIG_SOC_IMX6ULL )#define PAD_CTL_SPEED_LOW (0 << 6)#else #define PAD_CTL_SPEED_LOW (1 << 6)
@@ -257,7 +258,7 @@ void imx_iomux_gpio_get_function(unsigned int gpio,#endif /* macros for declaring and using pinmux array */ -#if defined(CONFIG_MX6QDL ) +#if defined(CONFIG_SOC_IMX6QDL )#define IOMUX_PADS (x) (MX6Q_##x), (MX6DL_##x)#define SETUP_IOMUX_PAD (def) \ if (is_mx6dq() || is_mx6dqp()) { \
@@ -267,13 +268,13 @@ if (is_mx6dq() || is_mx6dqp()) { \ }#define SETUP_IOMUX_PADS (x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)/2) -#elif defined(CONFIG_MX6Q) || defined(CONFIG_MX6D) +#elif defined(CONFIG_SOC_IMX6Q) || defined(CONFIG_SOC_IMX6D)#define IOMUX_PADS (x) MX6Q_##x#define SETUP_IOMUX_PAD (def) \ imx_iomux_v3_setup_pad(MX6Q_##def);#define SETUP_IOMUX_PADS (x) \ imx_iomux_v3_setup_multiple_pads(x, ARRAY_SIZE(x)) -#elif defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) +#elif defined(CONFIG_SOC_IMX6UL) || defined(CONFIG_SOC_IMX6ULL)#define IOMUX_PADS (x) MX6_##x#define SETUP_IOMUX_PAD (def) \ imx_iomux_v3_setup_pad(MX6_##def);
arch/arm/include/asm/mach-imx/mxc_i2c.h +1 -1
@@ -59,7 +59,7 @@ struct mxc_i2c_bus {#endif }; -#if defined(CONFIG_MX6QDL ) +#if defined(CONFIG_SOC_IMX6QDL )#define I2C_PADS (name, scl_i2c, scl_gpio, scl_gp, sda_i2c, sda_gpio, sda_gp) \ struct i2c_pads_info mx6q_##name = { \ .scl = { \
arch/arm/include/asm/mach-imx/regs-apbh.h +3 -3
@@ -96,7 +96,7 @@ struct mxs_apbh_regs { mxs_reg_32(hw_apbh_version) }; -#elif (defined(CONFIG_MX28) || defined(CONFIG_MX6) || defined(CONFIG_MX7)) +#elif (defined(CONFIG_MX28) || defined(CONFIG_SOC_IMX6) || defined(CONFIG_MX7)) struct mxs_apbh_regs { mxs_reg_32(hw_apbh_ctrl0) mxs_reg_32(hw_apbh_ctrl1)
@@ -275,7 +275,7 @@ struct mxs_apbh_regs {#define APBH_CTRL0_CLKGATE_CHANNEL_NAND7 0x0800#define APBH_CTRL0_CLKGATE_CHANNEL_HSADC 0x1000#define APBH_CTRL0_CLKGATE_CHANNEL_LCDIF 0x2000 -#elif (defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#elif (defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))#define APBH_CTRL0_CLKGATE_CHANNEL_OFFSET 0#define APBH_CTRL0_CLKGATE_CHANNEL_NAND0 0x0001#define APBH_CTRL0_CLKGATE_CHANNEL_NAND1 0x0002
@@ -391,7 +391,7 @@ struct mxs_apbh_regs {#define APBH_CHANNEL_CTRL_FREEZE_CHANNEL_LCDIF 0x2000#endif -#if (defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#if (defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))#define APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET 16#endif
arch/arm/include/asm/mach-imx/regs-bch.h +2 -2
@@ -123,7 +123,7 @@ struct mxs_bch_regs {#define BCH_FLASHLAYOUT0_NBLOCKS_OFFSET 24#define BCH_FLASHLAYOUT0_META_SIZE_MASK (0xff << 16)#define BCH_FLASHLAYOUT0_META_SIZE_OFFSET 16 -#if (defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#if (defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))#define BCH_FLASHLAYOUT0_ECC0_MASK (0x1f << 11)#define BCH_FLASHLAYOUT0_ECC0_OFFSET 11#else
@@ -154,7 +154,7 @@ struct mxs_bch_regs {#define BCH_FLASHLAYOUT1_PAGE_SIZE_MASK (0xffff << 16)#define BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET 16 -#if (defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#if (defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))#define BCH_FLASHLAYOUT1_ECCN_MASK (0x1f << 11)#define BCH_FLASHLAYOUT1_ECCN_OFFSET 11#else
arch/arm/include/asm/mach-imx/regs-lcdif.h +10 -11
@@ -19,9 +19,9 @@struct mxs_lcdif_regs {mxs_reg_32 (hw_lcdif_ctrl)/* 0x00 */ mxs_reg_32(hw_lcdif_ctrl1) /* 0x10 */ -#if defined(CONFIG_MX28 ) || defined(CONFIG_MX6SX ) || \ - defined(CONFIG_MX6SL ) || defined(CONFIG_MX6SLL ) || \ - defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) || \ +#if defined(CONFIG_MX28 ) || defined(CONFIG_SOC_IMX6SX ) || \ + defined(CONFIG_SOC_IMX6SL ) || defined(CONFIG_SOC_IMX6SLL ) || \ + defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL ) || \ defined(CONFIG_MX7 ) || defined(CONFIG_MX7ULP ) || \ defined(CONFIG_MX8M )mxs_reg_32 (hw_lcdif_ctrl2)/* 0x20 */
@@ -58,9 +58,9 @@ struct mxs_lcdif_regs {#endif mxs_reg_32(hw_lcdif_data) /* 0x1b0/0x180 */ mxs_reg_32(hw_lcdif_bm_error_stat) /* 0x1c0/0x190 */ -#if defined(CONFIG_MX28 ) || defined(CONFIG_MX6SX ) || \ - defined(CONFIG_MX6SL ) || defined(CONFIG_MX6SLL ) || \ - defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) || \ +#if defined(CONFIG_MX28 ) || defined(CONFIG_SOC_IMX6SX ) || \ + defined(CONFIG_SOC_IMX6SL ) || defined(CONFIG_SOC_IMX6SLL ) || \ + defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL ) || \ defined(CONFIG_MX7 ) || defined(CONFIG_MX7ULP ) || \ defined(CONFIG_MX8M )mxs_reg_32 (hw_lcdif_crc_stat)/* 0x1a0 */
@@ -70,11 +70,10 @@ struct mxs_lcdif_regs { mxs_reg_32(hw_lcdif_debug0) /* 0x1f0/0x1d0 */ mxs_reg_32(hw_lcdif_debug1) /* 0x200/0x1e0 */ mxs_reg_32(hw_lcdif_debug2) /* 0x1f0 */ -#if defined(CONFIG_MX6SX ) || \ - defined(CONFIG_MX6SL ) || defined(CONFIG_MX6SLL ) || \ - defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) || \ - defined(CONFIG_MX7 ) || defined(CONFIG_MX7ULP ) || \ - defined(CONFIG_MX8M ) +#if defined(CONFIG_SOC_IMX6SX ) || defined(CONFIG_SOC_IMX6SL ) || \ + defined(CONFIG_SOC_IMX6SLL ) || defined(CONFIG_SOC_IMX6UL ) || \ + defined(CONFIG_SOC_IMX6ULL ) || defined(CONFIG_MX7 ) || \ + defined(CONFIG_MX7ULP ) || defined(CONFIG_MX8M ) mxs_reg_32(hw_lcdif_thres) mxs_reg_32(hw_lcdif_as_ctrl) mxs_reg_32(hw_lcdif_as_buf)
arch/arm/include/asm/mach-imx/sys_proto.h +3 -3
@@ -42,7 +42,7 @@#define is_mx7ulp () (is_cpu_type(MXC_CPU_MX7ULP)) -#ifdef CONFIG_MX6 +#ifdef CONFIG_SOC_IMX6 #define IMX6_SRC_GPR10_BMODE BIT(28)#define IMX6_BMODE_MASK GENMASK(7, 0)
@@ -70,7 +70,7 @@ enum imx6_bmode_emi {enum imx6_bmode {IMX6_BMODE_EMI , -#if defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) +#if defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL )IMX6_BMODE_QSPI ,IMX6_BMODE_RESERVED ,#else
@@ -94,7 +94,7 @@ static inline u8 imx6_is_bmode_from_gpr9(void)u32 imx6_src_get_boot_mode (void );void gpr_init (void ); -#endif /* CONFIG_MX6 */ +#endif /* CONFIG_SOC_IMX6 */ u32 get_nr_cpus (void );u32 get_cpu_rev (void );
arch/arm/mach-imx/Kconfig +6 -6
@@ -15,7 +15,7 @@ config GPT_TIMER config IMX_RDC bool "i.MX Resource domain controller driver" - depends on ARCH_MX6 || ARCH_MX7 + depends on ARCH_IMX6 || ARCH_MX7 help i.MX Resource domain controller is used to assign masters and peripherals to differet domains. This can be used to
@@ -23,20 +23,20 @@ config IMX_RDC config IMX_BOOTAUX bool "Support boot auxiliary core" - depends on ARCH_MX7 || ARCH_MX6 + depends on ARCH_MX7 || ARCH_IMX6 help bootaux [addr] to boot auxiliary core. config USE_IMXIMG_PLUGIN bool "Use imximage plugin code" - depends on ARCH_MX7 || ARCH_MX6 + depends on ARCH_MX7 || ARCH_IMX6 help i.MX6/7 supports DCD and Plugin. Enable this configuration to use Plugin, otherwise DCD will be used. config SECURE_BOOT bool "Support i.MX HAB features" - depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 + depends on ARCH_MX7 || ARCH_IMX6 || ARCH_MX5 select FSL_CAAM if HAS_CAAM imply CMD_DEKBLOB help
@@ -46,7 +46,7 @@ config SECURE_BOOT config CMD_BMODE bool "Support the 'bmode' command" default y - depends on ARCH_MX7 || ARCH_MX6 || ARCH_MX5 + depends on ARCH_MX7 || ARCH_IMX6 || ARCH_MX5 help This enables the 'bmode' (bootmode) command for forcing a boot from specific media.
@@ -73,7 +73,7 @@ config CMD_HDMIDETECT config NXP_BOARD_REVISION bool "Read NXP board revision from fuses" - depends on ARCH_MX6 || ARCH_MX7 + depends on ARCH_IMX6 || ARCH_MX7 help NXP boards based on i.MX6/7 contain the board revision information stored in the fuses. Select this option if you want to be able to
arch/arm/mach-imx/Makefile +1 -1
@@ -138,7 +138,7 @@ targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-sp obj-$(CONFIG_ARM64) += sip.o obj-$(CONFIG_MX5) += mx5/ -obj-$(CONFIG_MX6) += mx6/ +obj-$(CONFIG_SOC_IMX6) += mx6/ obj-$(CONFIG_MX7) += mx7/ obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/ obj-$(CONFIG_MX8M) += mx8m/
arch/arm/mach-imx/cache.c +1 -1
@@ -84,7 +84,7 @@ void v7_outer_cache_enable(void)* double linefill feature. This is the default behavior. */ -#ifndef CONFIG_MX6Q +#ifndef CONFIG_SOC_IMX6Q val |=0x40800000 ;#endif writel (val, &pl310->pl310_prefetch_ctrl);
arch/arm/mach-imx/cpu.c +3 -3
@@ -85,7 +85,7 @@ u32 get_imx_reset_cause(void) }#endif -#if defined(CONFIG_MX53 ) || defined(CONFIG_MX6 ) +#if defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6 )#if defined(CONFIG_MX53 )#define MEMCTL_BASE ESDCTL_BASE_ADDR#else
@@ -130,7 +130,7 @@ unsigned imx_ddr_size(void) bits +=ESD_MMDC_CTL_GET_WIDTH (ctl); bits +=ESD_MMDC_CTL_GET_CS1 (ctl); -/* The MX6 can do only 3840 MiB of DRAM */ +/* The i.MX6 can do only 3840 MiB of DRAM */ if (bits ==32 )return 0xf0000000 ;
@@ -288,7 +288,7 @@ void arch_preboot_os(void)#endif #if defined(CONFIG_SATA )sata_remove (0 ); -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )disable_sata_clock ();#endif #endif
arch/arm/mach-imx/init.c +1 -1
@@ -116,7 +116,7 @@ void boot_mode_apply(unsigned cfg_val) }#endif -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )u32 imx6_src_get_boot_mode (void ) {if (imx6_is_bmode_from_gpr9 ())
arch/arm/mach-imx/iomux-v3.c +3 -3
@@ -31,7 +31,7 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad) (pad &MUX_PAD_CTRL_OFS_MASK ) >>MUX_PAD_CTRL_OFS_SHIFT ;u32 pad_ctrl = (pad &MUX_PAD_CTRL_MASK ) >>MUX_PAD_CTRL_SHIFT ; -#if defined(CONFIG_MX6SL ) || defined(CONFIG_MX6SLL ) +#if defined(CONFIG_SOC_IMX6SL ) || defined(CONFIG_SOC_IMX6SLL )/* Check whether LVE bit needs to be set */ if (pad_ctrl &PAD_CTL_LVE ) { pad_ctrl &= ~PAD_CTL_LVE ;
@@ -73,7 +73,7 @@ void imx_iomux_v3_setup_pad(iomux_v3_cfg_t pad)#else if (!(pad_ctrl &NO_PAD_CTRL ) && pad_ctrl_ofs)__raw_writel (pad_ctrl, base + pad_ctrl_ofs); -#if defined(CONFIG_MX6SLL ) +#if defined(CONFIG_SOC_IMX6SLL ) else if ((pad_ctrl & NO_PAD_CTRL) && pad_ctrl_ofs) clrbits_le32(base + pad_ctrl_ofs, PAD_CTL_IPD_BIT);#endif
@@ -94,7 +94,7 @@ void imx_iomux_v3_setup_multiple_pads(iomux_v3_cfg_t const *pad_list,int stride;int i; -#if defined(CONFIG_MX6QDL ) +#if defined(CONFIG_SOC_IMX6QDL ) stride =2 ;if (!is_mx6dq () && !is_mx6dqp ()) p +=1 ;
arch/arm/mach-imx/mx6/Kconfig +50 -50
335 lines not on this page · raw message
arch/arm/mach-imx/mx6/Makefile +2 -2
@@ -10,5 +10,5 @@ obj-y := soc.o clock.o obj-$(CONFIG_SPL_BUILD) += ddr.o obj-$(CONFIG_MP) += mp.o -obj-$(CONFIG_MX6UL_LITESOM) += litesom.o -obj-$(CONFIG_MX6UL_OPOS6UL) += opos6ul.o +obj-$(CONFIG_SOC_IMX6UL_LITESOM) += litesom.o +obj-$(CONFIG_SOC_IMX6UL_OPOS6UL) += opos6ul.o
arch/arm/mach-imx/mx6/clock.c +7 -7
@@ -41,7 +41,7 @@ void enable_ocotp_clk(unsigned char enable)#ifdef CONFIG_NAND_MXS void setup_gpmi_io_clk (u32 cfg) { -/* Disable clocks per ERR007177 from MX6 errata */ +/* Disable clocks per ERR007177 from i.MX6 errata */ clrbits_le32(&imx_ccm->CCGR4, MXC_CCM_CCGR4_RAWNAND_U_BCH_INPUT_APB_MASK | MXC_CCM_CCGR4_RAWNAND_U_GPMI_BCH_INPUT_BCH_MASK |
@@ -49,7 +49,7 @@ void setup_gpmi_io_clk(u32 cfg)MXC_CCM_CCGR4_RAWNAND_U_GPMI_INPUT_APB_MASK | MXC_CCM_CCGR4_PL301_MX6QPER1_BCH_MASK); -#if defined(CONFIG_MX6SX ) +#if defined(CONFIG_SOC_IMX6SX )clrbits_le32 (&imx_ccm->CCGR4,MXC_CCM_CCGR4_QSPI2_ENFC_MASK ); clrsetbits_le32(&imx_ccm->cs2cdr,
@@ -92,7 +92,7 @@ void enable_usboh3_clk(unsigned char enable) } -#if defined(CONFIG_FEC_MXC ) && !defined(CONFIG_MX6SX ) +#if defined(CONFIG_FEC_MXC ) && !defined(CONFIG_SOC_IMX6SX )void enable_enet_clk (unsigned char enable) {u32 mask, *addr;
@@ -949,7 +949,7 @@ int enable_fec_anatop_clock(int fec_id, enum enet_freq freq) reg &= ~BM_ANADIG_PLL_ENET_BYPASS ;writel (reg, &anatop->pll_enet); -#ifdef CONFIG_MX6SX +#ifdef CONFIG_SOC_IMX6SX /* Disable enet system clcok before switching clock parent */ reg =readl (&imx_ccm->CCGR3); reg &= ~MXC_CCM_CCGR3_ENET_MASK ;
@@ -1312,7 +1312,7 @@ int do_mx6_showclocks(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])return 0 ; } -#ifndef CONFIG_MX6SX +#ifndef CONFIG_SOC_IMX6SX void enable_ipu_clock (void ) {struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ;
@@ -1328,8 +1328,8 @@ void enable_ipu_clock(void) }#endif -#if defined(CONFIG_MX6Q ) || defined(CONFIG_MX6D ) || defined(CONFIG_MX6DL ) || \ - defined(CONFIG_MX6S ) +#if defined(CONFIG_SOC_IMX6Q ) || defined(CONFIG_SOC_IMX6D ) || \ + defined(CONFIG_SOC_IMX6DL ) || defined(CONFIG_SOC_IMX6S )static void disable_ldb_di_clock_sources (void ) {struct mxc_ccm_reg *mxc_ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ;
arch/arm/mach-imx/mx6/ddr.c +11 -9
@@ -572,8 +572,8 @@ int mmdc_do_dqs_calibration(struct mx6_ddr_sysinfo const *sysinfo) }#endif -#if defined(CONFIG_MX6SX ) -/* Configure MX6SX mmdc iomux */ +#if defined(CONFIG_SOC_IMX6SX ) +/* Configure i.MX6SX mmdc iomux */ void mx6sx_dram_iocfg (unsigned width,const struct mx6sx_iomux_ddr_regs *ddr,const struct mx6sx_iomux_grp_regs *grp)
@@ -631,7 +631,7 @@ void mx6sx_dram_iocfg(unsigned width, }#endif -#if defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL ) +#if defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL )void mx6ul_dram_iocfg (unsigned width,const struct mx6ul_iomux_ddr_regs *ddr,const struct mx6ul_iomux_grp_regs *grp)
@@ -675,7 +675,7 @@ void mx6ul_dram_iocfg(unsigned width, }#endif -#if defined(CONFIG_MX6SL ) +#if defined(CONFIG_SOC_IMX6SL )void mx6sl_dram_iocfg (unsigned width,const struct mx6sl_iomux_ddr_regs *ddr,const struct mx6sl_iomux_grp_regs *grp)
@@ -730,7 +730,8 @@ void mx6sl_dram_iocfg(unsigned width, }#endif -#if defined(CONFIG_MX6QDL ) || defined(CONFIG_MX6Q ) || defined(CONFIG_MX6D ) +#if defined(CONFIG_SOC_IMX6QDL ) || defined(CONFIG_SOC_IMX6Q ) || \ + defined(CONFIG_SOC_IMX6D )/* Configure MX6DQ mmdc iomux */ void mx6dq_dram_iocfg(unsigned width, const struct mx6dq_iomux_ddr_regs *ddr,
@@ -808,7 +809,8 @@ void mx6dq_dram_iocfg(unsigned width, }#endif -#if defined(CONFIG_MX6QDL ) || defined(CONFIG_MX6DL ) || defined(CONFIG_MX6S ) +#if defined(CONFIG_SOC_IMX6QDL ) || defined(CONFIG_SOC_IMX6DL ) || \ + defined(CONFIG_SOC_IMX6S )/* Configure MX6SDL mmdc iomux */ void mx6sdl_dram_iocfg(unsigned width, const struct mx6sdl_iomux_ddr_regs *ddr,
@@ -1218,14 +1220,14 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo,if (!is_mx6sx () && !is_mx6ul () && !is_mx6ull () && !is_mx6sl ()) mmdc1 = (struct mmdc_p_regs *)MMDC_P1_BASE_ADDR ; -/* Limit mem_speed for MX6D/MX6Q */ +/* Limit mem_speed for i.MX6D/i.MX6Q */ if (is_mx6dq () ||is_mx6dqp ()) {if (mem_speed >1066 ) mem_speed =1066 ;/* 1066 MT/s */ tcwl =4 ; } -/* Limit mem_speed for MX6S/MX6DL */ +/* Limit mem_speed for i.MX6S/i.MX6DL */ else {if (mem_speed >800 ) mem_speed =800 ;/* 800 MT/s */
@@ -1235,7 +1237,7 @@ void mx6_ddr3_cfg(const struct mx6_ddr_sysinfo *sysinfo, clock = mem_speed /2 ;/* -* Data rate of 1066 MT/s requires 533 MHz DDR3 clock, but MX6D/Q supports +* Data rate of 1066 MT/s requires 533 MHz DDR3 clock, but i.MX6D/Q supports * up to 528 MHz, so reduce the clock to fit chip specs */ if (is_mx6dq () ||is_mx6dqp ()) {
arch/arm/mach-imx/mx6/soc.c +3 -3
@@ -528,7 +528,7 @@ int board_postclk_init(void)const struct boot_mode soc_boot_modes[] = { {"normal" ,MAKE_CFGVAL (0x00 ,0x00 ,0x00 ,0x00 )},/* reserved value should start rom usb */ -#if defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) +#if defined(CONFIG_SOC_IMX6UL) || defined(CONFIG_SOC_IMX6ULL) {"usb" ,MAKE_CFGVAL (0x20 ,0x00 ,0x00 ,0x00 )}, #else {"usb", MAKE_CFGVAL(0x10, 0x00, 0x00, 0x00)},
@@ -565,9 +565,9 @@ void s_init(void)if (is_mx6sx () ||is_mx6ul () ||is_mx6ull () ||is_mx6sll ())return ; -/* Due to hardware limitation, on MX6Q we need to gate/ungate all PFDs +/* Due to hardware limitation, on i.MX6Q we need to gate/ungate all PFDs * to make sure PFD is working right, otherwise, PFDs may -* not output clock after reset, MX6DL and MX6SL have added 396M pfd +* not output clock after reset, i.MX6DL and i.MX6SL have added 396M pfd * workaround in ROM code, as bus clock need it */
arch/arm/mach-imx/spl.c +4 -4
@@ -19,7 +19,7 @@DECLARE_GLOBAL_DATA_PTR ; -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )/* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device (void ) {
@@ -61,7 +61,7 @@ u32 spl_boot_device(void)case IMX6_BMODE_RESERVED :return BOOT_DEVICE_BOARD ;/* SATA: See 8.5.4, Table 8-20 */ -#if !defined(CONFIG_MX6UL ) && !defined(CONFIG_MX6ULL ) +#if !defined(CONFIG_SOC_IMX6UL ) && !defined(CONFIG_SOC_IMX6ULL )case IMX6_BMODE_SATA :return BOOT_DEVICE_SATA ;#endif
@@ -121,7 +121,7 @@ u32 spl_boot_device(void) return BOOT_DEVICE_NONE; } } -#endif /* CONFIG_MX6 || CONFIG_MX7 || CONFIG_MX8M */ +#endif /* CONFIG_SOC_IMX6 || CONFIG_MX7 || CONFIG_MX8M */ #ifdef CONFIG_SPL_USB_GADGET_SUPPORT int g_dnl_bind_fixup (struct usb_device_descriptor *dev,const char *name)
@@ -213,7 +213,7 @@ __weak void __noreturn jump_to_image_no_args(struct spl_image_info *spl_image)#endif -#if defined(CONFIG_MX6 ) && defined(CONFIG_SPL_OS_BOOT ) +#if defined(CONFIG_SOC_IMX6 ) && defined(CONFIG_SPL_OS_BOOT )int dram_init_banksize (void ) { gd->bd->bi_dram[0 ].start =CONFIG_SYS_SDRAM_BASE ;
arch/arm/mach-imx/timer.c +1 -1
@@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR;static inline int gpt_has_clk_source_osc (void ) { -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )if (((is_mx6dq ()) && (soc_rev () >CHIP_REV_1_0 )) ||is_mx6dqp () ||is_mx6sdl () ||is_mx6sx () ||is_mx6ul () ||is_mx6ull () ||is_mx6sll ())
board/bachmann/ot1200/ot1200_spl.c +2 -2
@@ -10,7 +10,7 @@DECLARE_GLOBAL_DATA_PTR ; -/* Configure MX6Q/DUAL mmdc DDR io registers */ +/* Configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 48ohm */ .dram_sdclk_0 =0x00000028 ,
@@ -46,7 +46,7 @@ static struct mx6dq_iomux_ddr_regs ot1200_ddr_ioregs = { .dram_dqm7 = 0x00000028, }; -/* Configure MX6Q/DUAL mmdc GRP io registers */ +/* Configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs ot1200_grp_ioregs = {/* DDR3 */ .grp_ddr_type =0x000c0000 ,
board/barco/platinum/spl_picon.c +2 -2
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;#undef RTT_NOM_120OHM/* use 120ohm Rtt_nom vs 60ohm (lower power) */ -/* Configure MX6Q/DUAL mmdc DDR io registers */ +/* Configure i.MX6Q/DUAL mmdc DDR io registers */ struct mx6sdl_iomux_ddr_regs mx6sdl_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */ .dram_sdclk_0 =0x00020030 ,
@@ -61,7 +61,7 @@ struct mx6sdl_iomux_ddr_regs mx6sdl_ddr_ioregs = { .dram_dqm7 = 0x00020030, }; -/* Configure MX6Q/DUAL mmdc GRP io registers */ +/* Configure i.MX6Q/DUAL mmdc GRP io registers */ struct mx6sdl_iomux_grp_regs mx6sdl_grp_ioregs = {/* DDR3 */ .grp_ddr_type =0x000c0000 ,
board/barco/platinum/spl_titanium.c +2 -2
@@ -25,7 +25,7 @@ DECLARE_GLOBAL_DATA_PTR;#undef RTT_NOM_120OHM/* use 120ohm Rtt_nom vs 60ohm (lower power) */ -/* Configure MX6Q/DUAL mmdc DDR io registers */ +/* Configure i.MX6Q/DUAL mmdc DDR io registers */ struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */ .dram_sdclk_0 =0x00020030 ,
@@ -61,7 +61,7 @@ struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_dqm7 = 0x00020030, }; -/* Configure MX6Q/DUAL mmdc GRP io registers */ +/* Configure i.MX6Q/DUAL mmdc GRP io registers */ struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = {/* DDR3 */ .grp_ddr_type =0x000c0000 ,
board/boundary/nitrogen6x/ddr-setup.cfg +4 -4
@@ -16,10 +16,10 @@ /* * DDR3 settings - * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), - * memory bus width: 64 bits x16/x32/x64 - * MX6DL ddr is limited to 800 MHz(400 MHz clock) - * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), + * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6DL ddr is limited to 800 MHz(400 MHz clock) + * memory bus width: 64 bits x16/x32/x64 * MX6SOLO ddr is limited to 800 MHz(400 MHz clock) * memory bus width: 32 bits x16/x32 */
board/compulab/cm_fx6/cm_fx6.c +3 -3
@@ -607,7 +607,7 @@ int board_init(void)cm_fx6_setup_display (); -/* This should be done in the MMC driver when MX6 has a clock driver */ +/* This should be done in the MMC driver when i.MX6 has a clock driver */ #ifdef CONFIG_FSL_ESDHC if (IS_ENABLED (CONFIG_BLK )) {int i;
@@ -628,9 +628,9 @@ int board_late_init(void)int err;if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else if (is_mx6dl ()) -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" ); err =cl_eeprom_get_product_name ((uchar *)baseboard_name,0 );if (err)
board/congatec/cgtqmx6eval/cgtqmx6eval.c +2 -2
@@ -756,9 +756,9 @@ int board_late_init(void) {#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );#endif return 0 ;
board/dhelectronics/dh_imx6/dh_imx6.c +2 -2
@@ -245,8 +245,8 @@ int board_mmc_init(bd_t *bis)static void setup_usb (void ) {/* -* Set daisy chain for otg_pin_id on MX6Q. -* For MX6DL, this bit is reserved. +* Set daisy chain for otg_pin_id on i.MX6Q. +* For i.MX6DL, this bit is reserved. */ imx_iomux_set_gpr_register (1 ,13 ,1 ,0 ); }
board/engicam/common/spl.c +12 -12
@@ -30,10 +30,10 @@ DECLARE_GLOBAL_DATA_PTR; PAD_CTL_DSE_40ohm | PAD_CTL_SRE_FAST | PAD_CTL_HYS) static iomux_v3_cfg_t const uart_pads[] = { -#ifdef CONFIG_MX6QDL +#ifdef CONFIG_SOC_IMX6QDL IOMUX_PADS(PAD_KEY_COL0__UART4_TX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), IOMUX_PADS(PAD_KEY_ROW0__UART4_RX_DATA | MUX_PAD_CTRL(UART_PAD_CTRL)), -#elif CONFIG_MX6UL +#elif CONFIG_SOC_IMX6UL IOMUX_PADS(PAD_UART1_TX_DATA__UART1_DCE_TX | MUX_PAD_CTRL(UART_PAD_CTRL)), IOMUX_PADS(PAD_UART1_RX_DATA__UART1_DCE_RX | MUX_PAD_CTRL(UART_PAD_CTRL)), #endif
@@ -92,7 +92,7 @@ int spl_start_uboot(void) }#endif -#ifdef CONFIG_MX6QDL +#ifdef CONFIG_SOC_IMX6QDL /* * Driving strength: * 0x30 == 40 Ohm
@@ -101,7 +101,7 @@ int spl_start_uboot(void)#define IMX6DQ_DRIVE_STRENGTH 0x30#define IMX6SDL_DRIVE_STRENGTH 0x28 -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdqs0 =IMX6DQ_DRIVE_STRENGTH , .dram_sdqs1 =IMX6DQ_DRIVE_STRENGTH ,
@@ -131,7 +131,7 @@ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdodt1 = IMX6DQ_DRIVE_STRENGTH, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = { .grp_b0ds =IMX6DQ_DRIVE_STRENGTH , .grp_b1ds =IMX6DQ_DRIVE_STRENGTH ,
@@ -293,9 +293,9 @@ static struct mx6_ddr_sysinfo mem_s = { .rst_to_cke = 0x23, .sde_to_rst = 0x10, }; -#endif /* CONFIG_MX6QDL */ +#endif /* CONFIG_SOC_IMX6QDL */ -#ifdef CONFIG_MX6UL +#ifdef CONFIG_SOC_IMX6UL static struct mx6ul_iomux_grp_regs mx6_grp_ioregs = { .grp_addds =0x00000030 , .grp_ddrmode_ctl = 0x00020000,
@@ -360,13 +360,13 @@ static struct mx6_ddr3_cfg mem_ddr = { .trcmin = 4875, .trasmin = 3500, }; -#endif /* CONFIG_MX6UL */ +#endif /* CONFIG_SOC_IMX6UL */ static void ccgr_init (void ) {struct mxc_ccm_reg *ccm = (struct mxc_ccm_reg *)CCM_BASE_ADDR ; -#ifdef CONFIG_MX6QDL +#ifdef CONFIG_SOC_IMX6QDL writel (0x00003F3F , &ccm->CCGR0);writel (0x0030FC00 , &ccm->CCGR1);writel (0x000FC000 , &ccm->CCGR2);
@@ -374,7 +374,7 @@ static void ccgr_init(void)writel (0xFF00F300 , &ccm->CCGR4);writel (0x0F0000C3 , &ccm->CCGR5);writel (0x000003CC , &ccm->CCGR6); -#elif CONFIG_MX6UL +#elif CONFIG_SOC_IMX6UL writel (0x00c03f3f , &ccm->CCGR0);writel (0xfcffff00 , &ccm->CCGR1);writel (0x0cffffcc , &ccm->CCGR2);
@@ -387,7 +387,7 @@ static void ccgr_init(void)static void spl_dram_init (void ) { -#ifdef CONFIG_MX6QDL +#ifdef CONFIG_SOC_IMX6QDL if (is_mx6solo ()) {mx6sdl_dram_iocfg (32 , &mx6sdl_ddr_ioregs, &mx6sdl_grp_ioregs);mx6_dram_cfg (&mem_s, &mx6dl_mmdc_calib, &mt41j256);
@@ -398,7 +398,7 @@ static void spl_dram_init(void)mx6dq_dram_iocfg (64 , &mx6dq_ddr_ioregs, &mx6dq_grp_ioregs); mx6_dram_cfg(&mem_q, &mx6dq_mmdc_calib, &mt41j256); } -#elif CONFIG_MX6UL +#elif CONFIG_SOC_IMX6ULmx6ul_dram_iocfg (mem_ddr.width, &mx6_ddr_ioregs, &mx6_grp_ioregs);mx6_dram_cfg (&ddr_sysinfo, &mx6_mmcd_calib, &mem_ddr);#endif
board/freescale/mx6memcal/spl.c +3 -3
@@ -54,7 +54,7 @@ static iomux_v3_cfg_t const uart_pads[] = {#define DRAM_DRIVE_STRENGTH \ (CONFIG_DRAM_DRIVE_STRENGTH << 3) -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs const mx6dq_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */ .dram_sdclk_0 =DDR_ODT +DRAM_DRIVE_STRENGTH ,
@@ -91,7 +91,7 @@ static struct mx6dq_iomux_ddr_regs const mx6dq_ddr_ioregs = { .dram_dqm7 = DDR_ODT + DRAM_DRIVE_STRENGTH, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs const mx6dq_grp_ioregs = {/* DDR3 */ .grp_ddr_type =GRP_DDRTYPE ,
@@ -426,7 +426,7 @@ void board_init_f(ulong dummy)reset_cpu (0 ); } } -#ifdef CONFIG_MX6SL +#ifdef CONFIG_SOC_IMX6SL mx6sl_dram_iocfg (CONFIG_DDRWIDTH , &mx6sl_ddr_ioregs, &mx6sl_grp_ioregs);#else
board/freescale/mx6qarm2/mx6qarm2.c +4 -4
@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;int dram_init (void ) { -#if defined(CONFIG_MX6DL ) && !defined(CONFIG_MX6DL_LPDDR2 ) && \ +#if defined(CONFIG_SOC_IMX6DL ) && !defined(CONFIG_MX6DL_LPDDR2 ) && \ defined(CONFIG_DDR_32BIT ) gd->ram_size = ((phys_size_t )CONFIG_DDR_MB *1024 *1024 ) /2 ;#else
@@ -278,10 +278,10 @@ int board_init(void)int checkboard (void ) { -#ifdef CONFIG_MX6DL -puts ("Board: MX6DL-Armadillo2\n" ); +#ifdef CONFIG_SOC_IMX6DL +puts ("Board: i.MX6DL-Armadillo2\n" );#else -puts ("Board: MX6Q-Armadillo2\n" ); +puts ("Board: i.MX6Q-Armadillo2\n" );#endif return 0 ;
board/freescale/mx6sabreauto/mx6sabreauto.c +4 -4
@@ -661,11 +661,11 @@ int board_late_init(void)env_set ("board_name" ,"SABREAUTO" );if (is_mx6dqp ()) -env_set ("board_rev" ,"MX6QP" ); +env_set ("board_rev" ,"i.MX6QP" );else if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else if (is_mx6sdl ()) -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );#endif return 0 ;
@@ -673,7 +673,7 @@ int board_late_init(void)int checkboard (void ) { -printf ("Board: MX6Q-Sabreauto rev%c\n" ,nxp_board_rev_string ()); +printf ("Board: i.MX6Q-Sabreauto rev%c\n" ,nxp_board_rev_string ());return 0 ; }
board/freescale/mx6sabresd/mx6sabresd.c +4 -4
@@ -706,11 +706,11 @@ int board_late_init(void)env_set ("board_name" ,"SABRESD" );if (is_mx6dqp ()) -env_set ("board_rev" ,"MX6QP" ); +env_set ("board_rev" ,"i.MX6QP" );else if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else if (is_mx6sdl ()) -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );#endif return 0 ;
@@ -718,7 +718,7 @@ int board_late_init(void)int checkboard (void ) { -puts ("Board: MX6-SabreSD\n" ); +puts ("Board: i.MX6-SabreSD\n" );return 0 ; }
board/freescale/mx6sllevk/mx6sllevk.c +1 -1
@@ -115,7 +115,7 @@ int board_late_init(void)int checkboard (void ) { -puts ("Board: MX6SLL EVK\n" ); +puts ("Board: i.MX6SLL EVK\n" );return 0 ; }
board/freescale/mx6sxsabreauto/mx6sxsabreauto.c +1 -1
@@ -356,7 +356,7 @@ int board_late_init(void)int checkboard (void ) { -puts ("Board: MX6SX SABRE AUTO\n" ); +puts ("Board: i.MX6SX SABRE AUTO\n" );return 0 ; }
board/freescale/mx6sxsabresd/mx6sxsabresd.c +1 -1
@@ -341,7 +341,7 @@ int board_late_init(void)int checkboard (void ) { -printf ("Board: MX6SX SABRE SDB rev%c\n" ,nxp_board_rev_string ()); +printf ("Board: i.MX6SX SABRE SDB rev%c\n" ,nxp_board_rev_string ());return 0 ; }
board/freescale/mx6ul_14x14_evk/README +3 -3
@@ -1,7 +1,7 @@ -How to use U-Boot on Freescale MX6UL 14x14 EVK ------------------------------------------------ +How to use U-Boot on Freescale i.MX6UL 14x14 EVK +------------------------------------------------ -- Build U-Boot for MX6UL 14x14 EVK: +- Build U-Boot for i.MX6UL 14x14 EVK: $ make mrproper $ make mx6ul_14x14_evk_defconfig
board/freescale/mx6ul_14x14_evk/mx6ul_14x14_evk.c +2 -2
@@ -688,9 +688,9 @@ int board_late_init(void)int checkboard (void ) {if (is_mx6ul_9x9_evk ()) -puts ("Board: MX6UL 9x9 EVK\n" ); +puts ("Board: i.MX6UL 9x9 EVK\n" );else -puts ("Board: MX6UL 14x14 EVK\n" ); +puts ("Board: i.MX6UL 14x14 EVK\n" );return 0 ; }
board/freescale/mx6ullevk/README +3 -3
@@ -1,11 +1,11 @@ -How to use U-Boot on Freescale MX6ULL 14x14 EVK ----------------------------------------------- +How to use U-Boot on Freescale i.MX6ULL 14x14 EVK +------------------------------------------------- - First make sure you have installed the dtc package (device tree compiler): $ sudo apt-get install device-tree-compiler -- Build U-Boot for MX6ULL 14x14 EVK: +- Build U-Boot for i.MX6ULL 14x14 EVK: $ make mrproper $ make mx6ull_14x14_evk_defconfig
board/freescale/mx6ullevk/mx6ullevk.c +1 -1
@@ -93,7 +93,7 @@ int board_late_init(void)int checkboard (void ) { -puts ("Board: MX6ULL 14x14 EVK\n" ); +puts ("Board: i.MX6ULL 14x14 EVK\n" );return 0 ; }
board/gateworks/gw_ventana/gw_ventana_spl.c +2 -2
@@ -27,7 +27,7 @@ DECLARE_GLOBAL_DATA_PTR;#define GSC_EEPROM_DDR_SIZE 0x2B/* enum (512,1024,2048) MB */ #define GSC_EEPROM_DDR_WIDTH 0x2D/* enum (32,64) bit */ -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */ .dram_sdclk_0 =0x00020030 ,
@@ -64,7 +64,7 @@ struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_dqm7 = 0x00020030, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = {/* DDR3 */ .grp_ddr_type =0x000c0000 ,
board/kosagi/novena/novena_spl.c +2 -2
@@ -425,7 +425,7 @@ int board_mmc_init(bd_t *bis) }#endif -/* Configure MX6Q/DUAL mmdc DDR io registers */ +/* Configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs novena_ddr_ioregs = {/* SDCLK[0:1], CAS, RAS, Reset: Differential input, 40ohm */ .dram_sdclk_0 =0x00020038 ,
@@ -462,7 +462,7 @@ static struct mx6dq_iomux_ddr_regs novena_ddr_ioregs = { .dram_dqm7 = 0x00000038, }; -/* Configure MX6Q/DUAL mmdc GRP io registers */ +/* Configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs novena_grp_ioregs = {/* DDR3 */ .grp_ddr_type =0x000c0000 ,
board/liebherr/mccmon6/spl.c +2 -2
@@ -33,7 +33,7 @@ DECLARE_GLOBAL_DATA_PTR;#define IMX6DQ_DRIVE_STRENGTH 0x30#define IMX6SDL_DRIVE_STRENGTH 0x28 -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdclk_0 =IMX6DQ_DRIVE_STRENGTH , .dram_sdclk_1 =IMX6DQ_DRIVE_STRENGTH ,
@@ -63,7 +63,7 @@ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_dqm7 = IMX6DQ_DRIVE_STRENGTH, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = { .grp_ddr_type =0x000c0000 , .grp_ddrmode_ctl =0x00020000 ,
board/logicpd/imx6/imx6logic.c +1 -1
@@ -177,7 +177,7 @@ int board_late_init(void)env_set ("board_name" ,"imx6logic" );if (is_mx6dq ()) { -env_set ("board_rev" ,"MX6DQ" ); +env_set ("board_rev" ,"i.MX6DQ" );env_set ("fdt_file" ,"imx6q-logicpd.dtb" ); }
board/seco/Kconfig +3 -3
@@ -21,15 +21,15 @@ choice config SECOMX6Q bool "i.MX6Q" - select MX6Q + select SOC_IMX6Q config SECOMX6DL bool "i.MX6DL" - select MX6DL + select SOC_IMX6DL config SECOMX6S bool "i.MX6S" - select MX6S + select SOC_IMX6S endchoice
board/solidrun/mx6cuboxi/mx6cuboxi.c +5 -5
@@ -393,11 +393,11 @@ static bool is_hummingboard2(void)int checkboard (void ) {if (is_hummingboard2 ()) -puts ("Board: MX6 Hummingboard2\n" ); +puts ("Board: i.MX6 Hummingboard2\n" );else if (is_hummingboard ()) -puts ("Board: MX6 Hummingboard\n" ); +puts ("Board: i.MX6 Hummingboard\n" );else -puts ("Board: MX6 Cubox-i\n" ); +puts ("Board: i.MX6 Cubox-i\n" );return 0 ; }
@@ -413,9 +413,9 @@ int board_late_init(void)env_set ("board_name" ,"CUBOXI" );if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );#endif return 0 ;
board/tbs/tbs2910/Kconfig +1 -1
@@ -9,7 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "tbs2910" -config MX6Q +config SOC_IMX6Q default y config IMX_CONFIG
board/toradex/apalis_imx6/ddr-setup.cfg +4 -4
@@ -17,10 +17,10 @@ /* * DDR3 settings - * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), - * memory bus width: 64 bits x16/x32/x64 - * MX6DL ddr is limited to 800 MHz(400 MHz clock) - * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), + * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6DL ddr is limited to 800 MHz(400 MHz clock) + * memory bus width: 64 bits x16/x32/x64 * MX6SOLO ddr is limited to 800 MHz(400 MHz clock) * memory bus width: 32 bits x16/x32 */
board/toradex/colibri_imx6/ddr-setup.cfg +4 -4
@@ -17,10 +17,10 @@ /* * DDR3 settings - * MX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), - * memory bus width: 64 bits x16/x32/x64 - * MX6DL ddr is limited to 800 MHz(400 MHz clock) - * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6Q ddr is limited to 1066 Mhz currently 1056 MHz(528 MHz clock), + * memory bus width: 64 bits x16/x32/x64 + * SOC_IMX6DL ddr is limited to 800 MHz(400 MHz clock) + * memory bus width: 64 bits x16/x32/x64 * MX6SOLO ddr is limited to 800 MHz(400 MHz clock) * memory bus width: 32 bits x16/x32 */
board/tqc/tqma6/Kconfig +3 -3
@@ -18,19 +18,19 @@ choice config TQMA6Q bool "TQMa6Q / TQMa6D" - select MX6Q + select SOC_IMX6Q help select TQMa6Q / TQMa6D with i.MX6Q/D and 1GiB DRAM config TQMA6DL bool "TQMa6DL" - select MX6DL + select SOC_IMX6DL help select TQMa6DL with i.MX6DL and 1GiB DRAM config TQMA6S bool "TQMa6S" - select MX6S + select SOC_IMX6S help select TQMa6S with i.MX6S and 512 MiB DRAM
board/udoo/README +2 -2
@@ -1,7 +1,7 @@ -How to use U-Boot on MX6Q/DL Udoo boards +How to use U-Boot on i.MX6Q/DL Udoo boards ---------------------------------------- -- Build U-Boot for MX6Q/DL Udoo boards: +- Build U-Boot for i.MX6Q/DL Udoo boards: $ make mrproper $ make udoo_defconfig
board/udoo/udoo.c +2 -2
@@ -254,9 +254,9 @@ int board_late_init(void) {#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG if (is_cpu_type (MXC_CPU_MX6Q )) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );#endif return 0 ; }
board/udoo/udoo_spl.c +2 -2
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;#define IMX6DQ_DRIVE_STRENGTH 0x30#define IMX6SDL_DRIVE_STRENGTH 0x28 -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdclk_0 =IMX6DQ_DRIVE_STRENGTH , .dram_sdclk_1 =IMX6DQ_DRIVE_STRENGTH ,
@@ -64,7 +64,7 @@ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_dqm7 = IMX6DQ_DRIVE_STRENGTH, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = { .grp_ddr_type =0x000c0000 , .grp_ddrmode_ctl =0x00020000 ,
board/wandboard/spl.c +4 -4
@@ -34,7 +34,7 @@ DECLARE_GLOBAL_DATA_PTR;#define IMX6SDL_DRIVE_STRENGTH 0x28#define IMX6QP_DRIVE_STRENGTH 0x28 -/* configure MX6Q/DUAL mmdc DDR io registers */ +/* configure i.MX6Q/DUAL mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_sdclk_0 =IMX6DQ_DRIVE_STRENGTH , .dram_sdclk_1 =IMX6DQ_DRIVE_STRENGTH ,
@@ -64,7 +64,7 @@ static struct mx6dq_iomux_ddr_regs mx6dq_ddr_ioregs = { .dram_dqm7 = IMX6DQ_DRIVE_STRENGTH, }; -/* configure MX6QP mmdc DDR io registers */ +/* configure i.MX6QP mmdc DDR io registers */ static struct mx6dq_iomux_ddr_regs mx6qp_ddr_ioregs = { .dram_sdclk_0 =IMX6QP_DRIVE_STRENGTH , .dram_sdclk_1 =IMX6QP_DRIVE_STRENGTH ,
@@ -94,7 +94,7 @@ static struct mx6dq_iomux_ddr_regs mx6qp_ddr_ioregs = { .dram_dqm7 = IMX6QP_DRIVE_STRENGTH, }; -/* configure MX6Q/DUAL mmdc GRP io registers */ +/* configure i.MX6Q/DUAL mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = { .grp_ddr_type =0x000c0000 , .grp_ddrmode_ctl =0x00020000 ,
@@ -112,7 +112,7 @@ static struct mx6dq_iomux_grp_regs mx6dq_grp_ioregs = { .grp_b7ds = IMX6DQ_DRIVE_STRENGTH, }; -/* configure MX6QP mmdc GRP io registers */ +/* configure i.MX6QP mmdc GRP io registers */ static struct mx6dq_iomux_grp_regs mx6qp_grp_ioregs = { .grp_ddr_type =0x000c0000 , .grp_ddrmode_ctl =0x00020000 ,
board/wandboard/wandboard.c +3 -3
@@ -511,11 +511,11 @@ int board_late_init(void)#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG if (is_mx6dqp ()) -env_set ("board_rev" ,"MX6QP" ); +env_set ("board_rev" ,"i.MX6QP" );else if (is_mx6dq ()) -env_set ("board_rev" ,"MX6Q" ); +env_set ("board_rev" ,"i.MX6Q" );else -env_set ("board_rev" ,"MX6DL" ); +env_set ("board_rev" ,"i.MX6DL" );if (is_revd1 ())env_set ("board_name" ,"D1" );
cmd/fastboot/Kconfig +2 -1
@@ -30,7 +30,8 @@ if USB_FUNCTION_FASTBOOT config FASTBOOT_BUF_ADDR hex "Define FASTBOOT buffer address" - default 0x82000000 if MX6SX || MX6SL || MX6UL || MX6SLL + default 0x82000000 if SOC_IMX6SX || SOC_IMX6SL || SOC_IMX6UL || \ + SOC_IMX6SLL default 0x81000000 if ARCH_OMAP2PLUS default 0x42000000 if ARCH_SUNXI && !MACH_SUN9I default 0x22000000 if ARCH_SUNXI && MACH_SUN9I
common/spl/Kconfig +3 -3
@@ -56,7 +56,7 @@ config SPL_BOOTROM_SUPPORT config SPL_RAW_IMAGE_SUPPORT bool "Support SPL loading and booting of RAW images" - default n if (ARCH_MX6 && (SPL_MMC_SUPPORT || SPL_SATA_SUPPORT)) + default n if (ARCH_IMX6 && (SPL_MMC_SUPPORT || SPL_SATA_SUPPORT)) default y if !TI_SECURE_DEVICE help SPL will support loading and booting a RAW image when this option
@@ -143,7 +143,7 @@ config SPL_DISPLAY_PRINT config SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR bool "MMC raw mode: by sector" - default y if ARCH_SUNXI || ARCH_DAVINCI || ARCH_UNIPHIER ||ARCH_MX6 || \ + default y if ARCH_SUNXI || ARCH_DAVINCI || ARCH_UNIPHIER ||ARCH_IMX6 || \ ARCH_ROCKCHIP || ARCH_MVEBU || ARCH_SOCFPGA || \ ARCH_AT91 || ARCH_ZYNQ || ARCH_KEYSTONE || OMAP34XX || \ OMAP44XX || OMAP54XX || AM33XX || AM43XX
@@ -156,7 +156,7 @@ config SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR depends on SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR default 0x50 if ARCH_SUNXI default 0x75 if ARCH_DAVINCI - default 0x8a if ARCH_MX6 + default 0x8a if ARCH_IMX6 default 0x100 if ARCH_UNIPHIER default 0x140 if ARCH_MVEBU default 0x200 if ARCH_SOCFPGA || ARCH_AT91
common/spl/spl.c +1 -1
@@ -399,7 +399,7 @@ void board_init_r(gd_t *dummy1, ulong dummy2)if (spl_init ())hang (); } -#if !defined(CONFIG_PPC ) && !defined(CONFIG_ARCH_MX6 ) +#if !defined(CONFIG_PPC ) && !defined(CONFIG_ARCH_IMX6 )/* * timer_init() does not exist on PPC systems. The timer is initialized * and enabled (decrementer) in interrupt_init() here.
configs/apalis_imx6_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -9,7 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SUPPORT_RAW_INITRD=y
configs/apalis_imx6_nospl_com_defconfig +2 -2
@@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_APALIS_IMX6=y CONFIG_CMD_HDMIDETECT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,SOC_IMX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SUPPORT_RAW_INITRD=y
configs/apalis_imx6_nospl_it_defconfig +2 -2
@@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_APALIS_IMX6=y CONFIG_CMD_HDMIDETECT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,MX6Q,DDR_MB=2048" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/apalis_imx6/apalis_imx6q.cfg,SOC_IMX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SUPPORT_RAW_INITRD=y
configs/aristainetos2_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_ARISTAINETOS2=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,SOC_IMX6DL" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/aristainetos2b_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_ARISTAINETOS2B=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,SOC_IMX6DL" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/aristainetos_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_ARISTAINETOS=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,MX6DL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos.cfg,SOC_IMX6DL" CONFIG_BOOTDELAY=3 # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/cgtqmx6eval_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/cm_fx6_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/colibri_imx6_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -9,7 +9,7 @@ CONFIG_SPL_MMC_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6DL" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SUPPORT_RAW_INITRD=y
configs/colibri_imx6_nospl_defconfig +2 -2
@@ -1,11 +1,11 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_COLIBRI_IMX6=y CONFIG_CMD_HDMIDETECT=y CONFIG_ENV_VARS_UBOOT_CONFIG=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,MX6DL,DDR_MB=256" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/toradex/colibri_imx6/colibri_imx6.cfg,SOC_IMX6DL,DDR_MB=256" CONFIG_BOOTDELAY=1 # CONFIG_CONSOLE_MUX is not set CONFIG_SUPPORT_RAW_INITRD=y
configs/dh_imx6_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/display5_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -13,7 +13,7 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-display5" CONFIG_FIT=y CONFIG_SPL_LOAD_FIT=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SPL=y # CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_SECTOR is not set
configs/display5_factory_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -10,7 +10,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_FIT=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run factory"
configs/dms-ba16-1g_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_ADVANTECH_DMS_BA16=y CONFIG_SYS_DDR_1G=y
configs/dms-ba16_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_ADVANTECH_DMS_BA16=y CONFIG_BOOTDELAY=1
configs/ge_b450v3_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_GE_B450V3=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/ge_b650v3_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_GE_B650V3=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/ge_b850v3_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_GE_B850V3=y # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
configs/gwventana_emmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/gwventana_gw5904_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/gwventana_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6dl_icore_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6q_icore_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6q_logic_defconfig +2 -2
@@ -1,10 +1,10 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_MX6LOGICPD=y CONFIG_DEFAULT_DEVICE_TREE="imx6q-logicpd" CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/imx6qdl_icore_mipi_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6qdl_icore_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6qdl_icore_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6qdl_icore_rqs_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6ul_geam_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6ul_geam_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6ul_isiot_emmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/imx6ul_isiot_nand_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/liteboard_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/marsboard_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,SOC_IMX6Q,DDR_MB=1024" CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/mccmon6_nor_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/mccmon6_sd_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/mx6cuboxi_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6dlarm2_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_MX6QARM2=y # CONFIG_CMD_BMODE is not set -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,DDR_MB=2048" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,SOC_IMX6DL,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6dlarm2_lpddr2_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_MX6QARM2=y # CONFIG_CMD_BMODE is not set -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,MX6DL,MX6DL_LPDDR2,DDR_MB=512" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage_mx6dl.cfg,SOC_IMX6DL,MX6DL_LPDDR2,DDR_MB=512" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6memcal_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
@@ -7,7 +7,7 @@ CONFIG_MX6_DDRCAL=y CONFIG_TARGET_MX6MEMCAL=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,MX6QDL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SPL,SOC_IMX6QDL" CONFIG_SUPPORT_RAW_INITRD=y CONFIG_SPL=y CONFIG_SPL_USB_HOST_SUPPORT=y
configs/mx6qarm2_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_MX6QARM2=y # CONFIG_CMD_BMODE is not set -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,DDR_MB=2048" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,SOC_IMX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6qarm2_lpddr2_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_MX6QARM2=y # CONFIG_CMD_BMODE is not set -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,MX6Q,MX6DQ_LPDDR2,DDR_MB=512" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx6qarm2/imximage.cfg,SOC_IMX6Q,MX6DQ_LPDDR2,DDR_MB=512" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/mx6qsabrelite_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024,SABRELITE" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,SOC_IMX6Q,DDR_MB=1024,SABRELITE" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/mx6sabreauto_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6sabresd_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6slevk_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SLEVK=y # CONFIG_CMD_BMODE is not set
configs/mx6slevk_spinor_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SLEVK=y # CONFIG_CMD_BMODE is not set
configs/mx6slevk_spl_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6sllevk_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SLLEVK=y # CONFIG_CMD_BMODE is not set
configs/mx6sllevk_plugin_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SLLEVK=y CONFIG_USE_IMXIMG_PLUGIN=y
configs/mx6sxsabreauto_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SXSABREAUTO=y # CONFIG_CMD_BMODE is not set
configs/mx6sxsabresd_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6SXSABRESD=y # CONFIG_CMD_BMODE is not set
configs/mx6sxsabresd_spl_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6ul_14x14_evk_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6ul_9x9_evk_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/mx6ull_14x14_evk_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6ULL_14X14_EVK=y CONFIG_DEFAULT_DEVICE_TREE="imx6ull-14x14-evk"
configs/mx6ull_14x14_evk_plugin_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_MX6ULL_14X14_EVK=y CONFIG_USE_IMXIMG_PLUGIN=y
configs/nitrogen6dl2g_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,MX6DL,DDR_MB=2048" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl2g.cfg,SOC_IMX6DL,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/nitrogen6dl_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,MX6DL,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6dl.cfg,SOC_IMX6DL,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/nitrogen6q2g_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,MX6Q,DDR_MB=2048" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q2g.cfg,SOC_IMX6Q,DDR_MB=2048" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/nitrogen6q_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,MX6Q,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6q.cfg,SOC_IMX6Q,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/nitrogen6s1g_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,SOC_IMX6S,DDR_MB=1024" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/nitrogen6s_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_NITROGEN6X=y CONFIG_CMD_HDMIDETECT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,MX6S,DDR_MB=512" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s.cfg,SOC_IMX6S,DDR_MB=512" CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y CONFIG_SUPPORT_RAW_INITRD=y
configs/novena_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -14,7 +14,7 @@ CONFIG_SPL_FAT_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttymxc1,115200 " CONFIG_BOOTCOMMAND="run distro_bootcmd ; run net_nfs"
configs/opos6uldev_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
configs/ot1200_defconfig +2 -2
@@ -1,8 +1,8 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_OT1200=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/bachmann/ot1200/mx6q_4x_mt41j128.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/ot1200_spl_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -9,7 +9,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/pcm058_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -14,7 +14,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_CMD_HDMIDETECT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_BOARD_EARLY_INIT_F=y
configs/pfla02_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/pico-imx6ul_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_PICO_IMX6UL=y # CONFIG_CMD_BMODE is not set
configs/platinum_picon_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -10,7 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6DL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6DL" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/platinum_titanium_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -10,7 +10,7 @@ CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y
configs/riotboard_defconfig +2 -2
@@ -1,9 +1,9 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_EMBESTMX6BOARDS=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,MX6S,DDR_MB=1024" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/boundary/nitrogen6x/nitrogen6s1g.cfg,SOC_IMX6S,DDR_MB=1024" CONFIG_BOOTCOMMAND="run finduuid; run distro_bootcmd" # CONFIG_CONSOLE_MUX is not set CONFIG_SYS_CONSOLE_IS_IN_ENV=y
configs/secomx6quq7_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_SECOMX6=y CONFIG_SECOMX6_UQ7=y
@@ -9,7 +9,7 @@ CONFIG_BOOTDELAY=3 CONFIG_SUPPORT_RAW_INITRD=y CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y -CONFIG_SYS_PROMPT="SECO MX6Q uQ7 U-Boot > " +CONFIG_SYS_PROMPT="SECO i.MX6Q uQ7 U-Boot > " CONFIG_CMD_BOOTZ=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y
configs/sksimx6_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -14,7 +14,7 @@ CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_FIT=y CONFIG_FIT_VERBOSE=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6QDL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6QDL" CONFIG_BOOTDELAY=1 # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SILENT_CONSOLE=y
configs/tbs2910_defconfig +1 -1
@@ -1,6 +1,6 @@ CONFIG_ARM=y CONFIG_SYS_THUMB_BUILD=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_TBS2910=y CONFIG_CMD_HDMIDETECT=y
configs/titanium_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_TARGET_TITANIUM=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/barco/titanium/imximage.cfg"
configs/tqma6dl_mba6_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x4fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6DL=y
configs/tqma6dl_mba6_spi_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x4fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6DL=y
configs/tqma6q_mba6_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x4fc00000 CONFIG_TARGET_TQMA6=y CONFIG_FIT=y
configs/tqma6q_mba6_spi_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x4fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6X_SPI_BOOT=y
configs/tqma6s_mba6_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x2fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y
configs/tqma6s_mba6_spi_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x2fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y
configs/tqma6s_wru4_mmc_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x2fc00000 CONFIG_TARGET_TQMA6=y CONFIG_TQMA6S=y
configs/udoo_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/udoo_neo_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/vining_2000_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_SAMTEC_VINING_2000=y # CONFIG_CMD_BMODE is not set
configs/wandboard_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/warp_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_WARP=y # CONFIG_CMD_BMODE is not set
configs/xpress_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_TARGET_XPRESS=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/ccv/xpress/imximage.cfg"
configs/xpress_spl_defconfig +1 -1
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x87800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
configs/zc5202_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6q-zc5202.dtb"
configs/zc5601_defconfig +2 -2
@@ -1,5 +1,5 @@ CONFIG_ARM=y -CONFIG_ARCH_MX6=y +CONFIG_ARCH_IMX6=y CONFIG_SYS_TEXT_BASE=0x17800000 CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y
@@ -12,7 +12,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_SPL_WATCHDOG_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,MX6Q" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg,SOC_IMX6Q" CONFIG_BOOTDELAY=3 CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_DEFAULT_FDT_FILE="imx6q-zc5601.dtb"
doc/README.imx6 +1 -1
@@ -14,7 +14,7 @@ SoC. Example: -For reading the MAC address fuses on a MX6Q: +For reading the MAC address fuses on a i.MX6Q: - The MAC address is stored in two fuse addresses (the fuse addresses are described in the Fusemap Descriptions table from the mx6q Reference Manual):
doc/README.imximage +2 -2
@@ -3,11 +3,11 @@ Imximage Boot Image generation using mkimage --------------------------------------------- This document describes how to set up a U-Boot image that can be booted -by Freescale MX25, MX35, MX51, MX53 and MX6 processors via internal boot +by Freescale MX25, MX35, MX51, MX53 and i.MX6 processors via internal boot mode. These processors can boot directly from NAND, SPI flash and SD card flash -using its internal boot ROM support. MX6 processors additionally support +using its internal boot ROM support. i.MX6 processors additionally support boot from NOR flash and SATA disks. All processors can boot from an internal UART, if booting from device media fails. Booting from NOR flash does not require to use this image type.
drivers/ata/dwc_ahsata.c +1 -1
@@ -885,7 +885,7 @@ int init_sata(int dev) {struct ahci_uc_priv *uc_priv =NULL ; -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )if (!is_mx6dq () && !is_mx6dqp ())return 1 ;#endif
drivers/crypto/fsl/jobdesc.c +1 -1
@@ -14,7 +14,7 @@#include "jobdesc.h" #include "rsa_caam.h" -#if defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) +#if defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 )/*! * Secure memory run command *
drivers/dma/Kconfig +1 -1
@@ -21,7 +21,7 @@ config TI_EDMA3 config APBH_DMA bool "Support APBH DMA" - depends on MX23 || MX28 || MX6 || MX7 + depends on MX23 || MX28 || SOC_IMX6 || MX7 help Enable APBH DMA driver.
drivers/dma/apbh_dma.c +1 -1
@@ -215,7 +215,7 @@ static int mxs_dma_reset(int channel)#if defined(CONFIG_MX23 )uint32_t setreg = (uint32_t )(&apbh_regs->hw_apbh_ctrl0_set);uint32_t offset =APBH_CTRL0_RESET_CHANNEL_OFFSET ; -#elif (defined(CONFIG_MX28 ) || defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#elif (defined(CONFIG_MX28 ) || defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))uint32_t setreg = (uint32_t )(&apbh_regs->hw_apbh_channel_ctrl_set);uint32_t offset =APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET ;#endif
drivers/gpio/mxc_gpio.c +12 -11
@@ -40,19 +40,20 @@ static unsigned long gpio_ports[] = { [1] = GPIO2_BASE_ADDR, [2] = GPIO3_BASE_ADDR,#if defined(CONFIG_MX25 ) || defined(CONFIG_MX27 ) || defined(CONFIG_MX51 ) || \ - defined(CONFIG_MX53 ) || defined(CONFIG_MX6 ) || \ + defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6 ) || \ defined(CONFIG_MX7 ) || defined(CONFIG_MX8M ) [3] = GPIO4_BASE_ADDR,#endif -#if defined(CONFIG_MX27 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6 ) || \ +#if defined(CONFIG_MX27 ) || defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6 ) || \ defined(CONFIG_MX7 ) || defined(CONFIG_MX8M ) [4] = GPIO5_BASE_ADDR, -#if !(defined(CONFIG_MX6UL) || defined(CONFIG_MX6ULL) || defined(CONFIG_MX8M)) +#if !(defined(CONFIG_SOC_IMX6UL) || defined(CONFIG_SOC_IMX6ULL) || \ + defined(CONFIG_MX8M)) [5] = GPIO6_BASE_ADDR,#endif #endif -#if defined(CONFIG_MX53 ) || defined(CONFIG_MX6 ) || defined(CONFIG_MX7 ) -#if !(defined(CONFIG_MX6UL ) || defined(CONFIG_MX6ULL )) +#if defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ) +#if !(defined(CONFIG_SOC_IMX6UL ) || defined(CONFIG_SOC_IMX6ULL )) [6] = GPIO7_BASE_ADDR,#endif #endif
@@ -349,18 +350,18 @@ static const struct mxc_gpio_plat mxc_plat[] = { { 1, (struct gpio_regs *)GPIO2_BASE_ADDR }, { 2, (struct gpio_regs *)GPIO3_BASE_ADDR }, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ - defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ + defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) || \ defined(CONFIG_MX8M) { 3, (struct gpio_regs *)GPIO4_BASE_ADDR }, #endif -#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ +#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) || \ defined(CONFIG_MX8M) { 4, (struct gpio_regs *)GPIO5_BASE_ADDR }, #ifndef CONFIG_MX8M { 5, (struct gpio_regs *)GPIO6_BASE_ADDR }, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) { 6, (struct gpio_regs *)GPIO7_BASE_ADDR }, #endif };
@@ -370,18 +371,18 @@ U_BOOT_DEVICES(mxc_gpios) = { { "gpio_mxc", &mxc_plat[1] }, { "gpio_mxc", &mxc_plat[2] }, #if defined(CONFIG_MX25) || defined(CONFIG_MX27) || defined(CONFIG_MX51) || \ - defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ + defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) || \ defined(CONFIG_MX8M) { "gpio_mxc", &mxc_plat[3] }, #endif -#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_MX6) || \ +#if defined(CONFIG_MX27) || defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) || \ defined(CONFIG_MX8M) { "gpio_mxc", &mxc_plat[4] }, #ifndef CONFIG_MX8M { "gpio_mxc", &mxc_plat[5] }, #endif #endif -#if defined(CONFIG_MX53) || defined(CONFIG_MX6) +#if defined(CONFIG_MX53) || defined(CONFIG_SOC_IMX6) { "gpio_mxc", &mxc_plat[6] }, #endif };
drivers/i2c/Kconfig +1 -1
@@ -150,7 +150,7 @@ config SYS_I2C_MESON config SYS_I2C_MXC bool "NXP i.MX I2C driver" - depends on MX6 + depends on SOC_IMX6 help Add support for the NXP i.MX I2C driver. This supports upto for bus channels and operating on standard mode upto 100 kbits/s and fast
drivers/misc/mxc_ocotp.c +4 -4
@@ -66,11 +66,11 @@#define WRITE_POSTAMBLE_US 2 -#if defined(CONFIG_MX6 ) || defined(CONFIG_VF610 ) +#if defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_VF610 )#define FUSE_BANK_SIZE 0x80 -#ifdef CONFIG_MX6SL +#ifdef CONFIG_SOC_IMX6SL #define FUSE_BANKS 8 -#elif defined(CONFIG_MX6ULL ) || defined(CONFIG_MX6SLL ) +#elif defined(CONFIG_SOC_IMX6ULL ) || defined(CONFIG_SOC_IMX6SLL )#define FUSE_BANKS 9#else #define FUSE_BANKS 16
@@ -88,7 +88,7 @@#error "Unsupported architecture\n"#endif -#if defined(CONFIG_MX6 ) +#if defined(CONFIG_SOC_IMX6 )/* * There is a hole in shadow registers address map of size 0x100
drivers/mmc/Kconfig +3 -3
@@ -210,10 +210,10 @@ config MMC_MXC config MMC_MXS bool "Freescale MXS Multimedia Card Interface support" - depends on MX23 || MX28 || MX6 || MX7 + depends on MX23 || MX28 || SOC_IMX6 || MX7 select APBH_DMA - select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7 - select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7 + select APBH_DMA_BURST if ARCH_IMX6 || ARCH_MX7 + select APBH_DMA_BURST8 if ARCH_IMX6 || ARCH_MX7 help This selects the Freescale SSP MMC controller found on MXS based platforms like mx23/28.
drivers/mtd/nand/Kconfig +3 -3
@@ -140,11 +140,11 @@ config NAND_MXC config NAND_MXS bool "MXS NAND support" - depends on MX23 || MX28 || MX6 || MX7 + depends on MX23 || MX28 || SOC_IMX6 || MX7 imply CMD_NAND select APBH_DMA - select APBH_DMA_BURST if ARCH_MX6 || ARCH_MX7 - select APBH_DMA_BURST8 if ARCH_MX6 || ARCH_MX7 + select APBH_DMA_BURST if ARCH_IMX6 || ARCH_MX7 + select APBH_DMA_BURST8 if ARCH_IMX6 || ARCH_MX7 help This enables NAND driver for the NAND flash controller on the MXS processors.
drivers/mtd/nand/mxs_nand.c +1 -1
@@ -30,7 +30,7 @@#define MXS_NAND_DMA_DESCRIPTOR_COUNT 4#define MXS_NAND_CHUNK_DATA_CHUNK_SIZE 512 -#if (defined(CONFIG_MX6 ) || defined(CONFIG_MX7 )) +#if (defined(CONFIG_SOC_IMX6 ) || defined(CONFIG_MX7 ))#define MXS_NAND_CHUNK_DATA_CHUNK_SIZE_SHIFT 2#else #define MXS_NAND_CHUNK_DATA_CHUNK_SIZE_SHIFT 0
drivers/net/Kconfig +1 -1
@@ -149,7 +149,7 @@ config ETHOC config FEC_MXC bool "FEC Ethernet controller" - depends on MX5 || MX6 + depends on MX5 || SOC_IMX6 help This driver supports the 10/100 Fast Ethernet controller for NXP i.MX processors.
drivers/net/fec_mxc.c +1 -1
@@ -454,7 +454,7 @@ static int fec_open(struct eth_device *edev)writel (readl (&fec->eth->ecntrl) |FEC_ECNTRL_ETHER_EN , &fec->eth->ecntrl); -#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6SL ) +#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6SL )udelay (100 );/* setup the MII gasket for RMII mode */
drivers/net/fec_mxc.h +2 -2
@@ -127,7 +127,7 @@ struct ethernet_regs {uint32_t res14[7 ];/* MBAR_ETH + 0x2E4-2FC */ -#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_MX6SL ) +#if defined(CONFIG_MX25 ) || defined(CONFIG_MX53 ) || defined(CONFIG_SOC_IMX6SL )uint16_t miigsk_cfgr;/* MBAR_ETH + 0x300 */ uint16_t res15[3 ];/* MBAR_ETH + 0x302-306 */
Lines of this file are not shown. View the raw message.
The rest of this diff is not shown. View the raw message.
Signature · 1 line
2.14.3
Part of the diff is not shown here. View the raw message.
PATCH v2 2/6 i.MX6: Change SYS_SOC from mx6 to imx6
In reply to Jagan TekiNow, MX6 has proper CONFIG names so rename the SYS_SOC to imx6 from mx6 and also change related files.
Signed-off-by Jagan Teki <[email protected]>
---
.travis.yml | 4 ++--
arch/arm/Kconfig | 2 +-
arch/arm/Makefile | 4 ++--
arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h | 0
arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h | 0
arch/arm/mach-imx/Makefile | 10 +++++-----
arch/arm/mach-imx/{mx6 => imx6}/Kconfig | 2 +-
arch/arm/mach-imx/{mx6 => imx6}/Makefile | 0
arch/arm/mach-imx/{mx6 => imx6}/clock.c | 0
arch/arm/mach-imx/{mx6 => imx6}/ddr.c | 0
arch/arm/mach-imx/{mx6 => imx6}/litesom.c | 0
arch/arm/mach-imx/{mx6 => imx6}/mp.c | 0
arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c | 0
arch/arm/mach-imx/{mx6 => imx6}/soc.c | 0
board/advantech/dms-ba16/Kconfig | 2 +-
board/ge/bx50v3/Kconfig | 2 +-
board/liebherr/display5/Kconfig | 2 +-
board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 6 +++---
board/technexion/pico-imx6ul/Kconfig | 2 +-
board/toradex/apalis_imx6/Kconfig | 2 +-
board/toradex/colibri_imx6/Kconfig | 2 +-
drivers/watchdog/Makefile | 2 +-
46 files changed, 21 insertions(+), 21 deletions(-)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h (100%)
rename arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/Kconfig (99%)
rename arch/arm/mach-imx/{mx6 => imx6}/Makefile (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/clock.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/ddr.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/litesom.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/mp.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c (100%)
rename arch/arm/mach-imx/{mx6 => imx6}/soc.c (100%).travis.yml +2 -2
@@ -177,10 +177,10 @@ matrix: BUILDMAN="freescale&aarch64" - env: - JOB="i.MX6 (non-Freescale)" - BUILDMAN="mx6 -x freescale,toradex,boundary,engicam" + BUILDMAN="imx6 -x freescale,toradex,boundary,engicam" - env: - JOB="i.MX (non-Freescale, non-i.MX6)" - BUILDMAN="mx -x freescale,mx6,toradex" + BUILDMAN="mx -x freescale,imx6,toradex" - env: - BUILDMAN="k2" - env:
arch/arm/Kconfig +1 -1
@@ -1249,7 +1249,7 @@ source "arch/arm/mach-imx/mx2/Kconfig" source "arch/arm/mach-imx/mx5/Kconfig" -source "arch/arm/mach-imx/mx6/Kconfig" +source "arch/arm/mach-imx/imx6/Kconfig" source "arch/arm/mach-imx/mx7/Kconfig"
arch/arm/Makefile +2 -2
@@ -96,11 +96,11 @@ libs-y += arch/arm/cpu/ libs-y += arch/arm/lib/ ifeq ($(CONFIG_SPL_BUILD),y) -ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 mx6 mx7 mx35 mx8m)) +ifneq (,$(CONFIG_MX23)$(CONFIG_MX28)$(CONFIG_MX35)$(filter $(SOC), mx25 mx5 imx6 mx7 mx35 mx8m)) libs-y += arch/arm/mach-imx/ endif else -ifneq (,$(filter $(SOC), mx25 mx27 mx5 mx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610)) +ifneq (,$(filter $(SOC), mx25 mx27 mx5 imx6 mx7 mx7ulp mx31 mx35 mxs mx8m vf610)) libs-y += arch/arm/mach-imx/ endif endif
arch/arm/include/asm/arch-imx6/clock.h renamed from arch/arm/include/asm/arch-mx6/clock.h +0 -0
arch/arm/include/asm/arch-imx6/crm_regs.h renamed from arch/arm/include/asm/arch-mx6/crm_regs.h +0 -0
arch/arm/include/asm/arch-imx6/gpio.h renamed from arch/arm/include/asm/arch-mx6/gpio.h +0 -0
arch/arm/include/asm/arch-imx6/imx-rdc.h renamed from arch/arm/include/asm/arch-mx6/imx-rdc.h +0 -0
arch/arm/include/asm/arch-imx6/imx-regs.h renamed from arch/arm/include/asm/arch-mx6/imx-regs.h +0 -0
arch/arm/include/asm/arch-imx6/iomux.h renamed from arch/arm/include/asm/arch-mx6/iomux.h +0 -0
arch/arm/include/asm/arch-imx6/litesom.h renamed from arch/arm/include/asm/arch-mx6/litesom.h +0 -0
arch/arm/include/asm/arch-imx6/mx6-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6-pins.h renamed from arch/arm/include/asm/arch-mx6/mx6-pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6_plugin.S renamed from arch/arm/include/asm/arch-mx6/mx6_plugin.S +0 -0
arch/arm/include/asm/arch-imx6/mx6dl-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6dl-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6dl_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6dl_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6q-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6q-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6q_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6q_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sl-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6sl-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sl_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6sl_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sll_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6sll_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sx-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6sx-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sx_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6sx_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6sx_rdc.h renamed from arch/arm/include/asm/arch-mx6/mx6sx_rdc.h +0 -0
arch/arm/include/asm/arch-imx6/mx6ul-ddr.h renamed from arch/arm/include/asm/arch-mx6/mx6ul-ddr.h +0 -0
arch/arm/include/asm/arch-imx6/mx6ul_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6ul_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mx6ull_pins.h renamed from arch/arm/include/asm/arch-mx6/mx6ull_pins.h +0 -0
arch/arm/include/asm/arch-imx6/mxc_hdmi.h renamed from arch/arm/include/asm/arch-mx6/mxc_hdmi.h +0 -0
arch/arm/include/asm/arch-imx6/opos6ul.h renamed from arch/arm/include/asm/arch-mx6/opos6ul.h +0 -0
arch/arm/include/asm/arch-imx6/sys_proto.h renamed from arch/arm/include/asm/arch-mx6/sys_proto.h +0 -0
arch/arm/mach-imx/Makefile +5 -5
@@ -7,7 +7,7 @@ # SPDX-License-Identifier: GPL-2.0+ # -ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 mx6 mx7 mx8m vf610)) +ifeq ($(SOC),$(filter $(SOC),mx25 mx35 mx5 imx6 mx7 mx8m vf610)) obj-y = iomux-v3.o endif
@@ -19,12 +19,12 @@ obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o obj-y += cpu.o endif -ifeq ($(SOC),$(filter $(SOC),mx5 mx6)) +ifeq ($(SOC),$(filter $(SOC),mx5 imx6)) obj-y += cpu.o speed.o obj-$(CONFIG_GPT_TIMER) += timer.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o endif -ifeq ($(SOC),$(filter $(SOC),mx7 mx6 mxs mx8m)) +ifeq ($(SOC),$(filter $(SOC),mx7 imx6 mxs mx8m)) obj-y += misc.o obj-$(CONFIG_SPL_BUILD) += spl.o endif
@@ -33,7 +33,7 @@ obj-y += cpu.o obj-$(CONFIG_SYS_I2C_MXC) += i2c-mxv7.o obj-$(CONFIG_ENV_IS_IN_MMC) += mmc_env.o endif -ifeq ($(SOC),$(filter $(SOC),mx6 mx7)) +ifeq ($(SOC),$(filter $(SOC),imx6 mx7)) obj-y += cache.o init.o obj-$(CONFIG_FEC_MXC) += mac.o obj-$(CONFIG_IMX_VIDEO_SKIP) += video.o
@@ -138,7 +138,7 @@ targets += $(addprefix ../../../,$(IMX_CONFIG) SPL u-boot.uim spl/u-boot-nand-sp obj-$(CONFIG_ARM64) += sip.o obj-$(CONFIG_MX5) += mx5/ -obj-$(CONFIG_SOC_IMX6) += mx6/ +obj-$(CONFIG_SOC_IMX6) += imx6/ obj-$(CONFIG_MX7) += mx7/ obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/ obj-$(CONFIG_MX8M) += mx8m/
arch/arm/mach-imx/imx6/Kconfig renamed from arch/arm/mach-imx/mx6/Kconfig +1 -1
@@ -448,7 +448,7 @@ config TARGET_ZC5601 endchoice config SYS_SOC - default "mx6" + default "imx6" source "board/ge/bx50v3/Kconfig" source "board/advantech/dms-ba16/Kconfig"
arch/arm/mach-imx/imx6/Makefile renamed from arch/arm/mach-imx/mx6/Makefile +0 -0
arch/arm/mach-imx/imx6/clock.c renamed from arch/arm/mach-imx/mx6/clock.c +0 -0
arch/arm/mach-imx/imx6/ddr.c renamed from arch/arm/mach-imx/mx6/ddr.c +0 -0
arch/arm/mach-imx/imx6/litesom.c renamed from arch/arm/mach-imx/mx6/litesom.c +0 -0
arch/arm/mach-imx/imx6/mp.c renamed from arch/arm/mach-imx/mx6/mp.c +0 -0
arch/arm/mach-imx/imx6/opos6ul.c renamed from arch/arm/mach-imx/mx6/opos6ul.c +0 -0
arch/arm/mach-imx/imx6/soc.c renamed from arch/arm/mach-imx/mx6/soc.c +0 -0
board/advantech/dms-ba16/Kconfig +1 -1
@@ -23,7 +23,7 @@ config SYS_VENDOR default "advantech" config SYS_SOC - default "mx6" + default "imx6" config SYS_CONFIG_NAME default "advantech_dms-ba16"
board/ge/bx50v3/Kconfig +1 -1
@@ -10,7 +10,7 @@ config SYS_VENDOR default "ge" config SYS_SOC - default "mx6" + default "imx6" config SYS_CONFIG_NAME default "ge_bx50v3"
board/liebherr/display5/Kconfig +1 -1
@@ -10,7 +10,7 @@ config SYS_VENDOR default "liebherr" config SYS_SOC - default "mx6" + default "imx6" config SYS_CONFIG_NAME default "display5"
board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg +3 -3
@@ -31,9 +31,9 @@ BOOT_OFFSET FLASH_OFFSET_STANDARD #define __ASSEMBLY__ #include <config.h> -#include "asm/arch-mx6/mx6-ddr.h" -#include "asm/arch-mx6/iomux.h" -#include "asm/arch-mx6/crm_regs.h" +#include "asm/arch-imx6/mx6-ddr.h" +#include "asm/arch-imx6/iomux.h" +#include "asm/arch-imx6/crm_regs.h" DATA 4, MX6_IOM_GRP_DDR_TYPE, 0x000C0000 DATA 4, MX6_IOM_GRP_DDRPKE, 0x00000000
board/technexion/pico-imx6ul/Kconfig +1 -1
@@ -7,7 +7,7 @@ config SYS_VENDOR default "technexion" config SYS_SOC - default "mx6" + default "imx6" config SYS_CONFIG_NAME default "pico-imx6ul"
board/toradex/apalis_imx6/Kconfig +1 -1
@@ -10,7 +10,7 @@ config SYS_CPU default "armv7" config SYS_SOC - default "mx6" + default "imx6" config SYS_VENDOR default "toradex"
board/toradex/colibri_imx6/Kconfig +1 -1
@@ -10,7 +10,7 @@ config SYS_CPU default "armv7" config SYS_SOC - default "mx6" + default "imx6" config SYS_VENDOR default "toradex"
drivers/watchdog/Makefile +1 -1
@@ -7,7 +7,7 @@ obj-$(CONFIG_AT91SAM9_WATCHDOG) += at91sam9_wdt.o obj-$(CONFIG_FTWDT010_WATCHDOG) += ftwdt010_wdt.o -ifneq (,$(filter $(SOC), mx31 mx35 mx5 mx6 mx7 vf610)) +ifneq (,$(filter $(SOC), mx31 mx35 mx5 imx6 mx7 vf610)) obj-y += imx_watchdog.o endif obj-$(CONFIG_S5P) += s5p_wdt.o
Signature · 1 line
2.14.3
Fabio Estevam
maintainerPATCH v2 2/6 i.MX6: Change SYS_SOC from mx6 to imx6
Quoted 44 lines · Jagan Teki
Now, MX6 has proper CONFIG names so rename the
SYS_SOCto imx6 from mx6 and also change related files.Signed-off-by Jagan Teki <[email protected]>--- .travis.yml | 4 ++-- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 4 ++-- arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h | 0 arch/arm/mach-imx/Makefile | 10 +++++----- arch/arm/mach-imx/{mx6 => imx6}/Kconfig | 2 +- arch/arm/mach-imx/{mx6 => imx6}/Makefile | 0 arch/arm/mach-imx/{mx6 => imx6}/clock.c | 0 arch/arm/mach-imx/{mx6 => imx6}/ddr.c | 0 arch/arm/mach-imx/{mx6 => imx6}/litesom.c | 0 arch/arm/mach-imx/{mx6 => imx6}/mp.c | 0 arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c | 0 arch/arm/mach-imx/{mx6 => imx6}/soc.c | 0 board/advantech/dms-ba16/Kconfig | 2 +-
Quoted 8 lines
board/ge/bx50v3/Kconfig | 2 +- board/liebherr/display5/Kconfig | 2 +- board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 6 +++--- board/technexion/pico-imx6ul/Kconfig | 2 +- board/toradex/apalis_imx6/Kconfig | 2 +- board/toradex/colibri_imx6/Kconfig | 2 +- drivers/watchdog/Makefile | 2 +- 46 files changed, 21 insertions(+), 21 deletions(-)
Sorry, but I still don't like this patch at all as I mentioned in the previous version.
PATCH v2 2/6 i.MX6: Change SYS_SOC from mx6 to imx6
Hi,
Quoted 54 lines · On Sun, 25 Mar 2018 15:30:08 -0300 Fabio Estevam wrote:
Quoted 44 lines · Jagan Teki
Now, MX6 has proper CONFIG names so rename the
SYS_SOCto imx6 from mx6 and also change related files.Signed-off-by Jagan Teki <[email protected]>--- .travis.yml | 4 ++-- arch/arm/Kconfig | 2 +- arch/arm/Makefile | 4 ++-- arch/arm/include/asm/{arch-mx6 => arch-imx6}/clock.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/crm_regs.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/gpio.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-rdc.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/imx-regs.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/iomux.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/litesom.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6-pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6_plugin.S | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6dl_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6q_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sl_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sll_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6sx_rdc.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul-ddr.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ul_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mx6ull_pins.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/mxc_hdmi.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/opos6ul.h | 0 arch/arm/include/asm/{arch-mx6 => arch-imx6}/sys_proto.h | 0 arch/arm/mach-imx/Makefile | 10 +++++----- arch/arm/mach-imx/{mx6 => imx6}/Kconfig | 2 +- arch/arm/mach-imx/{mx6 => imx6}/Makefile | 0 arch/arm/mach-imx/{mx6 => imx6}/clock.c | 0 arch/arm/mach-imx/{mx6 => imx6}/ddr.c | 0 arch/arm/mach-imx/{mx6 => imx6}/litesom.c | 0 arch/arm/mach-imx/{mx6 => imx6}/mp.c | 0 arch/arm/mach-imx/{mx6 => imx6}/opos6ul.c | 0 arch/arm/mach-imx/{mx6 => imx6}/soc.c | 0 board/advantech/dms-ba16/Kconfig | 2 +-Quoted 8 lines
board/ge/bx50v3/Kconfig | 2 +- board/liebherr/display5/Kconfig | 2 +- board/logicpd/imx6/mx6q_2x_MT41K512M16HA.cfg | 6 +++--- board/technexion/pico-imx6ul/Kconfig | 2 +- board/toradex/apalis_imx6/Kconfig | 2 +- board/toradex/colibri_imx6/Kconfig | 2 +- drivers/watchdog/Makefile | 2 +- 46 files changed, 21 insertions(+), 21 deletions(-)
Quoted 3 lines
Sorry, but I still don't like this patch at all as I mentioned in the previous version.
+1
There is no danger confusing the mx* files with any other SoC family, so renaming them to imx* is unnecessary churn.
Lothar Waßmann
PATCH v2 3/6 ARM: dts: i.MX6QDL: U-Boot specific dts for u-boot, dm-spl
In reply to Jagan Tekiu-boot,dm-spl property is specific to U-Boot, so move it into *u-boot.dtsi files for relevant i.MX6QDL files.
This make syncing Linux dts files straight forward.
Also update the MAINTAINERS file for dts files.
Signed-off-by Jagan Teki <[email protected]>
--- arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx6dl-icore-mipi.dts | 1 - arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi | 7 +++++++ arch/arm/dts/imx6dl-icore-u-boot.dtsi | 7 +++++++ arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx6q-icore-mipi.dts | 1 - arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi | 7 +++++++ arch/arm/dts/imx6q-icore-u-boot.dtsi | 7 +++++++ arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi | 23 +++++++++++++++++++++++ arch/arm/dts/imx6qdl-icore-rqs.dtsi | 4 ---- arch/arm/dts/imx6qdl-icore-u-boot.dtsi | 19 +++++++++++++++++++ arch/arm/dts/imx6qdl-icore.dtsi | 3 --- arch/arm/dts/imx6qdl-u-boot.dtsi | 27 +++++++++++++++++++++++++++ arch/arm/dts/imx6qdl.dtsi | 5 ----- board/engicam/imx6q/MAINTAINERS | 11 ++++++++++- 15 files changed, 129 insertions(+), 15 deletions(-) create mode 100644 arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6dl-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6q-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-icore-u-boot.dtsi create mode 100644 arch/arm/dts/imx6qdl-u-boot.dtsi
arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi new file +11 -0
@@ -0,0 +1,11 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +};
arch/arm/dts/imx6dl-icore-mipi.dts +0 -1
@@ -16,6 +16,5 @@ }; &usdhc3 { - u-boot,dm-spl; status = "okay"; };
arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-rqs-u-boot.dtsi"
arch/arm/dts/imx6dl-icore-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-u-boot.dtsi"
arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi new file +11 -0
@@ -0,0 +1,11 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +};
arch/arm/dts/imx6q-icore-mipi.dts +0 -1
@@ -16,6 +16,5 @@ }; &usdhc3 { - u-boot,dm-spl; status = "okay"; };
arch/arm/dts/imx6q-icore-rqs-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-rqs-u-boot.dtsi"
arch/arm/dts/imx6q-icore-u-boot.dtsi new file +7 -0
@@ -0,0 +1,7 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-icore-u-boot.dtsi"
arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi new file +23 -0
@@ -0,0 +1,23 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc3 { + u-boot,dm-spl; +}; + +&usdhc4 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc4 { + u-boot,dm-spl; +};
arch/arm/dts/imx6qdl-icore-rqs.dtsi +0 -4
@@ -105,7 +105,6 @@ }; &usdhc3 { - u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc3>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
@@ -114,7 +113,6 @@ }; &usdhc4 { - u-boot,dm-spl; pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc4>; pinctrl-1 = <&pinctrl_usdhc4_100mhz>;
@@ -176,7 +174,6 @@ }; pinctrl_usdhc3: usdhc3grp { - u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17070 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10070
@@ -188,7 +185,6 @@ }; pinctrl_usdhc4: usdhc4grp { - u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD4_CMD__SD4_CMD 0x17070 MX6QDL_PAD_SD4_CLK__SD4_CLK 0x10070
arch/arm/dts/imx6qdl-icore-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6qdl-u-boot.dtsi" + +&usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc3 { + u-boot,dm-spl; +};
arch/arm/dts/imx6qdl-icore.dtsi +0 -3
@@ -122,7 +122,6 @@ }; &usdhc1 { - u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; cd-gpios = <&gpio1 1 GPIO_ACTIVE_LOW>;
@@ -221,7 +220,6 @@ }; pinctrl_usdhc1: usdhc1grp { - u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD1_CMD__SD1_CMD 0x17070 MX6QDL_PAD_SD1_CLK__SD1_CLK 0x10070
@@ -233,7 +231,6 @@ }; pinctrl_usdhc3: usdhc3grp { - u-boot,dm-spl; fsl,pins = < MX6QDL_PAD_SD3_CMD__SD3_CMD 0x17059 MX6QDL_PAD_SD3_CLK__SD3_CLK 0x10059
arch/arm/dts/imx6qdl-u-boot.dtsi new file +27 -0
@@ -0,0 +1,27 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/ { + soc { + u-boot,dm-spl; + + aips-bus at 02000000 { + u-boot,dm-spl; + }; + + aips-bus at 02100000 { + u-boot,dm-spl; + }; + }; +}; + +&gpio1 { + u-boot,dm-spl; +}; + +&iomuxc { + u-boot,dm-spl; +};
arch/arm/dts/imx6qdl.dtsi +0 -5
@@ -77,7 +77,6 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; - u-boot,dm-spl; dma_apbh: dma-apbh at 00110000 { compatible = "fsl,imx6q-dma-apbh", "fsl,imx28-dma-apbh";
@@ -226,7 +225,6 @@ #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; - u-boot,dm-spl; spba-bus at 02000000 { compatible = "fsl,spba-bus", "simple-bus";
@@ -518,7 +516,6 @@ #gpio-cells = <2>; interrupt-controller; #interrupt-cells = <2>; - u-boot,dm-spl; }; gpio2: gpio at 020a0000 {
@@ -808,7 +805,6 @@ iomuxc: iomuxc at 020e0000 { compatible = "fsl,imx6dl-iomuxc", "fsl,imx6q-iomuxc"; reg = <0x020e0000 0x4000>; - u-boot,dm-spl; }; ldb: ldb at 020e0008 {
@@ -893,7 +889,6 @@ #size-cells = <1>; reg = <0x02100000 0x100000>; ranges; - u-boot,dm-spl; crypto: caam at 2100000 { compatible = "fsl,sec-v4.0";
board/engicam/imx6q/MAINTAINERS +10 -1
@@ -9,12 +9,21 @@ F: configs/imx6dl_icore_nand_defconfig F: configs/imx6qdl_icore_rqs_defconfig F: configs/imx6qdl_icore_mipi_defconfig F: configs/imx6qdl_icore_nand_defconfig +F: arch/arm/dts/imx6qdl.dtsi +F: arch/arm/dts/imx6qdl-u-boot.dtsi F: arch/arm/dts/imx6qdl-icore.dtsi +F: arch/arm/dts/imx6qdl-icore-u-boot.dtsi F: arch/arm/dts/imx6q-icore.dts +F: arch/arm/dts/imx6q-icore-u-boot.dtsi F: arch/arm/dts/imx6dl-icore.dts +F: arch/arm/dts/imx6dl-icore-u-boot.dtsi F: arch/arm/dts/imx6qdl-icore-rqs.dtsi +F: arch/arm/dts/imx6qdl-icore-rqs-u-boot.dtsi F: arch/arm/dts/imx6q-icore-rqs.dts +F: arch/arm/dts/imx6q-icore-rqs-u-boot.dtis F: arch/arm/dts/imx6dl-icore-rqs.dts +F: arch/arm/dts/imx6dl-icore-rqs-u-boot.dtsi F: arch/arm/dts/imx6dl-icore-mipi.dts +F: arch/arm/dts/imx6dl-icore-mipi-u-boot.dtsi F: arch/arm/dts/imx6q-icore-mipi.dts -F: arch/arm/dts/imx6qdl-icore.dtsi +F: arch/arm/dts/imx6q-icore-mipi-u-boot.dtsi
Signature · 1 line
2.14.3
PATCH v2 4/6 ARM: dts: imx6ul-isiot: Move usdhc2 into dtsi
In reply to Jagan TekiMove usdhc2 node along with pinctrl to imx6ul-isiot.dts from imx6ul-isiot-emmc.dts
Signed-off-by Jagan Teki <[email protected]>
--- arch/arm/dts/imx6ul-isiot-emmc.dts | 24 ------------------------ arch/arm/dts/imx6ul-isiot.dtsi | 26 ++++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 24 deletions(-)
arch/arm/dts/imx6ul-isiot-emmc.dts +0 -24
@@ -51,29 +51,5 @@ &usdhc2 { u-boot,dm-spl; - pinctrl-names = "default"; - pinctrl-0 = <&pinctrl_usdhc2>; - cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; - bus-width = <8>; - no-1-8-v; status = "okay"; }; - -&iomuxc { - pinctrl_usdhc2: usdhc2grp { - u-boot,dm-spl; - fsl,pins = < - MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17070 - MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x10070 - MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17070 - MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17070 - MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17070 - MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17070 - MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17070 - MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17070 - MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17070 - MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17070 - MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17070 - >; - }; -};
arch/arm/dts/imx6ul-isiot.dtsi +26 -0
@@ -91,6 +91,15 @@ status = "okay"; }; +&usdhc2 { + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usdhc2>; + cd-gpios = <&gpio4 5 GPIO_ACTIVE_LOW>; + bus-width = <8>; + no-1-8-v; + status = "disabled"; +}; + &iomuxc { pinctrl_enet1: enet1grp { fsl,pins = <
@@ -139,4 +148,21 @@ MX6UL_PAD_SD1_DATA3__USDHC1_DATA3 0x17059 >; }; + + pinctrl_usdhc2: usdhc2grp { + u-boot,dm-spl; + fsl,pins = < + MX6UL_PAD_NAND_RE_B__USDHC2_CLK 0x17070 + MX6UL_PAD_NAND_WE_B__USDHC2_CMD 0x10070 + MX6UL_PAD_NAND_DATA00__USDHC2_DATA0 0x17070 + MX6UL_PAD_NAND_DATA01__USDHC2_DATA1 0x17070 + MX6UL_PAD_NAND_DATA02__USDHC2_DATA2 0x17070 + MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x17070 + MX6UL_PAD_NAND_DATA04__USDHC2_DATA4 0x17070 + MX6UL_PAD_NAND_DATA05__USDHC2_DATA5 0x17070 + MX6UL_PAD_NAND_DATA06__USDHC2_DATA6 0x17070 + MX6UL_PAD_NAND_DATA07__USDHC2_DATA7 0x17070 + MX6UL_PAD_NAND_ALE__USDHC2_RESET_B 0x17070 + >; + }; };
Signature · 1 line
2.14.3
PATCH v2 5/6 ARM: dts: i.MX6UL: U-Boot specific dts for u-boot, dm-spl
In reply to Jagan Tekiu-boot,dm-spl property is specific to U-Boot, so move it into *u-boot.dtsi files for relevant i.MX6UL files.
This make syncing Linux dts files straight forward.
Also update the MAINTAINERS file for dts files.
Signed-off-by Jagan Teki <[email protected]>
--- arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi | 25 ++++++++++++++++++++++++ arch/arm/dts/imx6ul-geam-kit.dts | 4 ---- arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi | 11 +++++++++++ arch/arm/dts/imx6ul-isiot-emmc.dts | 1 + arch/arm/dts/imx6ul-isiot-nand.dts | 1 + arch/arm/dts/imx6ul-isiot-u-boot.dtsi | 19 ++++++++++++++++++ arch/arm/dts/imx6ul-isiot.dtsi | 3 --- arch/arm/dts/imx6ul-u-boot.dtsi | 31 ++++++++++++++++++++++++++++++ arch/arm/dts/imx6ul.dtsi | 6 ------ board/engicam/imx6ul/MAINTAINERS | 5 +++++ 10 files changed, 93 insertions(+), 13 deletions(-) create mode 100644 arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-isiot-u-boot.dtsi create mode 100644 arch/arm/dts/imx6ul-u-boot.dtsi
arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi new file +25 -0
@@ -0,0 +1,25 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6ul-u-boot.dtsi" + +&usdhc1 { + u-boot,dm-spl; +}; + +&iomuxc { + pinctrl_usdhc1: usdhc1grp { + u-boot,dm-spl; + }; + + pinctrl_usdhc1_100mhz: usdhc1grp100mhz { + u-boot,dm-spl; + }; + + pinctrl_usdhc1_200mhz: usdhc1grp200mhz { + u-boot,dm-spl; + }; +};
arch/arm/dts/imx6ul-geam-kit.dts +0 -4
@@ -87,7 +87,6 @@ }; &usdhc1 { - u-boot,dm-spl; pinctrl-names = "default", "state_100mhz", "state_200mhz"; pinctrl-0 = <&pinctrl_usdhc1>; pinctrl-1 = <&pinctrl_usdhc1_100mhz>;
@@ -135,7 +134,6 @@ }; pinctrl_usdhc1: usdhc1grp { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
@@ -147,7 +145,6 @@ }; pinctrl_usdhc1_100mhz: usdhc1grp100mhz { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170b9 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100b9
@@ -159,7 +156,6 @@ }; pinctrl_usdhc1_200mhz: usdhc1grp200mhz { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x170f9 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x100f9
arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi new file +11 -0
@@ -0,0 +1,11 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6ul-isiot-u-boot.dtsi" + +&usdhc2 { + u-boot,dm-spl; +};
arch/arm/dts/imx6ul-isiot-emmc.dts +1 -0
@@ -42,6 +42,7 @@ /dts-v1/; +#include "imx6ul.dtsi" #include "imx6ul-isiot.dtsi" / {
arch/arm/dts/imx6ul-isiot-nand.dts +1 -0
@@ -42,6 +42,7 @@ /dts-v1/; +#include "imx6ul.dtsi" #include "imx6ul-isiot.dtsi" / {
arch/arm/dts/imx6ul-isiot-u-boot.dtsi new file +19 -0
@@ -0,0 +1,19 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#include "imx6ul-u-boot.dtsi" + +&usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc1 { + u-boot,dm-spl; +}; + +&pinctrl_usdhc2 { + u-boot,dm-spl; +};
arch/arm/dts/imx6ul-isiot.dtsi +0 -3
@@ -42,7 +42,6 @@ #include <dt-bindings/gpio/gpio.h> #include <dt-bindings/input/input.h> -#include "imx6ul.dtsi" / { memory {
@@ -82,7 +81,6 @@ }; &usdhc1 { - u-boot,dm-spl; pinctrl-names = "default"; pinctrl-0 = <&pinctrl_usdhc1>; cd-gpios = <&gpio1 19 GPIO_ACTIVE_LOW>;
@@ -138,7 +136,6 @@ }; pinctrl_usdhc1: usdhc1grp { - u-boot,dm-spl; fsl,pins = < MX6UL_PAD_SD1_CMD__USDHC1_CMD 0x17059 MX6UL_PAD_SD1_CLK__USDHC1_CLK 0x10059
arch/arm/dts/imx6ul-u-boot.dtsi new file +31 -0
@@ -0,0 +1,31 @@ +/* + * Copyright (C) 2018 Jagan Teki <[email protected]> + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +/ { + soc { + u-boot,dm-spl; + }; +}; + +&aips1 { + u-boot,dm-spl; +}; + +&gpio1 { + u-boot,dm-spl; +}; + +&gpio4 { + u-boot,dm-spl; +}; + +&iomuxc { + u-boot,dm-spl; +}; + +&aips2 { + u-boot,dm-spl; +};
arch/arm/dts/imx6ul.dtsi +0 -6
@@ -134,7 +134,6 @@ compatible = "simple-bus"; interrupt-parent = <&gpc>; ranges; - u-boot,dm-spl; pmu { compatible = "arm,cortex-a7-pmu";
@@ -186,7 +185,6 @@ #size-cells = <1>; reg = <0x02000000 0x100000>; ranges; - u-boot,dm-spl; spba-bus at 02000000 { compatible = "fsl,spba-bus", "simple-bus";
@@ -417,7 +415,6 @@ #interrupt-cells = <2>; gpio-ranges = <&iomuxc 0 23 10>, <&iomuxc 10 17 6>, <&iomuxc 16 33 16>; - u-boot,dm-spl; }; gpio2: gpio at 020a0000 {
@@ -454,7 +451,6 @@ interrupt-controller; #interrupt-cells = <2>; gpio-ranges = <&iomuxc 0 94 17>, <&iomuxc 17 117 12>; - u-boot,dm-spl; }; gpio5: gpio at 020ac000 {
@@ -653,7 +649,6 @@ iomuxc: iomuxc at 020e0000 { compatible = "fsl,imx6ul-iomuxc"; reg = <0x020e0000 0x4000>; - u-boot,dm-spl; }; gpr: iomuxc-gpr at 020e4000 {
@@ -734,7 +729,6 @@ #size-cells = <1>; reg = <0x02100000 0x100000>; ranges; - u-boot,dm-spl; usbotg1: usb at 02184000 { compatible = "fsl,imx6ul-usb", "fsl,imx27-usb";
board/engicam/imx6ul/MAINTAINERS +5 -0
@@ -8,7 +8,12 @@ F: configs/imx6ul_geam_nand_defconfig F: configs/imx6ul_isiot_emmc_defconfig F: configs/imx6ul_isiot_mmc_defconfig F: configs/imx6ul_isiot_nand_defconfig +F: arch/arm/dts/imx6ul.dtsi +F: arch/arm/dts/imx6ul-u-boot.dtsi F: arch/arm/dts/imx6ul-geam-kit.dts +F: arch/arm/dts/imx6ul-geam-kit-u-boot.dtsi F: arch/arm/dts/imx6ul-isiot.dtsi +F: arch/arm/dts/imx6ul-isiot-u-boot.dtsi F: arch/arm/dts/imx6ul-isiot-emmc.dts +F: arch/arm/dts/imx6ul-isiot-emmc-u-boot.dtsi F: arch/arm/dts/imx6ul-isiot-nand.dts
Signature · 1 line
2.14.3
PATCH v2 6/6 ARM: i.MX6: dts: Build dtb based on SOC type
In reply to Jagan TekiNow, we have proper CONFIG_SOC_ names for i.MX6 SOC types, so use the same for building dtbs.
Signed-off-by Jagan Teki <[email protected]>
--- arch/arm/dts/Makefile | 44 ++++++++++++++++++++++++++------------------ 1 file changed, 26 insertions(+), 18 deletions(-)
arch/arm/dts/Makefile +26 -18
@@ -385,24 +385,6 @@ dtb-$(CONFIG_VF610) += vf500-colibri.dtb \ dtb-$(CONFIG_MX53) += imx53-cx9020.dtb -dtb-$(CONFIG_SOC_IMX6) += imx6ull-14x14-evk.dtb \ - imx6sl-evk.dtb \ - imx6sll-evk.dtb \ - imx6dl-icore.dtb \ - imx6dl-icore-mipi.dtb \ - imx6dl-icore-rqs.dtb \ - imx6q-cm-fx6.dtb \ - imx6q-icore.dtb \ - imx6q-icore-mipi.dtb \ - imx6q-icore-rqs.dtb \ - imx6q-logicpd.dtb \ - imx6sx-sabreauto.dtb \ - imx6sx-sdb.dtb \ - imx6ul-geam-kit.dtb \ - imx6ul-isiot-emmc.dtb \ - imx6ul-isiot-nand.dtb \ - imx6ul-opos6uldev.dtb - dtb-$(CONFIG_MX7) += imx7-colibri.dtb \ imx7d-sdb.dtb
@@ -417,6 +399,32 @@ dtb-$(CONFIG_RCAR_GEN3) += \ r8a77970-eagle.dtb \ r8a77995-draak.dtb +dtb-$(CONFIG_SOC_IMX6QDL) += \ + imx6dl-icore.dtb \ + imx6dl-icore-mipi.dtb \ + imx6dl-icore-rqs.dtb \ + imx6q-cm-fx6.dtb \ + imx6q-icore.dtb \ + imx6q-icore-mipi.dtb \ + imx6q-icore-rqs.dtb \ + imx6q-logicpd.dtb + +dtb-$(CONFIG_SOC_IMX6SL) += imx6sl-evk.dtb + +dtb-$(CONFIG_SOC_IMX6SL) += imx6sll-evk.dtb + +dtb-$(CONFIG_SOC_IMX6SX) += \ + imx6sx-sabreauto.dtb \ + imx6sx-sdb.dtb + +dtb-$(CONFIG_SOC_IMX6UL) += \ + imx6ul-geam-kit.dtb \ + imx6ul-isiot-emmc.dtb \ + imx6ul-isiot-nand.dtb \ + imx6ul-opos6uldev.dtb + +dtb-$(CONFIG_SOC_IMX6ULL) += imx6ull-14x14-evk.dtb + dtb-$(CONFIG_SOC_KEYSTONE) += keystone-k2hk-evm.dtb \ keystone-k2l-evm.dtb \ keystone-k2e-evm.dtb \
Signature · 1 line
2.14.3