move defines, which are already moved to Kconfig
out of board config.
Signed-off-by: Heiko Schocher <[email protected]>
---
arch/arm/mach-imx/mx6/Kconfig | 9 +++++++
board/aristainetos/Kconfig | 15 ++++++++++-
board/aristainetos/common/Kconfig | 38 +++++++++++++++++++++++++++
configs/aristainetos2_defconfig | 11 +++++---
configs/aristainetos2b_defconfig | 2 +-
include/configs/aristainetos-common.h | 10 -------
include/configs/aristainetos2.h | 4 ---
include/configs/aristainetos2b.h | 4 ---
8 files changed, 69 insertions(+), 24 deletions(-)
create mode 100644 board/aristainetos/common/Kconfig
diff --git a/arch/arm/mach-imx/mx6/Kconfig b/arch/arm/mach-imx/mx6/Kconfig
index 6c1a1120d8..90dc31a8dc 100644
--- a/arch/arm/mach-imx/mx6/Kconfig
+++ b/arch/arm/mach-imx/mx6/Kconfig
@@ -128,10 +128,19 @@ config TARGET_APALIS_IMX6
config TARGET_ARISTAINETOS2
bool "aristainetos2"
select BOARD_LATE_INIT
+ select MX6DL
+ select SYS_I2C_MXC
+ select MXC_UART
+ select FEC_MXC
+ imply CMD_SATA
config TARGET_ARISTAINETOS2B
bool "Support aristainetos2-revB"
select BOARD_LATE_INIT
+ select MX6DL
+ select SYS_I2C_MXC
+ select MXC_UART
+ select FEC_MXC
config TARGET_CGTQMX6EVAL
bool "cgtqmx6eval"
diff --git a/board/aristainetos/Kconfig b/board/aristainetos/Kconfig
index 0341bdfb28..60ad69fa5b 100644
--- a/board/aristainetos/Kconfig
+++ b/board/aristainetos/Kconfig
@@ -1,19 +1,32 @@
if TARGET_ARISTAINETOS2
+source "board/aristainetos/common/Kconfig"
+
config SYS_BOARD
default "aristainetos"
-config SYS_CONFIG_NAME
+config SYS_BOARD_VERSION
+ default 2
+
+config BOARDNAME
default "aristainetos2"
endif
if TARGET_ARISTAINETOS2B
+source "board/aristainetos/common/Kconfig"
+
config SYS_BOARD
default "aristainetos"
config SYS_CONFIG_NAME
default "aristainetos2b"
+config SYS_BOARD_VERSION
+ default 3
+
+config BOARDNAME
+ default "aristainetos2-revB"
+
endif
diff --git a/board/aristainetos/common/Kconfig
b/board/aristainetos/common/Kconfig
new file mode 100644
index 0000000000..53a3f4d552
--- /dev/null
+++ b/board/aristainetos/common/Kconfig
@@ -0,0 +1,38 @@
+config BOARDNAME
+ string "name of the board"
+ help
+ set the name of the board.
+
+config SYS_BOARD_VERSION
+ int "select version of aristainetos board"
+ help
+ version of aristainetos board version
+ 2 version 2
+ 3 version 2b
+
+config SYS_I2C_MXC_I2C1
+ default y
+
+config SYS_I2C_MXC_I2C2
+ default y
+
+config SYS_I2C_MXC_I2C3
+ default y
+
+config SYS_I2C_MXC_I2C4
+ default y
+
+config SYS_MALLOC_LEN
+ default 0x4000000
+
+config ENV_SIZE
+ default 0x3000
+
+config ENV_SECT_SIZE
+ default 0x10000
+
+config ENV_OFFSET
+ default 0xd0000
+
+config SYS_CONFIG_NAME
+ default "aristainetos2"
diff --git a/configs/aristainetos2_defconfig b/configs/aristainetos2_defconfig
index 0c8958d57b..48e58e5be2 100644
--- a/configs/aristainetos2_defconfig
+++ b/configs/aristainetos2_defconfig
@@ -7,7 +7,7 @@ CONFIG_ENV_OFFSET=0xD0000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
@@ -17,12 +17,16 @@ CONFIG_BOUNCE_BUFFER=y
CONFIG_BOARD_EARLY_INIT_F=y
CONFIG_HUSH_PARSER=y
CONFIG_CMD_BOOTZ=y
+# CONFIG_BOOTM_NETBSD is not set
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
# CONFIG_CMD_FLASH is not set
CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y
CONFIG_CMD_MMC=y
CONFIG_CMD_NAND_TRIMFFS=y
-CONFIG_CMD_SF=y
+# CONFIG_CMD_SATA is not set
CONFIG_CMD_USB=y
CONFIG_CMD_DHCP=y
CONFIG_CMD_MII=y
@@ -44,7 +48,6 @@ CONFIG_SYS_RELOC_GD_ENV_ADDR=y
CONFIG_FSL_USDHC=y
CONFIG_NAND=y
CONFIG_NAND_MXS=y
-CONFIG_SPI_FLASH=y
CONFIG_SF_DEFAULT_BUS=3
CONFIG_SF_DEFAULT_CS=1
CONFIG_SF_DEFAULT_MODE=0
@@ -66,4 +69,4 @@ CONFIG_VIDEO_IPUV3=y
CONFIG_VIDEO=y
# CONFIG_VIDEO_SW_CURSOR is not set
CONFIG_IMX_WATCHDOG=y
-CONFIG_OF_LIBFDT=y
+# CONFIG_EFI_LOADER is not set
diff --git a/configs/aristainetos2b_defconfig b/configs/aristainetos2b_defconfig
index c387009465..d64691df49 100644
--- a/configs/aristainetos2b_defconfig
+++ b/configs/aristainetos2b_defconfig
@@ -7,7 +7,7 @@ CONFIG_ENV_OFFSET=0xD0000
CONFIG_NR_DRAM_BANKS=1
CONFIG_ENV_SECT_SIZE=0x10000
CONFIG_FIT=y
-CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg,MX6DL"
+CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=board/aristainetos/aristainetos2.cfg"
CONFIG_BOOTDELAY=3
# CONFIG_CONSOLE_MUX is not set
CONFIG_SYS_CONSOLE_IS_IN_ENV=y
diff --git a/include/configs/aristainetos-common.h
b/include/configs/aristainetos-common.h
index 1d84db5098..ab14a1a392 100644
--- a/include/configs/aristainetos-common.h
+++ b/include/configs/aristainetos-common.h
@@ -17,15 +17,9 @@
#define CONFIG_MACH_TYPE 4501
#define CONFIG_MMCROOT "/dev/mmcblk0p1"
-/* Size of malloc() pool */
-#define CONFIG_SYS_MALLOC_LEN (64 * SZ_1M)
-
-#define CONFIG_MXC_UART
-
/* MMC Configs */
#define CONFIG_SYS_FSL_ESDHC_ADDR 0
-#define CONFIG_FEC_MXC
#define IMX_FEC_BASE ENET_BASE_ADDR
#define CONFIG_ETHPRIME "FEC"
#define CONFIG_FEC_MXC_PHYADDR 0
@@ -151,10 +145,6 @@
/* I2C */
#define CONFIG_SYS_I2C
-#define CONFIG_SYS_I2C_MXC
-#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */
-#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */
-#define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */
#define CONFIG_SYS_I2C_SPEED 100000
#define CONFIG_SYS_I2C_SLAVE 0x7f
#define CONFIG_SYS_I2C_NOPROBES { {0, 0x00} }
diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h
index d8858559d8..01998f0295 100644
--- a/include/configs/aristainetos2.h
+++ b/include/configs/aristainetos2.h
@@ -11,9 +11,7 @@
#ifndef __ARISTAINETOS2_CONFIG_H
#define __ARISTAINETOS2_CONFIG_H
-#define CONFIG_SYS_BOARD_VERSION 2
#define CONFIG_HOSTNAME "aristainetos2"
-#define CONFIG_BOARDNAME "aristainetos2"
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
@@ -33,8 +31,6 @@
"ubifsload ${fit_addr_r} /boot/system.itb; " \
"imi ${fit_addr_r}\0 "
-#define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */
-
#define ARISTAINETOS_USB_OTG_PWR IMX_GPIO_NR(4, 15)
#define ARISTAINETOS_USB_H1_PWR IMX_GPIO_NR(1, 0)
#define CONFIG_GPIO_ENABLE_SPI_FLASH IMX_GPIO_NR(2, 15)
diff --git a/include/configs/aristainetos2b.h b/include/configs/aristainetos2b.h
index cdeb7a3b03..a7ba48e315 100644
--- a/include/configs/aristainetos2b.h
+++ b/include/configs/aristainetos2b.h
@@ -11,9 +11,7 @@
#ifndef __ARISTAINETOS2B_CONFIG_H
#define __ARISTAINETOS2B_CONFIG_H
-#define CONFIG_SYS_BOARD_VERSION 3
#define CONFIG_HOSTNAME "aristainetos2"
-#define CONFIG_BOARDNAME "aristainetos2-revB"
#define CONFIG_MXC_UART_BASE UART2_BASE
#define CONSOLE_DEV "ttymxc1"
@@ -33,8 +31,6 @@
"ubifsload ${fit_addr_r} /boot/system.itb; " \
"imi ${fit_addr_r}\0 " \
-#define CONFIG_SYS_I2C_MXC_I2C4 /* enable I2C bus 4 */
-
#define ARISTAINETOS_USB_OTG_PWR IMX_GPIO_NR(4, 15)
#define ARISTAINETOS_USB_H1_PWR IMX_GPIO_NR(1, 0)
#define CONFIG_GPIO_ENABLE_SPI_FLASH IMX_GPIO_NR(2, 15)
--
2.21.0
_______________________________________________
U-Boot mailing list
[email protected]
https://lists.denx.de/listinfo/u-boot
