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%)