GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-05 22:31:36 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mx31pdk: Convert CONFIG_MX31 flag to use Kconfig.

Browse source 
Move CONFIG_MX31 from mx31pdk.h to mx31pdk_defconfig and introduce
necessary Kconfig changes as well.

Signed-off-by: Magnus Lilja <lilja.magnus@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Magnus Lilja 2018-05-11 14:06:54 +02:00 • committed by Stefano Babic
parent 51a42bea52
commit 3159ec64f5
4 changed files with 28 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
arch/arm/Kconfig
View file

@ -497,13 +497,6 @@ config TARGET_X600
select SUPPORT_SPL select SUPPORT_SPL
select PL011_SERIAL select PL011_SERIAL
config TARGET_MX31PDK
bool "Support mx31pdk"
select BOARD_LATE_INIT
select CPU_ARM1136
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
config TARGET_WOODBURN config TARGET_WOODBURN
bool "Support woodburn" bool "Support woodburn"
select CPU_ARM1136 select CPU_ARM1136
@ -665,6 +658,10 @@ config ARCH_MX28
select PL011_SERIAL select PL011_SERIAL
select SUPPORT_SPL select SUPPORT_SPL
config ARCH_MX31
bool "NXP i.MX31 family"
select CPU_ARM1136
config ARCH_MX7ULP config ARCH_MX7ULP
bool "NXP MX7ULP" bool "NXP MX7ULP"
select CPU_V7A select CPU_V7A
@ -1305,6 +1302,8 @@ source "arch/arm/cpu/armv7/ls102xa/Kconfig"
source "arch/arm/mach-imx/mx2/Kconfig" source "arch/arm/mach-imx/mx2/Kconfig"
source "arch/arm/mach-imx/mx3/Kconfig"
source "arch/arm/mach-imx/mx5/Kconfig" source "arch/arm/mach-imx/mx5/Kconfig"
source "arch/arm/mach-imx/mx6/Kconfig" source "arch/arm/mach-imx/mx6/Kconfig"
@ -1392,7 +1391,6 @@ source "board/freescale/ls1046ardb/Kconfig"
source "board/freescale/ls1012aqds/Kconfig" source "board/freescale/ls1012aqds/Kconfig"
source "board/freescale/ls1012ardb/Kconfig" source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig" source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx31pdk/Kconfig"
source "board/freescale/mx35pdk/Kconfig" source "board/freescale/mx35pdk/Kconfig"
source "board/freescale/s32v234evb/Kconfig" source "board/freescale/s32v234evb/Kconfig"
source "board/gdsys/a38x/Kconfig" source "board/gdsys/a38x/Kconfig"

20
arch/arm/mach-imx/mx3/Kconfig Normal file
View file

@ -0,0 +1,20 @@
if ARCH_MX31
config MX31
bool
default y
choice
prompt "MX31 board select"
optional
config TARGET_MX31PDK
bool "Support the i.MX31 PDK board from Freescale/NXP"
select BOARD_LATE_INIT
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
endchoice
source "board/freescale/mx31pdk/Kconfig"
endif

3
configs/mx31pdk_defconfig
View file

@ -1,9 +1,10 @@
CONFIG_ARM=y CONFIG_ARM=y
# CONFIG_SPL_USE_ARCH_MEMCPY is not set # CONFIG_SPL_USE_ARCH_MEMCPY is not set
# CONFIG_SPL_USE_ARCH_MEMSET is not set # CONFIG_SPL_USE_ARCH_MEMSET is not set
CONFIG_TARGET_MX31PDK=y CONFIG_ARCH_MX31=y
CONFIG_SYS_TEXT_BASE=0x87e00000 CONFIG_SYS_TEXT_BASE=0x87e00000
CONFIG_SPL_LIBGENERIC_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX31PDK=y
CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SPL_NAND_SUPPORT=y CONFIG_SPL_NAND_SUPPORT=y
CONFIG_SPL=y CONFIG_SPL=y

2
include/configs/mx31pdk.h
View file

@ -16,8 +16,6 @@
#include <asm/arch/imx-regs.h> #include <asm/arch/imx-regs.h>
/* High Level Configuration Options */ /* High Level Configuration Options */
#define CONFIG_MX31 /* This is a mx31 */
#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG #define CONFIG_INITRD_TAG