leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

t81xx: Migrate TI81XX/TI816X/TI814X symbols to Kconfig

Browse Source 
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>
This commit is contained in:
Tom Rini 2017-05-16 14:46:40 -04:00
parent 1d7f6ad2bf
commit 8bb687fdc1
9 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/include/asm/arch-am33xx/clock.h
View 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

2
arch/arm/include/asm/arch-am33xx/omap.h
View 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

20
arch/arm/mach-omap2/Kconfig
View 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

20
arch/arm/mach-omap2/am33xx/Kconfig
View 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

1
configs/ti814x_evm_defconfig
View 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

1
configs/ti816x_evm_defconfig
View 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

3
include/configs/ti814x_evm.h
View 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 */

3
include/configs/ti816x_evm.h
View 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>

3
scripts/config_whitelist.txt
View 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