Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: Re-sync ARCH_MX5 / MX51 / MX53 CONFIG options

Browse source 
A few boards had not been fully re-synced with CONFIG_ARCH_MX5 / CONFIG_MX51 /
CONFIG_MX53 being in Kconfig.  Do so now.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2017-04-29 19:20:27 -04:00
parent 1e6776000e
commit 29ec685883
17 changed files with 51 additions and 65 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
arch/arm/Kconfig
View file

@ -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"

47
arch/arm/cpu/armv7/mx5/Kconfig
View file

@ -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

3
configs/m53evk_defconfig
View file

@ -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

1
configs/mx51evk_defconfig
View file

@ -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"

1
configs/mx53ard_defconfig
View file

@ -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

1
configs/mx53evk_defconfig
View file

@ -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

1
configs/mx53loco_defconfig
View file

@ -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"

1
configs/mx53smd_defconfig
View file

@ -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

2
configs/ts4800_defconfig
View file

@ -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

1
include/configs/m53evk.h
View file

@ -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>

2
include/configs/mx51evk.h
View file

@ -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

2
include/configs/mx53ard.h
View file

@ -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>

2
include/configs/mx53evk.h
View file

@ -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>

2
include/configs/mx53loco.h
View file

@ -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>

2
include/configs/mx53smd.h
View file

@ -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>

1
include/configs/ts4800.h
View file

@ -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 */

1
include/configs/usbarmory.h
View file

@ -11,7 +11,6 @@
#ifndef __CONFIG_H
#define __CONFIG_H
#define CONFIG_MX53
#define CONFIG_SYS_FSL_CLK
#define CONFIG_MXC_GPIO