From: Lothar Waßmann <LW@KARO-electronics.de>
Date: Fri, 21 Aug 2015 14:44:37 +0000 (+0200)
Subject: karo: tx28: replace SETUP_IOMUX_PAD macro with mxs_iomux_setup_pad() call
X-Git-Tag: KARO-TX6-2015-09-18~4034^2~1^2~15
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=ccfcd119cbf9122b28ea69539c5346aabdb00471

karo: tx28: replace SETUP_IOMUX_PAD macro with mxs_iomux_setup_pad() call
---

diff --git a/board/karo/tx28/Kconfig b/board/karo/tx28/Kconfig
index 896ee62d1b..7c18a451e8 100644
--- a/board/karo/tx28/Kconfig
+++ b/board/karo/tx28/Kconfig
@@ -1,4 +1,4 @@
-if TARGET_TX28_40X1
+if TARGET_TX28
 
 config SYS_BOARD
 	default "tx28"
@@ -10,118 +10,65 @@ config SYS_SOC
 	default "mxs"
 
 config SYS_CONFIG_NAME
-	default "tx28-40x1"
-
-endif
-
-if TARGET_TX28_40X1_NOENV
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-40x1_noenv"
-
-endif
-
-if TARGET_TX28_40X2
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-40x2"
-
-endif
-
-if TARGET_TX28_40X2_NOENV
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-40x2_noenv"
-
-endif
-
-if TARGET_TX28_40X3
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-40x3"
-
-endif
-
-if TARGET_TX28_40X3_NOENV
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-40x3_noenv"
-
-endif
-
-if TARGET_TX28_41X0
-
-config SYS_BOARD
-	default "tx28"
-
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-41x0"
-
-endif
-
-if TARGET_TX28_41X0_NOENV
-
-config SYS_BOARD
 	default "tx28"
 
-config SYS_VENDOR
-	default "karo"
-
-config SYS_SOC
-	default "mxs"
-
-config SYS_CONFIG_NAME
-	default "tx28-41x0_noenv"
+config TX28
+	bool
+	default y
+	select SPL
+	select SOC_MX28
+	select APBH_DMA
+	select APBH_DMA_BURST
+	select APBH_DMA_BURST8
+	select CC_OPTIMIZE_LIBS_FOR_SPEED
+	select CMD_BMP if LCD
+	select CMD_NAND_TRIMFFS if CMD_NAND
+	select CMD_ROMUPDATE if !SPL_BUILD
+	select FDT_FIXUP_PARTITIONS if OF_LIBFDT
+	select GET_FEC_MAC_ADDR_FROM_IIM if FEC_MXC
+	select LIB_RAND
+	select MTD_PARTITIONS if CMD_NAND
+	select MTD_DEVICE if CMD_NAND
+	select SYS_NAND_USE_FLASH_BBT if NAND
+
+config TARGET_TX28_40X1_NOENV
+	bool
+	select TX28
+
+config TARGET_TX28_40X2
+	bool
+	select TX28
+
+config TARGET_TX28_40X2_NOENV
+	bool
+	select TX28
+
+config TARGET_TX28_40X3
+	bool
+	select TX28
+
+config TARGET_TX28_40X3_NOENV
+	bool
+	select TX28
+
+config TARGET_TX28_41X0
+	bool
+	select TX28
+
+config TARGET_TX28_41X0_NOENV
+	bool
+	select TX28
+
+choice
+	prompt "U-Boot image variant"
+	default TX28_UBOOT
+
+config TX28_UBOOT
+	bool "Standard U-Boot image"
+
+config TX28_UBOOT_NOENV
+	bool "U-Boot using only built-in environment"
+
+endchoice
 
 endif
diff --git a/board/karo/tx28/Makefile b/board/karo/tx28/Makefile
index 698298c829..3c8d7f057e 100644
--- a/board/karo/tx28/Makefile
+++ b/board/karo/tx28/Makefile
@@ -6,6 +6,4 @@
 
 obj-y				+= tx28.o
 obj-$(CONFIG_SPL_BUILD)		+= spl_boot.o
-ifneq ($(CONFIG_SPL_BUILD),y)
-	obj-$(CONFIG_CMD_ROMUPDATE) += flash.o
-endif
+obj-$(CONFIG_CMD_ROMUPDATE)	+= flash.o
diff --git a/configs/tx28-40x1_defconfig b/configs/tx28-40x1_defconfig
index 91c5a514ce..c24af64f73 100644
--- a/configs/tx28-40x1_defconfig
+++ b/configs/tx28-40x1_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-40x1_noenv_defconfig b/configs/tx28-40x1_noenv_defconfig
index 447dd60795..a1f0932d0a 100644
--- a/configs/tx28-40x1_noenv_defconfig
+++ b/configs/tx28-40x1_noenv_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-40x2_defconfig b/configs/tx28-40x2_defconfig
index e09132462d..f84c66ec62 100644
--- a/configs/tx28-40x2_defconfig
+++ b/configs/tx28-40x2_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-40x2_noenv_defconfig b/configs/tx28-40x2_noenv_defconfig
index 7687e6100b..f925528354 100644
--- a/configs/tx28-40x2_noenv_defconfig
+++ b/configs/tx28-40x2_noenv_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-40x3_defconfig b/configs/tx28-40x3_defconfig
index 87b84f8e3e..311022df08 100644
--- a/configs/tx28-40x3_defconfig
+++ b/configs/tx28-40x3_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-40x3_noenv_defconfig b/configs/tx28-40x3_noenv_defconfig
index 2a8753fa7a..59a354aed4 100644
--- a/configs/tx28-40x3_noenv_defconfig
+++ b/configs/tx28-40x3_noenv_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-41x0_defconfig b/configs/tx28-41x0_defconfig
index 747754d92c..c5861bc097 100644
--- a/configs/tx28-41x0_defconfig
+++ b/configs/tx28-41x0_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/configs/tx28-41x0_noenv_defconfig b/configs/tx28-41x0_noenv_defconfig
index 51bc9bc4c2..d02779a100 100644
--- a/configs/tx28-41x0_noenv_defconfig
+++ b/configs/tx28-41x0_noenv_defconfig
@@ -18,7 +18,6 @@ CONFIG_CMD_MTDPARTS=y
 CONFIG_CMD_NAND=y
 CONFIG_CMD_NAND_TRIMFFS=y
 CONFIG_CMD_PING=y
-CONFIG_CMD_ROMUPDATE=y
 CONFIG_CMD_TIME=y
 +S:CONFIG_DOS_PARTITION=y
 CONFIG_DM=y
diff --git a/include/configs/tx28.h b/include/configs/tx28.h
index b30e75fd56..c63ec18208 100644
--- a/include/configs/tx28.h
+++ b/include/configs/tx28.h
@@ -195,10 +195,6 @@
  */
 #ifdef CONFIG_NAND
 #define CONFIG_SYS_NAND_BLOCK_SIZE	SZ_128K
-#define CONFIG_NAND_MXS
-#define CONFIG_APBH_DMA
-#define CONFIG_APBH_DMA_BURST
-#define CONFIG_APBH_DMA_BURST8
 #define CONFIG_SYS_NAND_U_BOOT_OFFS	CONFIG_SYS_NAND_BLOCK_SIZE
 #define CONFIG_SYS_MXS_DMA_CHANNEL	4
 #define CONFIG_SYS_NAND_MAX_CHIPS	0x1
@@ -233,7 +229,6 @@
 #ifdef CONFIG_CMD_MMC
 #define CONFIG_BOUNCE_BUFFER
 
-#define CONFIG_DOS_PARTITION
 #define CONFIG_CMD_FAT
 #define CONFIG_FAT_WRITE
 #define CONFIG_CMD_EXT2