Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 8bb687fdc10946a25e81393f8d6617d17e890df0

Authored by Tom Rini
1 parent 1d7f6ad2bf
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

t81xx: Migrate TI81XX/TI816X/TI814X symbols to Kconfig 

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>

Showing 9 changed files with 38 additions and 17 deletions Side-by-side Diff

arch/arm/include/asm/arch-am33xx/clock.h
Diff comments   View file @ 8bb687f
... ... @@ -14,7 +14,7 @@
14 14 #include <asm/arch/clocks_am33xx.h>
15 15 #include <asm/arch/hardware.h>
16 16  
17   -#ifdef CONFIG_TI81XX
  17 +#if defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
18 18 #include <asm/arch/clock_ti81xx.h>
19 19 #endif
20 20  
arch/arm/include/asm/arch-am33xx/omap.h
Diff comments   View file @ 8bb687f
... ... @@ -21,7 +21,7 @@
21 21 #define NON_SECURE_SRAM_START 0x402F0400
22 22 #define NON_SECURE_SRAM_END 0x40310000
23 23 #define NON_SECURE_SRAM_IMG_END 0x4030B800
24   -#elif defined(CONFIG_TI81XX)
  24 +#elif defined(CONFIG_TI816X) || defined(CONFIG_TI814X)
25 25 #define NON_SECURE_SRAM_START 0x40300000
26 26 #define NON_SECURE_SRAM_END 0x40320000
27 27 #define NON_SECURE_SRAM_IMG_END 0x4031B800
arch/arm/mach-omap2/Kconfig
Diff comments   View file @ 8bb687f
... ... @@ -54,12 +54,6 @@
54 54 select DM_SERIAL
55 55 select DM_GPIO
56 56  
57   -config TARGET_TI814X_EVM
58   - bool "Support ti814x_evm"
59   -
60   -config TARGET_TI816X_EVM
61   - bool "Support ti816x_evm"
62   -
63 57 config OMAP34XX
64 58 bool "OMAP34XX SoC"
65 59 select ARM_ERRATA_430973
... ... @@ -115,6 +109,20 @@
115 109 imply SPL_NAND_SUPPORT
116 110 imply SPL_POWER_SUPPORT
117 111 imply SPL_SERIAL_SUPPORT
  112 +
  113 +config TI814X
  114 + bool "TI814X SoC"
  115 + help
  116 + Support for AM335x SOC from Texas Instruments.
  117 + The AM335x high performance SOC features a Cortex-A8
  118 + ARM core and more.
  119 +
  120 +config TI816X
  121 + bool "TI816X SoC"
  122 + help
  123 + Support for AM335x SOC from Texas Instruments.
  124 + The AM335x high performance SOC features a Cortex-A8
  125 + ARM core and more.
118 126  
119 127 config AM43XX
120 128 bool "AM43XX SoC"
arch/arm/mach-omap2/am33xx/Kconfig
Diff comments   View file @ 8bb687f
  1 +if TI816X
  2 +
  3 +config TARGET_TI816X_EVM
  4 + bool "Support ti816x_evm"
  5 + help
  6 + This option specifies support for the TI8168 EVM development platform
  7 + with PG2.0 silicon and DDR3 DRAM.
  8 +
  9 +endif
  10 +
  11 +if TI814X
  12 +
  13 +config TARGET_TI814X_EVM
  14 + bool "Support ti814x_evm"
  15 + help
  16 + This option specifies support for the TI8148
  17 + EVM development platform.
  18 +
  19 +endif
  20 +
1 21 if AM33XX
2 22  
3 23 config AM33XX_CHILISOM
configs/ti814x_evm_defconfig
Diff comments   View file @ 8bb687f
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SPL_GPIO_SUPPORT=y
4 4 CONFIG_SPL_LIBCOMMON_SUPPORT=y
5 5 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  6 +CONFIG_TI814X=y
6 7 CONFIG_TARGET_TI814X_EVM=y
7 8 CONFIG_SPL_MMC_SUPPORT=y
8 9 CONFIG_SPL_SERIAL_SUPPORT=y
configs/ti816x_evm_defconfig
Diff comments   View file @ 8bb687f
... ... @@ -3,6 +3,7 @@
3 3 CONFIG_SPL_GPIO_SUPPORT=y
4 4 CONFIG_SPL_LIBCOMMON_SUPPORT=y
5 5 CONFIG_SPL_LIBGENERIC_SUPPORT=y
  6 +CONFIG_TI816X=y
6 7 CONFIG_TARGET_TI816X_EVM=y
7 8 CONFIG_SPL_MMC_SUPPORT=y
8 9 CONFIG_SPL_SERIAL_SUPPORT=y
include/configs/ti814x_evm.h
Diff comments   View file @ 8bb687f
... ... @@ -16,9 +16,6 @@
16 16 #ifndef __CONFIG_TI814X_EVM_H
17 17 #define __CONFIG_TI814X_EVM_H
18 18  
19   -#define CONFIG_TI81XX
20   -#define CONFIG_TI814X
21   -
22 19 #include <asm/arch/omap.h>
23 20  
24 21 #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
include/configs/ti816x_evm.h
Diff comments   View file @ 8bb687f
... ... @@ -10,9 +10,6 @@
10 10 #ifndef __CONFIG_TI816X_EVM_H
11 11 #define __CONFIG_TI816X_EVM_H
12 12  
13   -#define CONFIG_TI81XX
14   -#define CONFIG_TI816X
15   -
16 13 #include <configs/ti_armv7_omap.h>
17 14 #include <asm/arch/omap.h>
18 15  
scripts/config_whitelist.txt
Diff comments   View file @ 8bb687f
... ... @@ -6034,9 +6034,6 @@
6034 6034 CONFIG_THOR_RESET_OFF
6035 6035 CONFIG_THUMB2_KERNEL
6036 6036 CONFIG_THUNDERX
6037   -CONFIG_TI814X
6038   -CONFIG_TI816X
6039   -CONFIG_TI81XX
6040 6037 CONFIG_TIMESTAMP
6041 6038 CONFIG_TIZEN
6042 6039 CONFIG_TI_KEYSTONE_SERDES