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 896ee62d1bb2eaadc3e0d236de70890c50ec1d9f..7c18a451e8a073592c8d19b4aef9e2e953355b96 100644 (file)
--- 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 698298c829f9ec8745fae3c3864dba66eedaf2f3..3c8d7f057e36ba0ec5581087ca647369c34c7ad0 100644 (file)
--- 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 91c5a514cee2c263d7bf137e5f5bcf39ca5345bb..c24af64f733bfd9c1f828338daf628cc58096dc9 100644 (file)
--- 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 447dd6079534bfe991cb5ae6ebe2abd9b0999f72..a1f0932d0a44f762a43bd6e5d180d44617449fa4 100644 (file)
--- 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 e09132462d5225bd5881c20f8faf4d0aef61ab68..f84c66ec627e5beb7b09142e1abe4d24d286d134 100644 (file)
--- 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 7687e6100beee9b61aded2d56cecdb4293fc62a1..f9255283541e942c6bdea375b4f0d62dd37e72da 100644 (file)
--- 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 87b84f8e3e1d123d2509a7ed87c5ad4c28dd3090..311022df085423db6acd7f76885459b08964608c 100644 (file)
--- 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 2a8753fa7a1ccafdd53fccf76344ba0b3c855f47..59a354aed4253a7d67f4189e4868799ce4c06058 100644 (file)
--- 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 747754d92c21f1802ff8914faaaa06fecbd71e05..c5861bc09715377deb2d8b8f576861902e749bf6 100644 (file)
--- 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 51bc9bc4c2d2a6e6cd1639607f7db86b64c92b74..d02779a100facc2d2d494d6c67d9d2bb22e80066 100644 (file)
--- 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 b30e75fd5628b74275264f37ef9ac67a7f26f38b..c63ec182082f487d5c7a819bad7aa1945f0400d1 100644 (file)
--- 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