Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

arm: imx: mx28: Move MX28 selection to Kconfig

Browse Source 
The motivation for moving MX28 selection to Kconfig is to be able
to better handle NAND MXS selection through Kconfig.

This selection method also aligns with the way other i.MX SoCs are
selected in U-Boot.

Signed-off-by: Stefan Agner <stefan.agner@toradex.com>
master
Stefan Agner 6 years ago committed by Tom Rini
parent c5343d4e11
commit 25c5b4e1bf
18 changed files with 67 additions and 63 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 49
      arch/arm/Kconfig
  2. 43
      arch/arm/mach-imx/mxs/Kconfig
  3. 3
      configs/apx4devkit_defconfig
  4. 3
      configs/bg0900_defconfig
  5. 3
      configs/m28evk_defconfig
  6. 3
      configs/mx28evk_auart_console_defconfig
  7. 3
      configs/mx28evk_defconfig
  8. 3
      configs/mx28evk_nand_defconfig
  9. 3
      configs/mx28evk_spi_defconfig
  10. 3
      configs/sc_sps_1_defconfig
  11. 3
      configs/ts4600_defconfig
  12. 1
      include/configs/apx4devkit.h
  13. 3
      include/configs/bg0900.h
  14. 1
      include/configs/m28evk.h
  15. 1
      include/configs/mx28evk.h
  16. 1
      include/configs/sc_sps_1.h
  17. 3
      include/configs/ts4600.h
  18. 1
      scripts/config_whitelist.txt

49
arch/arm/Kconfig
Unescape View File

@ -396,37 +396,6 @@ config TARGET_APF27
select CPU_ARM926EJS
select SUPPORT_SPL
config TARGET_APX4DEVKIT
bool "Support apx4devkit"
select CPU_ARM926EJS
select SUPPORT_SPL
select PL011_SERIAL
config TARGET_M28EVK
bool "Support m28evk"
select CPU_ARM926EJS
select SUPPORT_SPL
select PL011_SERIAL
config TARGET_MX28EVK
bool "Support mx28evk"
select CPU_ARM926EJS
select SUPPORT_SPL
select BOARD_EARLY_INIT_F
select PL011_SERIAL
config TARGET_BG0900
bool "Support bg0900"
select CPU_ARM926EJS
select SUPPORT_SPL
select PL011_SERIAL
config TARGET_SC_SPS_1
bool "Support sc_sps_1"
select CPU_ARM926EJS
select SUPPORT_SPL
select PL011_SERIAL
config ORION5X
bool "Marvell Orion"
select CPU_ARM926EJS
@ -651,6 +620,12 @@ config ARCH_MX25
select CPU_ARM926EJS
imply MXC_GPIO
config ARCH_MX28
bool "NXP i.MX28 family"
select CPU_ARM926EJS
select PL011_SERIAL
select SUPPORT_SPL
config ARCH_MX7ULP
bool "NXP MX7ULP"
select CPU_V7
@ -772,12 +747,6 @@ config ARCH_SUNXI
imply SPL_SERIAL_SUPPORT
imply USB_GADGET
config TARGET_TS4600
bool "Support TS4600"
select CPU_ARM926EJS
select SUPPORT_SPL
select PL011_SERIAL
config ARCH_VF610
bool "Freescale Vybrid"
select CPU_V7
@ -1299,7 +1268,6 @@ source "arch/arm/cpu/armv8/Kconfig"
source "arch/arm/mach-imx/Kconfig"
source "board/aries/m28evk/Kconfig"
source "board/bosch/shc/Kconfig"
source "board/CarMediaLab/flea3/Kconfig"
source "board/Marvell/aspenite/Kconfig"
@ -1307,7 +1275,6 @@ source "board/Marvell/gplugd/Kconfig"
source "board/armadeus/apf27/Kconfig"
source "board/armltd/vexpress/Kconfig"
source "board/armltd/vexpress64/Kconfig"
source "board/bluegiga/apx4devkit/Kconfig"
source "board/broadcom/bcm23550_w1d/Kconfig"
source "board/broadcom/bcm28155_ap/Kconfig"
source "board/broadcom/bcmcygnus/Kconfig"
@ -1330,7 +1297,6 @@ source "board/freescale/ls1046ardb/Kconfig"
source "board/freescale/ls1012aqds/Kconfig"
source "board/freescale/ls1012ardb/Kconfig"
source "board/freescale/ls1012afrdm/Kconfig"
source "board/freescale/mx28evk/Kconfig"
source "board/freescale/mx31ads/Kconfig"
source "board/freescale/mx31pdk/Kconfig"
source "board/freescale/mx35pdk/Kconfig"
@ -1344,8 +1310,6 @@ source "board/hisilicon/poplar/Kconfig"
source "board/imx31_phycore/Kconfig"
source "board/isee/igep003x/Kconfig"
source "board/phytec/pcm051/Kconfig"
source "board/ppcag/bg0900/Kconfig"
source "board/schulercontrol/sc_sps_1/Kconfig"
source "board/silica/pengwyn/Kconfig"
source "board/spear/spear300/Kconfig"
source "board/spear/spear310/Kconfig"
@ -1357,7 +1321,6 @@ source "board/tcl/sl50/Kconfig"
source "board/birdland/bav335x/Kconfig"
source "board/timll/devkit3250/Kconfig"
source "board/toradex/colibri_pxa270/Kconfig"
source "board/technologic/ts4600/Kconfig"
source "board/vscom/baltos/Kconfig"
source "board/woodburn/Kconfig"
source "board/work-microwave/work_92105/Kconfig"

43
arch/arm/mach-imx/mxs/Kconfig
Unescape View File

@ -33,3 +33,46 @@ source "board/sandisk/sansa_fuze_plus/Kconfig"
source "board/creative/xfi3/Kconfig"
endif
if ARCH_MX28
config MX28
bool
default y
choice
prompt "MX28 board select"
optional
config TARGET_APX4DEVKIT
bool "Support apx4devkit"
config TARGET_BG0900
bool "Support bg0900"
config TARGET_M28EVK
bool "Support m28evk"
config TARGET_MX28EVK
bool "Support mx28evk"
select BOARD_EARLY_INIT_F
config TARGET_SC_SPS_1
bool "Support sc_sps_1"
config TARGET_TS4600
bool "Support TS4600"
endchoice
config SYS_SOC
default "mxs"
source "board/aries/m28evk/Kconfig"
source "board/bluegiga/apx4devkit/Kconfig"
source "board/freescale/mx28evk/Kconfig"
source "board/ppcag/bg0900/Kconfig"
source "board/schulercontrol/sc_sps_1/Kconfig"
source "board/technologic/ts4600/Kconfig"
endif

3
configs/apx4devkit_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_APX4DEVKIT=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_APX4DEVKIT=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_BOOTDELAY=1
CONFIG_VERSION_VARIABLE=y

3
configs/bg0900_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_BG0900=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_BG0900=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y

3
configs/m28evk_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_M28EVK=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_M28EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_FIT=y
CONFIG_BOOTDELAY=3

3
configs/mx28evk_auart_console_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_SYS_EXTRA_OPTIONS="MXS_AUART,MXS_AUART_BASE=MXS_UARTAPP3_BASE"
# CONFIG_CONSOLE_MUX is not set

3
configs/mx28evk_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_FIT=y
# CONFIG_CONSOLE_MUX is not set

3
configs/mx28evk_nand_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y

3
configs/mx28evk_spi_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_MX28EVK=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_MX28EVK=y
CONFIG_SPL_SERIAL_SUPPORT=y
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y

3
configs/sc_sps_1_defconfig
Unescape View File

@ -1,8 +1,9 @@
CONFIG_ARM=y
CONFIG_TARGET_SC_SPS_1=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_SC_SPS_1=y
CONFIG_SPL_SERIAL_SUPPORT=y
CONFIG_BOOTDELAY=3
CONFIG_USE_BOOTARGS=y

3
configs/ts4600_defconfig
Unescape View File

@ -1,7 +1,8 @@
CONFIG_ARM=y
CONFIG_TARGET_TS4600=y
CONFIG_ARCH_MX28=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y
CONFIG_SPL_LIBGENERIC_SUPPORT=y
CONFIG_TARGET_TS4600=y
CONFIG_FIT=y
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
# CONFIG_DISPLAY_CPUINFO is not set

1
include/configs/apx4devkit.h
Unescape View File

@ -15,7 +15,6 @@
#define __CONFIGS_APX4DEVKIT_H__
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT
/* Memory configuration */

3
include/configs/bg0900.h
Unescape View File

@ -6,9 +6,6 @@
#ifndef __CONFIGS_BG0900_H__
#define __CONFIGS_BG0900_H__
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
/* Memory configuration */
#define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */
#define PHYS_SDRAM_1 0x40000000 /* Base address */

1
include/configs/m28evk.h
Unescape View File

@ -8,7 +8,6 @@
#define __CONFIGS_M28EVK_H__
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE MACH_TYPE_M28EVK
#define CONFIG_TIMESTAMP /* Print image info with timestamp */

1
include/configs/mx28evk.h
Unescape View File

@ -12,7 +12,6 @@
#define __CONFIGS_MX28EVK_H__
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK
/* Memory configuration */

1
include/configs/sc_sps_1.h
Unescape View File

@ -10,7 +10,6 @@
#define __CONFIGS_SC_SPS_1_H__
/* System configuration */
#define CONFIG_MX28 /* i.MX28 SoC */
#define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1
/* U-Boot Commands */

3
include/configs/ts4600.h
Unescape View File

@ -14,9 +14,6 @@
#ifndef __CONFIGS_TS4600_H__
#define __CONFIGS_TS4600_H__
/* System configurations */
#define CONFIG_MX28 /* i.MX28 SoC */
/* U-Boot Commands */
/* Memory configuration */

1
scripts/config_whitelist.txt
Unescape View File

@ -1414,7 +1414,6 @@ CONFIG_MX25_HCLK_FREQ
CONFIG_MX27
CONFIG_MX27_CLK32
CONFIG_MX27_TIMER_HIGH_PRECISION
CONFIG_MX28
CONFIG_MX28_FEC_MAC_IN_OCOTP
CONFIG_MX31
CONFIG_MX31_CLK32

Write Preview
Loading…
Cancel
Save