]> git.sur5r.net Git - u-boot/commitdiff
t81xx: Migrate TI81XX/TI816X/TI814X symbols to Kconfig
authorTom Rini <trini@konsulko.com>
Tue, 16 May 2017 18:46:40 +0000 (14:46 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 5 Jun 2017 15:02:25 +0000 (11:02 -0400)
The symbol CONFIG_TI81XX is used for the parts that are common to the
TI816x and TI814x SoCs and are not part of CONFIG_ARCH_OMAP2PLUS nor
CONFIG_AM33XX.  It however has so few uses that we can just modify the
code to check for both and drop the symbol. The symbols CONFIG_TI816X
and CONFIG_TI814X are for the repective SoCs.

Signed-off-by: Tom Rini <trini@konsulko.com>
arch/arm/include/asm/arch-am33xx/clock.h
arch/arm/include/asm/arch-am33xx/omap.h
arch/arm/mach-omap2/Kconfig
arch/arm/mach-omap2/am33xx/Kconfig
configs/ti814x_evm_defconfig
configs/ti816x_evm_defconfig
include/configs/ti814x_evm.h
include/configs/ti816x_evm.h
scripts/config_whitelist.txt

index 19ccf5c8dbb18f98900d93365bec4efb6baac602..5399bb81f0bbed6988be3b00d101ea128ad60500 100644 (file)
@@ -14,7 +14,7 @@
 #include <asm/arch/clocks_am33xx.h>
 #include <asm/arch/hardware.h>
 
-#ifdef CONFIG_TI81XX
+#if defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
 #include <asm/arch/clock_ti81xx.h>
 #endif
 
index 3293caaca4abeedde919762e7cc3333ccd2d8ce9..0dafb9e3270a762141317558fd0cf9773f1d1a15 100644 (file)
@@ -21,7 +21,7 @@
 #define NON_SECURE_SRAM_START  0x402F0400
 #define NON_SECURE_SRAM_END    0x40310000
 #define NON_SECURE_SRAM_IMG_END        0x4030B800
-#elif defined(CONFIG_TI81XX)
+#elif defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
 #define NON_SECURE_SRAM_START  0x40300000
 #define NON_SECURE_SRAM_END    0x40320000
 #define NON_SECURE_SRAM_IMG_END        0x4031B800
index 408b62c663af83e29cac4c96100c13eb5db5f9c4..d161b5194640ec464aadaf20c599dff07a659070 100644 (file)
@@ -54,12 +54,6 @@ config TARGET_RUT
        select DM_SERIAL
        select DM_GPIO
 
-config TARGET_TI814X_EVM
-       bool "Support ti814x_evm"
-
-config TARGET_TI816X_EVM
-       bool "Support ti816x_evm"
-
 config OMAP34XX
        bool "OMAP34XX SoC"
        select ARM_ERRATA_430973
@@ -116,6 +110,20 @@ config OMAP54XX
        imply SPL_POWER_SUPPORT
        imply SPL_SERIAL_SUPPORT
 
+config TI814X
+       bool "TI814X SoC"
+       help
+         Support for AM335x SOC from Texas Instruments.
+         The AM335x high performance SOC features a Cortex-A8
+         ARM core and more.
+
+config TI816X
+       bool "TI816X SoC"
+       help
+         Support for AM335x SOC from Texas Instruments.
+         The AM335x high performance SOC features a Cortex-A8
+         ARM core and more.
+
 config AM43XX
        bool "AM43XX SoC"
        imply SPL_DM
index 5c4168fefc08cfcd8cfa9591346187010c211dc7..36ec1341409829c5b21e73c90da784f8b4882e14 100644 (file)
@@ -1,3 +1,23 @@
+if TI816X
+
+config TARGET_TI816X_EVM
+       bool "Support ti816x_evm"
+       help
+         This option specifies support for the TI8168 EVM development platform
+         with PG2.0 silicon and DDR3 DRAM.
+
+endif
+
+if TI814X
+
+config TARGET_TI814X_EVM
+       bool "Support ti814x_evm"
+       help
+         This option specifies support for the TI8148
+         EVM development platform.
+
+endif
+
 if AM33XX
 
 config AM33XX_CHILISOM
index a72c7642f6010f04b74f8e8e740fe20eef7eaf54..1b127b8609267dcea5ce47f94315fc1e3836a10b 100644 (file)
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TI814X=y
 CONFIG_TARGET_TI814X_EVM=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
index 729b709df900e5cf9bbd00ed56cfa095e960e81a..1c6608218b0034b06e325e202db7bae6f98fc6b1 100644 (file)
@@ -3,6 +3,7 @@ CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SPL_GPIO_SUPPORT=y
 CONFIG_SPL_LIBCOMMON_SUPPORT=y
 CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_TI816X=y
 CONFIG_TARGET_TI816X_EVM=y
 CONFIG_SPL_MMC_SUPPORT=y
 CONFIG_SPL_SERIAL_SUPPORT=y
index a4066a8494626cfaeff2e96405b2fd55cef00c69..ea83ea2495e5d3dfebac6a436a672f58c820afd6 100644 (file)
@@ -16,9 +16,6 @@
 #ifndef __CONFIG_TI814X_EVM_H
 #define __CONFIG_TI814X_EVM_H
 
-#define CONFIG_TI81XX
-#define CONFIG_TI814X
-
 #include <asm/arch/omap.h>
 
 #define CONFIG_ENV_SIZE                        (128 << 10)     /* 128 KiB */
index 27c6479ccc296cb16e99c90b3851638e17e1e570..defcad4518806f0ed8d192aeb6a8ef5b5e358985 100644 (file)
@@ -10,9 +10,6 @@
 #ifndef __CONFIG_TI816X_EVM_H
 #define __CONFIG_TI816X_EVM_H
 
-#define CONFIG_TI81XX
-#define CONFIG_TI816X
-
 #include <configs/ti_armv7_omap.h>
 #include <asm/arch/omap.h>
 
index b2fec8473ba64b9ad58b7b65f90d040ba68d7562..8554941f4c452c4a219e7cfd8915ab88e5d1fa6d 100644 (file)
@@ -6034,9 +6034,6 @@ CONFIG_TFTP_TSIZE
 CONFIG_THOR_RESET_OFF
 CONFIG_THUMB2_KERNEL
 CONFIG_THUNDERX
-CONFIG_TI814X
-CONFIG_TI816X
-CONFIG_TI81XX
 CONFIG_TIMESTAMP
 CONFIG_TIZEN
 CONFIG_TI_KEYSTONE_SERDES