am33xx: Finish migration of CONFIG_AM33XX/AM43XX

Almost all users of CONFIG_AM33XX/AM43XX have been migrated.  Finish
moving the last few over to Kconfig, and put all of the boards under the
appropriate Kconfig chocie now.  This board choice is non-optional, so
remove that keyword on am33xx.

Signed-off-by: Tom Rini <[email protected]>

diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
index d161b5194640ec464aadaf20c599dff07a659070..683cdb92963dbab52b59ae3ba1620e25df396c27 100644 (file)
--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@ -2,57 +2,7 @@ if ARCH_OMAP2PLUS
 
 choice
        prompt "OMAP2+ platform select"
 
 choice
        prompt "OMAP2+ platform select"

-       default TARGET_BRXRE1
-
-config TARGET_BRXRE1
-       bool "Support BRXRE1"
-       select BOARD_LATE_INIT
-
-config TARGET_BRPPT1
-       bool "Support BRPPT1"
-       select BOARD_LATE_INIT
-
-config TARGET_DRACO
-       bool "Support draco"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_THUBAN
-       bool "Support thuban"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_RASTABAN
-       bool "Support rastaban"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_ETAMIN
-       bool "Support etamin"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_PXM2
-       bool "Support pxm2"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
-
-config TARGET_RUT
-       bool "Support rut"
-       select BOARD_LATE_INIT
-       select DM
-       select DM_SERIAL
-       select DM_GPIO
+       default OMAP34XX

 
 config OMAP34XX
        bool "OMAP34XX SoC"
 
 config OMAP34XX
        bool "OMAP34XX SoC"


@@ -151,9 +101,6 @@ config AM33XX
          protocols, optional 3D graphics and an optional customer
          programmable secure boot.
 
          protocols, optional 3D graphics and an optional customer
          programmable secure boot.
 

-config TARGET_CM_T43
-       bool "Support cm_t43"
-

 endchoice
 
 config SYS_MPUCLK
 endchoice
 
 config SYS_MPUCLK

diff --git a/arch/arm/mach-omap2/am33xx/Kconfig b/arch/arm/mach-omap2/am33xx/Kconfig
index 36ec1341409829c5b21e73c90da784f8b4882e14..d8abba992acbec27acb47f40021e103777b5fa76 100644 (file)
--- a/arch/arm/mach-omap2/am33xx/Kconfig
+++ b/arch/arm/mach-omap2/am33xx/Kconfig
@@ -26,7 +26,6 @@ config AM33XX_CHILISOM
 
 choice
        prompt "AM33xx board select"
 
 choice
        prompt "AM33xx board select"

-       optional

 
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"
 
 config TARGET_AM335X_EVM
        bool "Support am335x_evm"


@@ -104,6 +103,14 @@ config TARGET_BAV335X
 
          For more information, visit: http://birdland.com/oem
 
 
          For more information, visit: http://birdland.com/oem
 

+config TARGET_BRXRE1
+       bool "Support BRXRE1"
+       select BOARD_LATE_INIT
+
+config TARGET_BRPPT1
+       bool "Support BRPPT1"
+       select BOARD_LATE_INIT
+

 config TARGET_CHILIBOARD
        bool "Grinn chiliBoard"
        select AM33XX_CHILISOM
 config TARGET_CHILIBOARD
        bool "Grinn chiliBoard"
        select AM33XX_CHILISOM


@@ -117,6 +124,20 @@ config TARGET_CM_T335
        select DM_SERIAL
        select DM_GPIO
 
        select DM_SERIAL
        select DM_GPIO
 

+config TARGET_DRACO
+       bool "Support draco"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_ETAMIN
+       bool "Support etamin"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+

 config TARGET_PCM051
        bool "Support pcm051"
        select DM
 config TARGET_PCM051
        bool "Support pcm051"
        select DM


@@ -135,12 +156,43 @@ config TARGET_PEPPER
        select DM_SERIAL
        select DM_GPIO
 
        select DM_SERIAL
        select DM_GPIO
 

+config TARGET_PXM2
+       bool "Support pxm2"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_RASTABAN
+       bool "Support rastaban"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_RUT
+       bool "Support rut"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+
+config TARGET_THUBAN
+       bool "Support thuban"
+       select BOARD_LATE_INIT
+       select DM
+       select DM_SERIAL
+       select DM_GPIO
+

 endchoice
 
 endif
 
 if AM43XX
 
 endchoice
 
 endif
 
 if AM43XX
 

+choice
+       prompt "AM43xx board select"
+

 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select BOARD_LATE_INIT
 config TARGET_AM43XX_EVM
        bool "Support am43xx_evm"
        select BOARD_LATE_INIT


@@ -171,6 +223,12 @@ config TARGET_AM43XX_EVM
          evaluation module system that enables developers
          to write software and develop hardware around
          an AM43xx processor subsystem.
          evaluation module system that enables developers
          to write software and develop hardware around
          an AM43xx processor subsystem.

+
+config TARGET_CM_T43
+       bool "Support cm_t43"
+
+endchoice
+

 endif
 
 if AM43XX || AM33XX
 endif
 
 if AM43XX || AM33XX

diff --git a/configs/brppt1_mmc_defconfig b/configs/brppt1_mmc_defconfig
index 356622319071d1730847f9e950645630455bbbea..f975eca9f406a4e22391bd55e6fca98cf1d0e8d3 100644 (file)
--- a/configs/brppt1_mmc_defconfig
+++ b/configs/brppt1_mmc_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

+CONFIG_AM33XX=y

 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y

diff --git a/configs/brppt1_nand_defconfig b/configs/brppt1_nand_defconfig
index f07a46b78ff8be5b037aaab7ac4332310a913031..ff3b0f8107b695e06dde2121534ac65bdb5f8e8a 100644 (file)
--- a/configs/brppt1_nand_defconfig
+++ b/configs/brppt1_nand_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

+CONFIG_AM33XX=y

 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y
 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_NAND_SUPPORT=y

diff --git a/configs/brppt1_spi_defconfig b/configs/brppt1_spi_defconfig
index 333e2043107fb71f0e7cb66867b2a7892b20a52e..27a41249808430a13b031db756db5c1efec80419 100644 (file)
--- a/configs/brppt1_spi_defconfig
+++ b/configs/brppt1_spi_defconfig
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

+CONFIG_AM33XX=y

 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_BRPPT1=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y

diff --git a/configs/brxre1_defconfig b/configs/brxre1_defconfig
index f558886067e5b3839415316acb7335f221548c46..7353b2afa8e2260811523c13afbdf796abbf59c5 100644 (file)
--- a/configs/brxre1_defconfig
+++ b/configs/brxre1_defconfig
@@ -3,6 +3,8 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

+CONFIG_AM33XX=y
+CONFIG_TARGET_BRXRE1=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_POWER_SUPPORT=y


@@ -57,6 +59,7 @@ CONFIG_USB_MUSB_HOST=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_SYS_WHITE_ON_BLACK=y
 CONFIG_LCD=y

+# CONFIG_OMAP_WATCHDOG is not set

 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set
 CONFIG_FAT_WRITE=y
 CONFIG_OF_LIBFDT=y
 # CONFIG_EFI_LOADER is not set

diff --git a/configs/cm_t43_defconfig b/configs/cm_t43_defconfig
index d813cc54fb3ed7f6f19422424d4459ed37fe7765..5c5b1144678825511d8a7bb30cd450c0875be688 100644 (file)
--- a/configs/cm_t43_defconfig
+++ b/configs/cm_t43_defconfig
@@ -3,6 +3,7 @@ CONFIG_SYS_THUMB_BUILD=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y

+CONFIG_AM43XX=y

 CONFIG_TARGET_CM_T43=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_TARGET_CM_T43=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y

diff --git a/configs/draco_defconfig b/configs/draco_defconfig
index 0e50b3109ea25589fd6da9333e3b191979b17cc6..28fe82ade1c9c710a06dc14bb6bcb9c939ccee19 100644 (file)
--- a/configs/draco_defconfig
+++ b/configs/draco_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_DRACO=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=300
 CONFIG_SYS_MPUCLK=300

+CONFIG_TARGET_DRACO=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/etamin_defconfig b/configs/etamin_defconfig
index b6911fd717439e9ad89e727aa78639c8530f0ba4..aac8bfac1a0d2d28cc43235d028bdbf3dd006baa 100644 (file)
--- a/configs/etamin_defconfig
+++ b/configs/etamin_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_ETAMIN=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=300
 CONFIG_SYS_MPUCLK=300

+CONFIG_TARGET_ETAMIN=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/pxm2_defconfig b/configs/pxm2_defconfig
index 67bdfd63f2596667faf1c8ee24bf4051aaed5eeb..4d6e2613a7c275b82812eef0a086185b09076f48 100644 (file)
--- a/configs/pxm2_defconfig
+++ b/configs/pxm2_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_PXM2=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=720
 CONFIG_SYS_MPUCLK=720

+CONFIG_TARGET_PXM2=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/rastaban_defconfig b/configs/rastaban_defconfig
index f77d4d4087933d686781189f73145ed2ca81e1cf..a3adce5776ccc3ab3de3a4b28a4ed0d8b76a2a38 100644 (file)
--- a/configs/rastaban_defconfig
+++ b/configs/rastaban_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_RASTABAN=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=300
 CONFIG_SYS_MPUCLK=300

+CONFIG_TARGET_RASTABAN=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/configs/rut_defconfig b/configs/rut_defconfig
index f09a67e62c73a321ce2b9299b496e4a52fbaa3c2..8acc7cc0ecf0d315fa42e288caf6a3236e0e484e 100644 (file)
--- a/configs/rut_defconfig
+++ b/configs/rut_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_RUT=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=600
 CONFIG_SYS_MPUCLK=600

+CONFIG_TARGET_RUT=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y


@@ -73,3 +74,4 @@ CONFIG_G_DNL_PRODUCT_NUM=0x02d2
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00
 # CONFIG_VIDEO_SW_CURSOR is not set
 CONFIG_SYS_CONSOLE_BG_COL=0xff
 CONFIG_SYS_CONSOLE_FG_COL=0x00

+# CONFIG_OMAP_WATCHDOG is not set

diff --git a/configs/thuban_defconfig b/configs/thuban_defconfig
index 914f70fd6a01ae97960d32dbeaede1f3265d8c03..4c07de7879dee13a7285dbb89b65c809010fcba8 100644 (file)
--- a/configs/thuban_defconfig
+++ b/configs/thuban_defconfig
@@ -4,8 +4,9 @@ CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
 CONFIG_SYS_MALLOC_F_LEN=0x2000

-CONFIG_TARGET_THUBAN=y
+CONFIG_AM33XX=y

 CONFIG_SYS_MPUCLK=300
 CONFIG_SYS_MPUCLK=300

+CONFIG_TARGET_THUBAN=y

 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
 CONFIG_SPL_LIBDISK_SUPPORT=y

diff --git a/include/configs/bur_am335x_common.h b/include/configs/bur_am335x_common.h
index 7907310084e2039fd8271d6a43bc65b456a4d8c1..8d0e0ea793cabd51315bd5571ab462f6f61c5325 100644 (file)
--- a/include/configs/bur_am335x_common.h
+++ b/include/configs/bur_am335x_common.h
@@ -12,7 +12,6 @@
 #ifndef __BUR_AM335X_COMMON_H__
 #define __BUR_AM335X_COMMON_H__
 /* ------------------------------------------------------------------------- */
 #ifndef __BUR_AM335X_COMMON_H__
 #define __BUR_AM335X_COMMON_H__
 /* ------------------------------------------------------------------------- */

-#define CONFIG_AM33XX

 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 /* Timer information */
 #define CONFIG_MAX_RAM_BANK_SIZE       (1024 << 20)    /* 1GB */
 
 /* Timer information */

diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h
index 1e63098d5f17f0f50e3a000683f09046ac022b84..7b5ca0db0fe714f1227236f3b20d900863c12e49 100644 (file)
--- a/include/configs/cm_t43.h
+++ b/include/configs/cm_t43.h
@@ -9,7 +9,6 @@
 #ifndef __CONFIG_CM_T43_H
 #define __CONFIG_CM_T43_H
 
 #ifndef __CONFIG_CM_T43_H
 #define __CONFIG_CM_T43_H
 

-#define CONFIG_AM43XX

 #define CONFIG_CM_T43
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2GB */
 #define CONFIG_CM_T43
 #define CONFIG_ARCH_CPU_INIT
 #define CONFIG_MAX_RAM_BANK_SIZE       (2048 << 20)    /* 2GB */


@@ -21,7 +20,7 @@
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         48000000
 #define CONFIG_SYS_NS16550_COM1                0x44e09000
 #define CONFIG_SYS_NS16550_SERIAL
 #define CONFIG_SYS_NS16550_CLK         48000000
 #define CONFIG_SYS_NS16550_COM1                0x44e09000

-#ifdef CONFIG_SPL_BUILD
+#if !defined(CONFIG_SPL_DM) || !defined(CONFIG_DM_SERIAL)

 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #endif
 
 #define CONFIG_SYS_NS16550_REG_SIZE    (-4)
 #endif
 

diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h
index b5705b71693c986e56cd06fc82a0582d29d8574a..21029d10ae9906bace5c3a053602caa4b3dc7c6c 100644 (file)
--- a/include/configs/siemens-am33x-common.h
+++ b/include/configs/siemens-am33x-common.h
@@ -14,8 +14,6 @@
 #ifndef __CONFIG_SIEMENS_AM33X_COMMON_H
 #define __CONFIG_SIEMENS_AM33X_COMMON_H
 
 #ifndef __CONFIG_SIEMENS_AM33X_COMMON_H
 #define __CONFIG_SIEMENS_AM33X_COMMON_H
 

-#define CONFIG_AM33XX
-

 #include <asm/arch/omap.h>
 
 #define CONFIG_DMA_COHERENT
 #include <asm/arch/omap.h>
 
 #define CONFIG_DMA_COHERENT