diff options
| -rw-r--r-- | arch/arm/Kconfig | 46 | ||||
| -rw-r--r-- | arch/arm/cpu/armv7/mx5/Kconfig | 47 | ||||
| -rw-r--r-- | configs/m53evk_defconfig | 3 | ||||
| -rw-r--r-- | configs/mx51evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx53ard_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx53evk_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx53loco_defconfig | 1 | ||||
| -rw-r--r-- | configs/mx53smd_defconfig | 1 | ||||
| -rw-r--r-- | configs/ts4800_defconfig | 2 | ||||
| -rw-r--r-- | include/configs/m53evk.h | 1 | ||||
| -rw-r--r-- | include/configs/mx51evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx53ard.h | 2 | ||||
| -rw-r--r-- | include/configs/mx53evk.h | 2 | ||||
| -rw-r--r-- | include/configs/mx53loco.h | 2 | ||||
| -rw-r--r-- | include/configs/mx53smd.h | 2 | ||||
| -rw-r--r-- | include/configs/ts4800.h | 1 | ||||
| -rw-r--r-- | include/configs/usbarmory.h | 1 |
17 files changed, 51 insertions, 65 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 1df6b363ac..0b70c47407 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -584,40 +584,6 @@ config ARCH_MX5 select CPU_V7 select BOARD_EARLY_INIT_F -config TARGET_M53EVK - bool "Support m53evk" - select CPU_V7 - select SUPPORT_SPL - select BOARD_EARLY_INIT_F - -config TARGET_MX51EVK - bool "Support mx51evk" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53ARD - bool "Support mx53ard" - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53EVK - bool "Support mx53evk" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53LOCO - bool "Support mx53loco" - select BOARD_LATE_INIT - select CPU_V7 - select BOARD_EARLY_INIT_F - -config TARGET_MX53SMD - bool "Support mx53smd" - select CPU_V7 - select BOARD_EARLY_INIT_F - config ARCH_RMOBILE bool "Renesas ARM SoCs" select DM @@ -683,11 +649,6 @@ config TARGET_TS4600 select CPU_ARM926EJS select SUPPORT_SPL -config TARGET_TS4800 - bool "Support TS4800" - select CPU_V7 - select SYS_FSL_ERRATUM_ESDHC_A001 - config ARCH_VF610 bool "Freescale Vybrid" select CPU_V7 @@ -1098,7 +1059,6 @@ source "arch/arm/cpu/armv8/Kconfig" source "arch/arm/imx-common/Kconfig" source "board/aries/m28evk/Kconfig" -source "board/aries/m53evk/Kconfig" source "board/bosch/shc/Kconfig" source "board/CarMediaLab/flea3/Kconfig" source "board/Marvell/aspenite/Kconfig" @@ -1134,11 +1094,6 @@ source "board/freescale/mx28evk/Kconfig" source "board/freescale/mx31ads/Kconfig" source "board/freescale/mx31pdk/Kconfig" source "board/freescale/mx35pdk/Kconfig" -source "board/freescale/mx51evk/Kconfig" -source "board/freescale/mx53ard/Kconfig" -source "board/freescale/mx53evk/Kconfig" -source "board/freescale/mx53loco/Kconfig" -source "board/freescale/mx53smd/Kconfig" source "board/freescale/s32v234evb/Kconfig" source "board/gdsys/a38x/Kconfig" source "board/grinn/chiliboard/Kconfig" @@ -1166,7 +1121,6 @@ source "board/birdland/bav335x/Kconfig" source "board/timll/devkit3250/Kconfig" source "board/toradex/colibri_pxa270/Kconfig" source "board/technologic/ts4600/Kconfig" -source "board/technologic/ts4800/Kconfig" source "board/vscom/baltos/Kconfig" source "board/woodburn/Kconfig" source "board/work-microwave/work_92105/Kconfig" diff --git a/arch/arm/cpu/armv7/mx5/Kconfig b/arch/arm/cpu/armv7/mx5/Kconfig index 7b55747612..ef37c351d0 100644 --- a/arch/arm/cpu/armv7/mx5/Kconfig +++ b/arch/arm/cpu/armv7/mx5/Kconfig @@ -14,24 +14,63 @@ choice prompt "MX5 board select" optional -config TARGET_USBARMORY - bool "Support USB armory" - select CPU_V7 +config TARGET_M53EVK + bool "Support m53evk" + select MX53 + select SUPPORT_SPL + +config TARGET_MX51EVK + bool "Support mx51evk" + select BOARD_LATE_INIT + select MX51 + +config TARGET_MX53ARD + bool "Support mx53ard" + select MX53 config TARGET_MX53CX9020 bool "Support CX9020" select BOARD_LATE_INIT - select CPU_V7 select MX53 select DM select DM_SERIAL +config TARGET_MX53EVK + bool "Support mx53evk" + select BOARD_LATE_INIT + select MX53 + +config TARGET_MX53LOCO + bool "Support mx53loco" + select BOARD_LATE_INIT + select MX53 + +config TARGET_MX53SMD + bool "Support mx53smd" + select MX53 + +config TARGET_TS4800 + bool "Support TS4800" + select MX51 + select SYS_FSL_ERRATUM_ESDHC_A001 + +config TARGET_USBARMORY + bool "Support USB armory" + select MX53 + endchoice config SYS_SOC default "mx5" +source "board/aries/m53evk/Kconfig" source "board/beckhoff/mx53cx9020/Kconfig" +source "board/freescale/mx51evk/Kconfig" +source "board/freescale/mx53ard/Kconfig" +source "board/freescale/mx53evk/Kconfig" +source "board/freescale/mx53loco/Kconfig" +source "board/freescale/mx53smd/Kconfig" source "board/inversepath/usbarmory/Kconfig" +source "board/technologic/ts4800/Kconfig" endif diff --git a/configs/m53evk_defconfig b/configs/m53evk_defconfig index 4dff335ef5..74b1ae6eb8 100644 --- a/configs/m53evk_defconfig +++ b/configs/m53evk_defconfig @@ -1,8 +1,9 @@ CONFIG_ARM=y -CONFIG_TARGET_M53EVK=y +CONFIG_ARCH_MX5=y CONFIG_SPL_GPIO_SUPPORT=y CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y +CONFIG_TARGET_M53EVK=y CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y CONFIG_VIDEO=y diff --git a/configs/mx51evk_defconfig b/configs/mx51evk_defconfig index 9ac4b65f62..b385009c53 100644 --- a/configs/mx51evk_defconfig +++ b/configs/mx51evk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX51EVK=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx51evk/imximage.cfg" diff --git a/configs/mx53ard_defconfig b/configs/mx53ard_defconfig index 886296b152..51d3bfb6a4 100644 --- a/configs/mx53ard_defconfig +++ b/configs/mx53ard_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53ARD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53ard/imximage_dd3.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/mx53evk_defconfig b/configs/mx53evk_defconfig index 9a05a8bf8c..2c54942e83 100644 --- a/configs/mx53evk_defconfig +++ b/configs/mx53evk_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53EVK=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53evk/imximage.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/mx53loco_defconfig b/configs/mx53loco_defconfig index a7a481363e..5b62f03c08 100644 --- a/configs/mx53loco_defconfig +++ b/configs/mx53loco_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53LOCO=y CONFIG_VIDEO=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53loco/imximage.cfg" diff --git a/configs/mx53smd_defconfig b/configs/mx53smd_defconfig index 93b20d7044..95ca52eb21 100644 --- a/configs/mx53smd_defconfig +++ b/configs/mx53smd_defconfig @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_MX53SMD=y CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/freescale/mx53smd/imximage.cfg" CONFIG_BOOTDELAY=3 diff --git a/configs/ts4800_defconfig b/configs/ts4800_defconfig index 255eedfbc3..5a4bf2773e 100644 --- a/configs/ts4800_defconfig +++ b/configs/ts4800_defconfig @@ -1,7 +1,7 @@ CONFIG_ARM=y +CONFIG_ARCH_MX5=y CONFIG_TARGET_TS4800=y CONFIG_BOOTDELAY=1 -CONFIG_BOARD_EARLY_INIT_F=y CONFIG_HUSH_PARSER=y CONFIG_CMD_BOOTZ=y # CONFIG_CMD_IMLS is not set diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 275ecf36ca..02cd6353fb 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -8,7 +8,6 @@ #ifndef __M53EVK_CONFIG_H__ #define __M53EVK_CONFIG_H__ -#define CONFIG_MX53 #define CONFIG_MXC_GPIO #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 98c9f9bbf6..726d3c88f2 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -13,8 +13,6 @@ /* High Level Configuration Options */ -#define CONFIG_MX51 /* in a mx51 */ - #define CONFIG_SYS_FSL_CLK #define CONFIG_SYS_TEXT_BASE 0x97800000 diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 8612614437..aee6e70c39 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_ARD #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index b3519ae7e7..dc49e24f15 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_EVK #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index fed40eb58d..945be5835b 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -10,8 +10,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO #include <asm/arch/imx-regs.h> diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index e9d570e1d7..d064337f47 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -9,8 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 - #define CONFIG_MACH_TYPE MACH_TYPE_MX53_SMD #include <asm/arch/imx-regs.h> diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index a65c5f1c71..7bb8c87988 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -14,7 +14,6 @@ #define __CONFIG_H /* High Level Configuration Options */ -#define CONFIG_MX51 #define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is a 2nd stage bootloader */ diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index a67802a160..58b62d2448 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -11,7 +11,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MX53 #define CONFIG_SYS_FSL_CLK #define CONFIG_MXC_GPIO |