From: Lothar Waßmann Date: Mon, 12 Oct 2015 12:01:23 +0000 (+0200) Subject: kconfig: arm: move ARCH_MX? out of choice which selects TARGETs that depend on those X-Git-Tag: KARO-TX6UL-2015-10-23~19 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=f09d4f4f75c5b179c77679416421552b309b7f97 kconfig: arm: move ARCH_MX? out of choice which selects TARGETs that depend on those --- diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 71383e534c..df3207fdaa 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -74,6 +74,18 @@ config SYS_DCACHE_OFF config SYS_L2CACHE_OFF bool "Do not use L2 cache" +config ARCH_MXS + bool "Freescale i.MX23 & i.MX28" + select CPU_ARM926EJS + +config ARCH_MX6 + bool "Freescale MX6" + select CPU_V7 + +config ARCH_MX5 + bool "Freescale MX5" + select CPU_V7 + config SOC_AM335X bool select CPU_V7 @@ -226,7 +238,6 @@ config TARGET_TX53 config TARGET_TX6 bool "Support tx6" - select SOC_MX6 config TARGET_ZMX25 bool "Support zmx25" @@ -557,14 +568,6 @@ config ARCH_KEYSTONE select CPU_V7 select SUPPORT_SPL -config ARCH_MX6 - bool "Freescale MX6" - select CPU_V7 - -config ARCH_MX5 - bool "Freescale MX5" - select CPU_V7 - config TARGET_M53EVK bool "Support m53evk" select CPU_V7 @@ -938,6 +941,8 @@ source "arch/arm/mach-keystone/Kconfig" source "arch/arm/mach-kirkwood/Kconfig" +source "arch/arm/cpu/arm926ejs/mxs/Kconfig" + source "arch/arm/cpu/armv7/mx6/Kconfig" source "arch/arm/cpu/armv7/mx5/Kconfig" diff --git a/arch/arm/cpu/arm926ejs/mxs/Kconfig b/arch/arm/cpu/arm926ejs/mxs/Kconfig new file mode 100644 index 0000000000..ecbed4c7d9 --- /dev/null +++ b/arch/arm/cpu/arm926ejs/mxs/Kconfig @@ -0,0 +1,9 @@ +if ARCH_MXS + +config SOC_MX23 + bool + +config SOC_MX28 + bool + +endif diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile index 5d9e819114..b0b872d5c3 100644 --- a/arch/arm/cpu/armv7/Makefile +++ b/arch/arm/cpu/armv7/Makefile @@ -12,7 +12,7 @@ obj-y += cache_v7.o obj-y += cpu.o cp15.o obj-y += syslib.o -ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_SOC_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_ARCH_SOCFPGA),) +ifneq ($(CONFIG_AM43XX)$(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_ARCH_MX6)$(CONFIG_TI81XX)$(CONFIG_AT91FAMILY)$(CONFIG_SUNXI)$(CONFIG_ARCH_SOCFPGA),) ifneq ($(CONFIG_SKIP_LOWLEVEL_INIT),y) obj-y += lowlevel_init.o endif @@ -43,7 +43,7 @@ obj-$(if $(filter bcmcygnus,$(SOC)),y) += bcmcygnus/ obj-$(if $(filter bcmnsp,$(SOC)),y) += bcmnsp/ obj-$(if $(filter ls102xa,$(SOC)),y) += ls102xa/ obj-$(if $(filter mx5,$(SOC)),y) += mx5/ -obj-$(CONFIG_SOC_MX6) += mx6/ +obj-$(CONFIG_ARCH_MX6) += mx6/ obj-$(CONFIG_OMAP34XX) += omap3/ obj-$(CONFIG_OMAP44XX) += omap4/ obj-$(CONFIG_OMAP54XX) += omap5/ diff --git a/arch/arm/imx-common/cpu.c b/arch/arm/imx-common/cpu.c index caa6ef6296..c3d09b2fc1 100644 --- a/arch/arm/imx-common/cpu.c +++ b/arch/arm/imx-common/cpu.c @@ -64,7 +64,7 @@ u32 get_imx_reset_cause(void) } #endif -#if defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) #if defined(CONFIG_SOC_MX53) #define MEMCTL_BASE ESDCTL_BASE_ADDR #else @@ -154,14 +154,14 @@ int print_cpuinfo(void) u32 cpurev; __maybe_unused u32 max_freq; -#if defined(CONFIG_SOC_MX6) && defined(CONFIG_IMX6_THERMAL) +#if defined(CONFIG_ARCH_MX6) && defined(CONFIG_IMX6_THERMAL) struct udevice *thermal_dev; int cpu_tmp, minc, maxc, ret; #endif cpurev = get_cpu_rev(); -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) printf("CPU: Freescale i.MX%s rev%d.%d", get_imx_type((cpurev & 0xFF000) >> 12), (cpurev & 0x000F0) >> 4, @@ -181,7 +181,7 @@ int print_cpuinfo(void) mxc_get_clock(MXC_ARM_CLK) / 1000000); #endif -#if defined(CONFIG_SOC_MX6) && defined(CONFIG_IMX6_THERMAL) +#if defined(CONFIG_ARCH_MX6) && defined(CONFIG_IMX6_THERMAL) puts("CPU: "); switch (get_cpu_temp_grade(&minc, &maxc)) { case TEMP_AUTOMOTIVE: @@ -253,7 +253,7 @@ void arch_preboot_os(void) { #if defined(CONFIG_CMD_SATA) sata_stop(); -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) disable_sata_clock(); #endif #endif diff --git a/arch/arm/imx-common/spl.c b/arch/arm/imx-common/spl.c index 1073b3503f..143ff4490c 100644 --- a/arch/arm/imx-common/spl.c +++ b/arch/arm/imx-common/spl.c @@ -13,7 +13,7 @@ #include #include -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) /* determine boot device from SRC_SBMR1 (BOOT_CFG[4:1]) or SRC_GPR9 register */ u32 spl_boot_device(void) { diff --git a/arch/arm/imx-common/timer.c b/arch/arm/imx-common/timer.c index b954a20d7f..4943a2a307 100644 --- a/arch/arm/imx-common/timer.c +++ b/arch/arm/imx-common/timer.c @@ -42,7 +42,7 @@ DECLARE_GLOBAL_DATA_PTR; static inline int gpt_has_clk_source_osc(void) { -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) if (((is_cpu_type(MXC_CPU_MX6Q) || is_cpu_type(MXC_CPU_MX6D)) && (soc_rev() > CHIP_REV_1_0)) || is_cpu_type(MXC_CPU_MX6DL) || is_cpu_type(MXC_CPU_MX6SOLO) || is_cpu_type(MXC_CPU_MX6SX) || diff --git a/arch/arm/include/asm/imx-common/dma.h b/arch/arm/include/asm/imx-common/dma.h index 8b5acfc9e3..f991c9517e 100644 --- a/arch/arm/include/asm/imx-common/dma.h +++ b/arch/arm/include/asm/imx-common/dma.h @@ -59,7 +59,7 @@ enum { MXS_DMA_CHANNEL_AHB_APBH_RESERVED1, MXS_MAX_DMA_CHANNELS, }; -#elif defined(CONFIG_SOC_MX6) +#elif defined(CONFIG_ARCH_MX6) enum { MXS_DMA_CHANNEL_AHB_APBH_GPMI0 = 0, MXS_DMA_CHANNEL_AHB_APBH_GPMI1, diff --git a/arch/arm/include/asm/imx-common/iomux-v3.h b/arch/arm/include/asm/imx-common/iomux-v3.h index e1b733741b..8b9a8070d0 100644 --- a/arch/arm/include/asm/imx-common/iomux-v3.h +++ b/arch/arm/include/asm/imx-common/iomux-v3.h @@ -92,7 +92,7 @@ typedef u64 iomux_v3_cfg_t; #define __PAD_CTRL_VALID (1 << 17) #define PAD_CTRL_VALID ((iomux_v3_cfg_t)__PAD_CTRL_VALID << MUX_PAD_CTRL_SHIFT) -#ifdef CONFIG_SOC_MX6 +#ifdef CONFIG_ARCH_MX6 #define PAD_CTL_HYS __MUX_PAD_CTRL(1 << 16) diff --git a/arch/arm/include/asm/imx-common/regs-apbh.h b/arch/arm/include/asm/imx-common/regs-apbh.h index 1b14248b6f..4fd6bcea37 100644 --- a/arch/arm/include/asm/imx-common/regs-apbh.h +++ b/arch/arm/include/asm/imx-common/regs-apbh.h @@ -96,7 +96,7 @@ struct mxs_apbh_regs { mxs_reg_32(hw_apbh_version); }; -#elif (defined(CONFIG_SOC_MX28) || defined(CONFIG_SOC_MX6)) +#elif (defined(CONFIG_SOC_MX28) || defined(CONFIG_ARCH_MX6)) struct mxs_apbh_regs { mxs_reg_32(hw_apbh_ctrl0); /* 0x000 */ mxs_reg_32(hw_apbh_ctrl1); /* 0x010 */ @@ -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_SOC_MX6) +#elif defined(CONFIG_ARCH_MX6) #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_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) #define APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET 16 #endif diff --git a/arch/arm/include/asm/imx-common/regs-bch.h b/arch/arm/include/asm/imx-common/regs-bch.h index 3d073a55a4..3474ea5d0a 100644 --- a/arch/arm/include/asm/imx-common/regs-bch.h +++ b/arch/arm/include/asm/imx-common/regs-bch.h @@ -126,7 +126,7 @@ struct 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_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) #define BCH_FLASHLAYOUT0_ECC0_MASK (0x1f << 11) #define BCH_FLASHLAYOUT0_ECC0_OFFSET 11 #else @@ -157,7 +157,7 @@ struct bch_regs { #define BCH_FLASHLAYOUT1_PAGE_SIZE_MASK (0xffff << 16) #define BCH_FLASHLAYOUT1_PAGE_SIZE_OFFSET 16 -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) #define BCH_FLASHLAYOUT1_ECCN_MASK (0x1f << 11) #define BCH_FLASHLAYOUT1_ECCN_OFFSET 11 #else diff --git a/arch/arm/lib/asm-offsets.c b/arch/arm/lib/asm-offsets.c index 07e687510d..0c729c2617 100644 --- a/arch/arm/lib/asm-offsets.c +++ b/arch/arm/lib/asm-offsets.c @@ -16,10 +16,10 @@ #include #if defined(CONFIG_SOC_MX25) || defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX35) \ - || defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) + || defined(CONFIG_SOC_MX51) || defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) #include #endif -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) #include #endif @@ -200,7 +200,7 @@ int main(void) DEFINE(PLL_DP_HFS_MFD, offsetof(struct dpll, dp_hfs_mfd)); DEFINE(PLL_DP_HFS_MFN, offsetof(struct dpll, dp_hfs_mfn)); #endif -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) DEFINE(CCM_CCR, offsetof(struct mxc_ccm_reg, ccr)); DEFINE(CCM_CCDR, offsetof(struct mxc_ccm_reg, ccdr)); DEFINE(CCM_CSR, offsetof(struct mxc_ccm_reg, csr)); diff --git a/configs/mx6ul_14x14_evk_defconfig b/configs/mx6ul_14x14_evk_defconfig index 29159a1bf7..c051243222 100644 --- a/configs/mx6ul_14x14_evk_defconfig +++ b/configs/mx6ul_14x14_evk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_MX6UL_14X14_EVK=y CONFIG_SPL=y -CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,MX6UL" +CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/imx-common/spl_sd.cfg,SOC_MX6UL" diff --git a/configs/tx28-40x1_defconfig b/configs/tx28-40x1_defconfig index 150b688490..451f207ef4 100644 --- a/configs/tx28-40x1_defconfig +++ b/configs/tx28-40x1_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT=y diff --git a/configs/tx28-40x1_noenv_defconfig b/configs/tx28-40x1_noenv_defconfig index 65a421b756..f268650052 100644 --- a/configs/tx28-40x1_noenv_defconfig +++ b/configs/tx28-40x1_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT_NOENV=y diff --git a/configs/tx28-40x2_defconfig b/configs/tx28-40x2_defconfig index 9eeefca52d..b82bfd9507 100644 --- a/configs/tx28-40x2_defconfig +++ b/configs/tx28-40x2_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT=y diff --git a/configs/tx28-40x2_noenv_defconfig b/configs/tx28-40x2_noenv_defconfig index 5136c51d4b..deef2c9356 100644 --- a/configs/tx28-40x2_noenv_defconfig +++ b/configs/tx28-40x2_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_256M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT_NOENV=y diff --git a/configs/tx28-40x3_defconfig b/configs/tx28-40x3_defconfig index d92c8e2734..da4e1324bd 100644 --- a/configs/tx28-40x3_defconfig +++ b/configs/tx28-40x3_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT=y diff --git a/configs/tx28-40x3_noenv_defconfig b/configs/tx28-40x3_noenv_defconfig index 29a4f1098f..d4c293a975 100644 --- a/configs/tx28-40x3_noenv_defconfig +++ b/configs/tx28-40x3_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_128M,SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_40X1=y CONFIG_TX28_UBOOT_NOENV=y diff --git a/configs/tx28-41x0_defconfig b/configs/tx28-41x0_defconfig index a4da654f49..118a6e0de5 100644 --- a/configs/tx28-41x0_defconfig +++ b/configs/tx28-41x0_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_41X0=y CONFIG_TX28_UBOOT=y diff --git a/configs/tx28-41x0_noenv_defconfig b/configs/tx28-41x0_noenv_defconfig index 79d642d5de..3dc07657d1 100644 --- a/configs/tx28-41x0_noenv_defconfig +++ b/configs/tx28-41x0_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="TX28_S,SYS_SDRAM_SIZE=SZ_64M" CONFIG_ARM=y +CONFIG_ARCH_MXS=y CONFIG_TARGET_TX28=y CONFIG_TARGET_TX28_41X0=y CONFIG_TX28_UBOOT_NOENV=y diff --git a/configs/tx51-8xx0_defconfig b/configs/tx51-8xx0_defconfig index 10e2091f16..e2e3eb2b56 100644 --- a/configs/tx51-8xx0_defconfig +++ b/configs/tx51-8xx0_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_CPU_CLK=800" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX51=y CONFIG_TARGET_TX51_8XX0=y CONFIG_TX51_UBOOT=y diff --git a/configs/tx51-8xx0_noenv_defconfig b/configs/tx51-8xx0_noenv_defconfig index efe981f6b5..66bd42ee20 100644 --- a/configs/tx51-8xx0_noenv_defconfig +++ b/configs/tx51-8xx0_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_CPU_CLK=800" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX51=y CONFIG_TARGET_TX51_8XX0=y CONFIG_TX51_UBOOT_NOENV=y diff --git a/configs/tx51-8xx1_2_defconfig b/configs/tx51-8xx1_2_defconfig index 9457ea47f8..bfe10ad9a3 100644 --- a/configs/tx51-8xx1_2_defconfig +++ b/configs/tx51-8xx1_2_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_CPU_CLK=800" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX51=y CONFIG_TARGET_TX51_8XX1_2=y CONFIG_TX51_UBOOT=y diff --git a/configs/tx51-8xx1_2_noenv_defconfig b/configs/tx51-8xx1_2_noenv_defconfig index 99fb36b19c..c56ec5c697 100644 --- a/configs/tx51-8xx1_2_noenv_defconfig +++ b/configs/tx51-8xx1_2_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_CPU_CLK=800" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX51=y CONFIG_TARGET_TX51_8XX1_2=y CONFIG_TX51_UBOOT_NOENV=y diff --git a/configs/tx53-1232_defconfig b/configs/tx53-1232_defconfig index d471f2814f..e28f289bb6 100644 --- a/configs/tx53-1232_defconfig +++ b/configs/tx53-1232_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_2G" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_1232=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-1232_noenv_defconfig b/configs/tx53-1232_noenv_defconfig index abbbe8bee2..cf8262891b 100644 --- a/configs/tx53-1232_noenv_defconfig +++ b/configs/tx53-1232_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_SIZE=SZ_2G" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_1232=y CONFIG_TX53_UBOOT_NOENV=y diff --git a/configs/tx53-1232_sec_defconfig b/configs/tx53-1232_sec_defconfig index 13139856a7..6bc6ffa049 100644 --- a/configs/tx53-1232_sec_defconfig +++ b/configs/tx53-1232_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_SIZE=SZ_2G" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_1232=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x030_defconfig b/configs/tx53-x030_defconfig index a93032ef77..024b0d21db 100644 --- a/configs/tx53-x030_defconfig +++ b/configs/tx53-x030_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X030=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x030_noenv_defconfig b/configs/tx53-x030_noenv_defconfig index 97b8179bb3..5454824179 100644 --- a/configs/tx53-x030_noenv_defconfig +++ b/configs/tx53-x030_noenv_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X030=y CONFIG_TX53_UBOOT_NOENV=y diff --git a/configs/tx53-x030_sec_defconfig b/configs/tx53-x030_sec_defconfig index b2d7580ffc..e41130104e 100644 --- a/configs/tx53-x030_sec_defconfig +++ b/configs/tx53-x030_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X030=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x130_defconfig b/configs/tx53-x130_defconfig index a9a276876b..2d4f7136eb 100644 --- a/configs/tx53-x130_defconfig +++ b/configs/tx53-x130_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X130=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x130_noenv_defconfig b/configs/tx53-x130_noenv_defconfig index 0d44afa4d0..409fca5084 100644 --- a/configs/tx53-x130_noenv_defconfig +++ b/configs/tx53-x130_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X130=y CONFIG_TX53_UBOOT_NOENV=y diff --git a/configs/tx53-x130_sec_defconfig b/configs/tx53-x130_sec_defconfig index f76a01f7a8..94bb7610cd 100644 --- a/configs/tx53-x130_sec_defconfig +++ b/configs/tx53-x130_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X130=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x131_defconfig b/configs/tx53-x131_defconfig index 1b8dfa26ce..7b7ac1ad54 100644 --- a/configs/tx53-x131_defconfig +++ b/configs/tx53-x131_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X131=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx53-x131_noenv_defconfig b/configs/tx53-x131_noenv_defconfig index 22db676750..8462c3906f 100644 --- a/configs/tx53-x131_noenv_defconfig +++ b/configs/tx53-x131_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X131=y CONFIG_TX53_UBOOT_NOENV=y diff --git a/configs/tx53-x131_sec_defconfig b/configs/tx53-x131_sec_defconfig index 9c920e2ee9..7514bcdac9 100644 --- a/configs/tx53-x131_sec_defconfig +++ b/configs/tx53-x131_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TX53=y CONFIG_TARGET_TX53_X131=y CONFIG_TX53_UBOOT=y diff --git a/configs/tx6q-1020_defconfig b/configs/tx6q-1020_defconfig index 6a236ef54a..cb762d7b47 100644 --- a/configs/tx6q-1020_defconfig +++ b/configs/tx6q-1020_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1020=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-1020_mfg_defconfig b/configs/tx6q-1020_mfg_defconfig index 8c031e997b..7ca7e98358 100644 --- a/configs/tx6q-1020_mfg_defconfig +++ b/configs/tx6q-1020_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1020=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6q-1020_noenv_defconfig b/configs/tx6q-1020_noenv_defconfig index 1a3d56018b..ef828a515e 100644 --- a/configs/tx6q-1020_noenv_defconfig +++ b/configs/tx6q-1020_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,TX6_REV=0x2" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1020=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6q-1020_sec_defconfig b/configs/tx6q-1020_sec_defconfig index 22f79409e9..bc643ede10 100644 --- a/configs/tx6q-1020_sec_defconfig +++ b/configs/tx6q-1020_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=4096,SECURE_BOOT,TX6_REV=0x2" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1020=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-1033_defconfig b/configs/tx6q-1033_defconfig index 48ff97ddc7..bdee073f41 100644 --- a/configs/tx6q-1033_defconfig +++ b/configs/tx6q-1033_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1033=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-1033_mfg_defconfig b/configs/tx6q-1033_mfg_defconfig index cc3ae3c986..e4bbf46038 100644 --- a/configs/tx6q-1033_mfg_defconfig +++ b/configs/tx6q-1033_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1033=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6q-1033_noenv_defconfig b/configs/tx6q-1033_noenv_defconfig index eb4eb30f84..82920de522 100644 --- a/configs/tx6q-1033_noenv_defconfig +++ b/configs/tx6q-1033_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1033=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6q-1033_sec_defconfig b/configs/tx6q-1033_sec_defconfig index b52c5b56e3..e0e9c5cd2b 100644 --- a/configs/tx6q-1033_sec_defconfig +++ b/configs/tx6q-1033_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_1033=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-10x0_defconfig b/configs/tx6q-10x0_defconfig index f0c76b3f93..eea31335de 100644 --- a/configs/tx6q-10x0_defconfig +++ b/configs/tx6q-10x0_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_10X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-10x0_mfg_defconfig b/configs/tx6q-10x0_mfg_defconfig index 6315aa113d..3e44d7fd45 100644 --- a/configs/tx6q-10x0_mfg_defconfig +++ b/configs/tx6q-10x0_mfg_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_10X0=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6q-10x0_noenv_defconfig b/configs/tx6q-10x0_noenv_defconfig index 7995c64496..22e6f0b07e 100644 --- a/configs/tx6q-10x0_noenv_defconfig +++ b/configs/tx6q-10x0_noenv_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_10X0=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6q-10x0_sec_defconfig b/configs/tx6q-10x0_sec_defconfig index b0e5233221..c3013fa704 100644 --- a/configs/tx6q-10x0_sec_defconfig +++ b/configs/tx6q-10x0_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_10X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-11x0_defconfig b/configs/tx6q-11x0_defconfig index 18479c6bac..b1bda302ad 100644 --- a/configs/tx6q-11x0_defconfig +++ b/configs/tx6q-11x0_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_11X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6q-11x0_mfg_defconfig b/configs/tx6q-11x0_mfg_defconfig index 15fdfd3484..31cc0290f0 100644 --- a/configs/tx6q-11x0_mfg_defconfig +++ b/configs/tx6q-11x0_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_11X0=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6q-11x0_noenv_defconfig b/configs/tx6q-11x0_noenv_defconfig index cf3b034d4c..0c7de7d044 100644 --- a/configs/tx6q-11x0_noenv_defconfig +++ b/configs/tx6q-11x0_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_11X0=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6q-11x0_sec_defconfig b/configs/tx6q-11x0_sec_defconfig index dc1ec3b9d2..3a3743aeb7 100644 --- a/configs/tx6q-11x0_sec_defconfig +++ b/configs/tx6q-11x0_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6Q_11X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6s-8034_defconfig b/configs/tx6s-8034_defconfig index a45cd33e39..a9cf013eef 100644 --- a/configs/tx6s-8034_defconfig +++ b/configs/tx6s-8034_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8034=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6s-8034_mfg_defconfig b/configs/tx6s-8034_mfg_defconfig index 77ef91328c..9911608ac1 100644 --- a/configs/tx6s-8034_mfg_defconfig +++ b/configs/tx6s-8034_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8034=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6s-8034_noenv_defconfig b/configs/tx6s-8034_noenv_defconfig index 766b4af504..70063605bf 100644 --- a/configs/tx6s-8034_noenv_defconfig +++ b/configs/tx6s-8034_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=16" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8034=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6s-8034_sec_defconfig b/configs/tx6s-8034_sec_defconfig index a8098c0c70..1805933be0 100644 --- a/configs/tx6s-8034_sec_defconfig +++ b/configs/tx6s-8034_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=16" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8034=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6s-8035_defconfig b/configs/tx6s-8035_defconfig index 6c313a2a4f..5b55780b22 100644 --- a/configs/tx6s-8035_defconfig +++ b/configs/tx6s-8035_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8035=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6s-8035_mfg_defconfig b/configs/tx6s-8035_mfg_defconfig index cd874f95f9..3221561896 100644 --- a/configs/tx6s-8035_mfg_defconfig +++ b/configs/tx6s-8035_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8035=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6s-8035_noenv_defconfig b/configs/tx6s-8035_noenv_defconfig index bd58824030..078ae7b802 100644 --- a/configs/tx6s-8035_noenv_defconfig +++ b/configs/tx6s-8035_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8035=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6s-8035_sec_defconfig b/configs/tx6s-8035_sec_defconfig index a1bb3a80a3..5defc23cfa 100644 --- a/configs/tx6s-8035_sec_defconfig +++ b/configs/tx6s-8035_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6S_8035=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8011_defconfig b/configs/tx6u-8011_defconfig index a922a7e6eb..11217b2600 100644 --- a/configs/tx6u-8011_defconfig +++ b/configs/tx6u-8011_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8011=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8011_mfg_defconfig b/configs/tx6u-8011_mfg_defconfig index b26766f8b2..1b60863b3f 100644 --- a/configs/tx6u-8011_mfg_defconfig +++ b/configs/tx6u-8011_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8011=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-8011_noenv_defconfig b/configs/tx6u-8011_noenv_defconfig index 5c7779d41e..be49108dc7 100644 --- a/configs/tx6u-8011_noenv_defconfig +++ b/configs/tx6u-8011_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8011=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-8011_sec_defconfig b/configs/tx6u-8011_sec_defconfig index 709b729b23..fe190794c6 100644 --- a/configs/tx6u-8011_sec_defconfig +++ b/configs/tx6u-8011_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8011=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8012_defconfig b/configs/tx6u-8012_defconfig index 1b9322a9c0..de6e445e1f 100644 --- a/configs/tx6u-8012_defconfig +++ b/configs/tx6u-8012_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8012=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8012_mfg_defconfig b/configs/tx6u-8012_mfg_defconfig index da16c311ea..9224387c7d 100644 --- a/configs/tx6u-8012_mfg_defconfig +++ b/configs/tx6u-8012_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8012=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-8012_noenv_defconfig b/configs/tx6u-8012_noenv_defconfig index 7660732380..d35078ae87 100644 --- a/configs/tx6u-8012_noenv_defconfig +++ b/configs/tx6u-8012_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8012=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-8012_sec_defconfig b/configs/tx6u-8012_sec_defconfig index e6ee2139fd..96672be5d8 100644 --- a/configs/tx6u-8012_sec_defconfig +++ b/configs/tx6u-8012_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_NAND_BLOCKS=2048" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8012=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8033_defconfig b/configs/tx6u-8033_defconfig index fe15be7bd0..3b3ee92269 100644 --- a/configs/tx6u-8033_defconfig +++ b/configs/tx6u-8033_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8033=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8033_mfg_defconfig b/configs/tx6u-8033_mfg_defconfig index 7ce1f10113..be28fe0ee8 100644 --- a/configs/tx6u-8033_mfg_defconfig +++ b/configs/tx6u-8033_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8033=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-8033_noenv_defconfig b/configs/tx6u-8033_noenv_defconfig index 313ca21bb5..69c274bb5d 100644 --- a/configs/tx6u-8033_noenv_defconfig +++ b/configs/tx6u-8033_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8033=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-8033_sec_defconfig b/configs/tx6u-8033_sec_defconfig index 34c29423b4..5e0a70a092 100644 --- a/configs/tx6u-8033_sec_defconfig +++ b/configs/tx6u-8033_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="MMC_BOOT_SIZE=1024,SECURE_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8033=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-80x0_defconfig b/configs/tx6u-80x0_defconfig index 844d295199..c3e7ab4a4e 100644 --- a/configs/tx6u-80x0_defconfig +++ b/configs/tx6u-80x0_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_80X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-80x0_mfg_defconfig b/configs/tx6u-80x0_mfg_defconfig index c05ccb431f..251f242ab2 100644 --- a/configs/tx6u-80x0_mfg_defconfig +++ b/configs/tx6u-80x0_mfg_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_80X0=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-80x0_noenv_defconfig b/configs/tx6u-80x0_noenv_defconfig index 4a43e3ce22..aa5a725e2e 100644 --- a/configs/tx6u-80x0_noenv_defconfig +++ b/configs/tx6u-80x0_noenv_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_80X0=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-80x0_sec_defconfig b/configs/tx6u-80x0_sec_defconfig index 6ba0144ed7..649bb67ef1 100644 --- a/configs/tx6u-80x0_sec_defconfig +++ b/configs/tx6u-80x0_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_80X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8111_defconfig b/configs/tx6u-8111_defconfig index 61874b3ea8..4d67cd9c94 100644 --- a/configs/tx6u-8111_defconfig +++ b/configs/tx6u-8111_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8111=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-8111_mfg_defconfig b/configs/tx6u-8111_mfg_defconfig index 8bfab00ae4..00eb2841f3 100644 --- a/configs/tx6u-8111_mfg_defconfig +++ b/configs/tx6u-8111_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8111=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-8111_noenv_defconfig b/configs/tx6u-8111_noenv_defconfig index 90e8931969..26637553ee 100644 --- a/configs/tx6u-8111_noenv_defconfig +++ b/configs/tx6u-8111_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_SDRAM_BUS_WIDTH=32,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8111=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-8111_sec_defconfig b/configs/tx6u-8111_sec_defconfig index 731155401a..29f827210f 100644 --- a/configs/tx6u-8111_sec_defconfig +++ b/configs/tx6u-8111_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF,SYS_SDRAM_BUS_WIDTH=32" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_8111=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-81x0_defconfig b/configs/tx6u-81x0_defconfig index ce30a31639..208900ec4f 100644 --- a/configs/tx6u-81x0_defconfig +++ b/configs/tx6u-81x0_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_81X0=y CONFIG_TX6_UBOOT=y diff --git a/configs/tx6u-81x0_mfg_defconfig b/configs/tx6u-81x0_mfg_defconfig index 44180dcd0b..95d47e6450 100644 --- a/configs/tx6u-81x0_mfg_defconfig +++ b/configs/tx6u-81x0_mfg_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_81X0=y CONFIG_TX6_UBOOT_MFG=y diff --git a/configs/tx6u-81x0_noenv_defconfig b/configs/tx6u-81x0_noenv_defconfig index fd87053e1a..062566709d 100644 --- a/configs/tx6u-81x0_noenv_defconfig +++ b/configs/tx6u-81x0_noenv_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_81X0=y CONFIG_TX6_UBOOT_NOENV=y diff --git a/configs/tx6u-81x0_sec_defconfig b/configs/tx6u-81x0_sec_defconfig index 518019628b..bc34f3a56e 100644 --- a/configs/tx6u-81x0_sec_defconfig +++ b/configs/tx6u-81x0_sec_defconfig @@ -1,5 +1,6 @@ CONFIG_SYS_EXTRA_OPTIONS="SECURE_BOOT,SYS_LVDS_IF" CONFIG_ARM=y +CONFIG_ARCH_MX6=y CONFIG_TARGET_TX6=y CONFIG_TARGET_TX6U_81X0=y CONFIG_TX6_UBOOT=y diff --git a/drivers/block/dwc_ahsata.c b/drivers/block/dwc_ahsata.c index 5dae4c52e3..d155be5bf5 100644 --- a/drivers/block/dwc_ahsata.c +++ b/drivers/block/dwc_ahsata.c @@ -562,7 +562,7 @@ int init_sata(int dev) u32 linkmap; struct ahci_probe_ent *probe_ent = NULL; -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) if (!is_cpu_type(MXC_CPU_MX6Q) && !is_cpu_type(MXC_CPU_MX6D)) return 1; #endif diff --git a/drivers/dma/Kconfig b/drivers/dma/Kconfig index 7c6f2f4b00..fde909063f 100644 --- a/drivers/dma/Kconfig +++ b/drivers/dma/Kconfig @@ -1,6 +1,6 @@ config APBH_DMA bool "Freescale MXS and i.MX6 APBH DMA support" - depends on SOC_MX28 || SOC_MX6 + depends on ARCH_MXS || ARCH_MX6 config APBH_DMA_BURST bool "Enable DMA burst mode" diff --git a/drivers/dma/apbh_dma.c b/drivers/dma/apbh_dma.c index 4c5732e76e..02f994fc93 100644 --- a/drivers/dma/apbh_dma.c +++ b/drivers/dma/apbh_dma.c @@ -213,7 +213,7 @@ static int mxs_dma_reset(int channel) #if defined(CONFIG_SOC_MX23) uint32_t *setreg = &apbh_regs->hw_apbh_ctrl0_set; uint32_t offset = APBH_CTRL0_RESET_CHANNEL_OFFSET; -#elif (defined(CONFIG_SOC_MX28) || defined(CONFIG_SOC_MX6)) +#elif (defined(CONFIG_SOC_MX28) || defined(CONFIG_ARCH_MX6)) uint32_t *setreg = &apbh_regs->hw_apbh_channel_ctrl_set; uint32_t offset = APBH_CHANNEL_CTRL_RESET_CHANNEL_OFFSET; #endif diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 23568d56ba..38f0a6bffb 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -40,16 +40,16 @@ static unsigned long gpio_ports[] = { [1] = GPIO2_BASE_ADDR, [2] = GPIO3_BASE_ADDR, #if defined(CONFIG_SOC_MX25) || defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX51) || \ - defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) + defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) [3] = GPIO4_BASE_ADDR, #endif -#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) [4] = GPIO5_BASE_ADDR, #ifndef CONFIG_SOX_MX6UL [5] = GPIO6_BASE_ADDR, #endif #endif -#if defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) #ifndef CONFIG_SOC_MX6UL [6] = GPIO7_BASE_ADDR, #endif @@ -360,14 +360,14 @@ 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_SOC_MX25) || defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX51) || \ - defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) + defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { 3, (struct gpio_regs *)GPIO4_BASE_ADDR }, #endif -#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { 4, (struct gpio_regs *)GPIO5_BASE_ADDR }, { 5, (struct gpio_regs *)GPIO6_BASE_ADDR }, #endif -#if defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { 6, (struct gpio_regs *)GPIO7_BASE_ADDR }, #endif }; @@ -377,14 +377,14 @@ U_BOOT_DEVICES(mxc_gpios) = { { "gpio_mxc", &mxc_plat[1] }, { "gpio_mxc", &mxc_plat[2] }, #if defined(CONFIG_SOC_MX25) || defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX51) || \ - defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) + defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { "gpio_mxc", &mxc_plat[3] }, #endif -#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX27) || defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { "gpio_mxc", &mxc_plat[4] }, { "gpio_mxc", &mxc_plat[5] }, #endif -#if defined(CONFIG_SOC_MX53) || defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SOC_MX53) || defined(CONFIG_ARCH_MX6) { "gpio_mxc", &mxc_plat[6] }, #endif }; diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig index 00fbc2e2ff..c2a8be5581 100644 --- a/drivers/misc/Kconfig +++ b/drivers/misc/Kconfig @@ -69,11 +69,11 @@ config FSL_SEC_MON config MXC_OCOTP bool "Freescale OCOTP support" - depends on SOC_MX5 || SOC_MX6 + depends on ARCH_MX5 || ARCH_MX6 config MXS_OCOTP bool "Freescale OCOTP support" - depends on SOC_MXS + depends on ARCH_MXS config PCA9551_LED bool "Enable PCA9551 LED driver" diff --git a/drivers/mmc/Kconfig b/drivers/mmc/Kconfig index d559e90294..b6a1103974 100644 --- a/drivers/mmc/Kconfig +++ b/drivers/mmc/Kconfig @@ -28,11 +28,11 @@ config FSL_ESDHC config FSL_USDHC bool "Support USDHC" - depends on FSL_ESDHC && SOC_MX6 + depends on FSL_ESDHC && ARCH_MX6 config MXS_MMC bool "i.MXS MMC/SDHC controller" - depends on SOC_MXS || SOC_MX6 + depends on ARCH_MXS || ARCH_MX6 select GENERIC_MMC select BOUNCE_BUFFER diff --git a/drivers/mtd/nand/Kconfig b/drivers/mtd/nand/Kconfig index 9f68de3b6d..2ef3426d02 100644 --- a/drivers/mtd/nand/Kconfig +++ b/drivers/mtd/nand/Kconfig @@ -136,7 +136,7 @@ config NAND_MXS config NAND_MXS_NO_BBM_SWAP bool "disable bad block mark swapping" - depends on NAND_MXS && SOC_MX6 + depends on NAND_MXS && ARCH_MX6 select SYS_NAND_USE_FLASH_BBT endif diff --git a/drivers/mtd/nand/mxs_nand.c b/drivers/mtd/nand/mxs_nand.c index 3fdcebd5d9..4381780223 100644 --- a/drivers/mtd/nand/mxs_nand.c +++ b/drivers/mtd/nand/mxs_nand.c @@ -31,7 +31,7 @@ #define MXS_NAND_DMA_DESCRIPTOR_COUNT 4 #define MXS_NAND_CHUNK_DATA_CHUNK_SIZE 512 -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) #define MXS_NAND_CHUNK_DATA_CHUNK_SIZE_SHIFT 2 #else #define MXS_NAND_CHUNK_DATA_CHUNK_SIZE_SHIFT 0 diff --git a/drivers/usb/host/ehci-mx6.c b/drivers/usb/host/ehci-mx6.c index 8933a6f47c..2b8944ad6e 100644 --- a/drivers/usb/host/ehci-mx6.c +++ b/drivers/usb/host/ehci-mx6.c @@ -56,7 +56,7 @@ #define UCMD_RUN_STOP (1 << 0) /* controller run/stop */ #define UCMD_RESET (1 << 1) /* controller reset */ -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) static const unsigned phy_bases[] = { USB_PHY0_BASE_ADDR, USB_PHY1_BASE_ADDR, @@ -253,7 +253,7 @@ int usb_phy_mode(int port) static void usb_oc_config(int index) { -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) struct usbnc_regs *usbnc = (struct usbnc_regs *)(USB_BASE_ADDR + USB_OTHERREGS_OFFSET); void __iomem *ctrl = (void __iomem *)(&usbnc->ctrl[index]); @@ -270,7 +270,7 @@ static void usb_oc_config(int index) setbits_le32(ctrl, UCTRL_OVER_CUR_POL); #endif -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) setbits_le32(ctrl, UCTRL_OVER_CUR_DIS); #elif defined(CONFIG_SOC_MX7) setbits_le32(ctrl, UCTRL_OVER_CUR_DIS | UCTRL_PM); @@ -327,7 +327,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, struct ehci_hccr **hccr, struct ehci_hcor **hcor) { enum usb_init_type type; -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) u32 controller_spacing = 0x200; #elif defined(CONFIG_SOC_MX7) u32 controller_spacing = 0x10000; @@ -346,7 +346,7 @@ int ehci_hcd_init(int index, enum usb_init_type init, usb_power_config(index); usb_oc_config(index); -#if defined(CONFIG_SOC_MX6) +#if defined(CONFIG_ARCH_MX6) usb_internal_phy_clock_gate(index, 1); usb_phy_enable(index, ehci); #endif diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 83bdddc28d..80adf845e4 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -1,7 +1,7 @@ config HW_WATCHDOG bool "Generic SoC specific watchdog support" - depends on !SOC_MX6 + depends on !ARCH_MX6 config IMX_WATCHDOG bool "Freescale i.MX watchdog support" - depends on SOC_MX31 || SOC_MX35 || SOC_MX5 || SOC_MX6 || SOC_VF610 || SOC_LS102XA + depends on SOC_MX31 || SOC_MX35 || ARCH_MX5 || ARCH_MX6 || SOC_VF610 || SOC_LS102XA diff --git a/include/fsl_sec.h b/include/fsl_sec.h index 800bd0ae65..22ed1aa30f 100644 --- a/include/fsl_sec.h +++ b/include/fsl_sec.h @@ -147,7 +147,7 @@ typedef struct ccsr_sec { #define CONFIG_JRSTARTR_JR0 0x00000001 struct jr_regs { -#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_ARCH_MX6) u32 irba_l; u32 irba_h; #else @@ -160,7 +160,7 @@ struct jr_regs { u32 irsa; u32 rsvd3; u32 irja; -#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_ARCH_MX6) u32 orba_l; u32 orba_h; #else @@ -192,7 +192,7 @@ struct jr_regs { * related information */ struct sg_entry { -#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_SOC_MX6) +#if defined(CONFIG_SYS_FSL_SEC_LE) && !defined(CONFIG_ARCH_MX6) uint32_t addr_lo; /* Memory Address - lo */ uint16_t addr_hi; /* Memory Address of start of buffer - hi */ uint16_t reserved_zero; @@ -213,7 +213,7 @@ struct sg_entry { #define SG_ENTRY_OFFSET_SHIFT 0 }; -#ifdef CONFIG_SOC_MX6 +#ifdef CONFIG_ARCH_MX6 /* CAAM Job Ring 0 Registers */ /* Secure Memory Partition Owner register */ #define SMCSJR_PO (3 << 6)