Whitebox
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Kconfig: Separate AM33XX SOC config from target board config

Browse Source 
The config option AM33XX is used in several boards and should be
defined as a stand-alone option for this SOC. We break this out
from target boards that use this SoC and common headers then enable
AM33XX on in all the boards that used these targets to eliminate any
functional change with this patch.

This is similar to what has already been done in
9de852642cae ("arm: Kconfig: Add support for AM43xx SoC specific Kconfig")
and is done for the same reasons.

Signed-off-by: Andrew F. Davis <afd@ti.com>
Acked-by: Lokesh Vutla <lokeshvutla@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
master
Andrew F. Davis 8 years ago committed by Tom Rini
parent 6696139409
commit b39a9ade5c
26 changed files with 121 additions and 89 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 99
      arch/arm/Kconfig
  2. 87
      arch/arm/cpu/armv7/am33xx/Kconfig
  3. 1
      configs/am335x_baltos_defconfig
  4. 1
      configs/am335x_boneblack_defconfig
  5. 1
      configs/am335x_boneblack_vboot_defconfig
  6. 1
      configs/am335x_evm_defconfig
  7. 1
      configs/am335x_evm_nor_defconfig
  8. 1
      configs/am335x_evm_norboot_defconfig
  9. 1
      configs/am335x_evm_spiboot_defconfig
  10. 1
      configs/am335x_evm_usbspl_defconfig
  11. 1
      configs/am335x_igep0033_defconfig
  12. 1
      configs/am335x_shc_defconfig
  13. 1
      configs/am335x_shc_ict_defconfig
  14. 1
      configs/am335x_shc_netboot_defconfig
  15. 1
      configs/am335x_shc_prompt_defconfig
  16. 1
      configs/am335x_shc_sdboot_defconfig
  17. 1
      configs/am335x_shc_sdboot_prompt_defconfig
  18. 1
      configs/am335x_sl50_defconfig
  19. 1
      configs/birdland_bav335a_defconfig
  20. 1
      configs/birdland_bav335b_defconfig
  21. 1
      configs/cm_t335_defconfig
  22. 1
      configs/pcm051_rev1_defconfig
  23. 1
      configs/pcm051_rev3_defconfig
  24. 1
      configs/pengwyn_defconfig
  25. 1
      configs/pepper_defconfig
  26. 1
      include/configs/ti_am335x_common.h

99
arch/arm/Kconfig
Unescape View File

@ -335,38 +335,6 @@ config TARGET_BRPPT1
select CPU_V7
select SUPPORT_SPL
config TARGET_CM_T335
bool "Support cm_t335"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_PEPPER
bool "Support pepper"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_IGEP0033
bool "Support am335x_igep0033"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_PCM051
bool "Support pcm051"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_DRACO
bool "Support draco"
select CPU_V7
@ -415,62 +383,6 @@ config TARGET_RUT
select DM_SERIAL
select DM_GPIO
config TARGET_PENGWYN
bool "Support pengwyn"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_BALTOS
bool "Support am335x_baltos"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_EVM
bool "Support am335x_evm"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
select TI_I2C_BOARD_DETECT
config TARGET_AM335X_SHC
bool "Support am335x based shc board from bosch"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_SL50
bool "Support am335x_sl50"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_GPIO
select DM_SERIAL
config TARGET_BAV335X
bool "Support bav335x"
select CPU_V7
select SUPPORT_SPL
select DM
select DM_SERIAL
help
The BAV335x OEM Network Processor integrates all the functions of an
embedded network computer in a small, easy to use SODIMM module which
incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
ethernet with simple connection to external connectors.
For more information, visit: http://birdland.com/oem
config TARGET_TI814X_EVM
bool "Support ti814x_evm"
select CPU_V7
@ -600,6 +512,17 @@ config AM43XX
protocols, dual camera support, optional 3D graphics
and an optional customer programmable secure boot.
config AM33XX
bool "AM33XX SoC"
select CPU_V7
select SUPPORT_SPL
help
Support for AM335x SOC from Texas Instruments.
The AM335x high performance SOC features a Cortex-A8
ARM core, a dual core PRU-ICSS for industrial Ethernet
protocols, optional 3D graphics and an optional customer
programmable secure boot.
config ARCH_RMOBILE
bool "Renesas ARM SoCs"
select DM

87
arch/arm/cpu/armv7/am33xx/Kconfig
Unescape View File

@ -1,3 +1,88 @@
if AM33XX
choice
prompt "AM33xx board select"
optional
config TARGET_AM335X_EVM
bool "Support am335x_evm"
select DM
select DM_SERIAL
select DM_GPIO
select TI_I2C_BOARD_DETECT
help
This option specifies support for the AM335x
GP and HS EVM development platforms. The AM335x
GP EVM is a standalone test, development, and
evaluation module system that enables developers
to write software and develop hardware around
an AM335x processor subsystem.
config TARGET_AM335X_BALTOS
bool "Support am335x_baltos"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_IGEP0033
bool "Support am335x_igep0033"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_SHC
bool "Support am335x based shc board from bosch"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_AM335X_SL50
bool "Support am335x_sl50"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_BAV335X
bool "Support bav335x"
select DM
select DM_SERIAL
help
The BAV335x OEM Network Processor integrates all the functions of an
embedded network computer in a small, easy to use SODIMM module which
incorporates the popular Texas Instruments Sitara 32bit ARM Coretex-A8
processor, with fast DDR3 512MB SDRAM, 4GB of embedded MMC and a Gigabit
ethernet with simple connection to external connectors.
For more information, visit: http://birdland.com/oem
config TARGET_CM_T335
bool "Support cm_t335"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_PCM051
bool "Support pcm051"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_PENGWYN
bool "Support pengwyn"
select DM
select DM_SERIAL
select DM_GPIO
config TARGET_PEPPER
bool "Support pepper"
select DM
select DM_SERIAL
select DM_GPIO
endchoice
endif
if AM43XX
config SPL_EXT_SUPPORT
@ -19,7 +104,9 @@ config TARGET_AM43XX_EVM
evaluation module system that enables developers
to write software and develop hardware around
an AM43xx processor subsystem.
endif
if AM43XX || AM33XX
config ISW_ENTRY_ADDR
hex "Address in memory or XIP flash of bootloader entry point"
help

1
configs/am335x_baltos_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_BALTOS=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_boneblack_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
# CONFIG_SPL_NAND_SUPPORT is not set
CONFIG_SPL_STACK_R_ADDR=0x82000000

1
configs/am335x_boneblack_vboot_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
# CONFIG_SPL_NAND_SUPPORT is not set
CONFIG_SPL_STACK_R_ADDR=0x82000000

1
configs/am335x_evm_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"

1
configs/am335x_evm_nor_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_NOR=y

1
configs/am335x_evm_norboot_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_NOR=y
CONFIG_FIT=y

1
configs/am335x_evm_spiboot_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
# CONFIG_SPL_NAND_SUPPORT is not set
CONFIG_SPL_SPI_FLASH_SUPPORT=y

1
configs/am335x_evm_usbspl_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_EVM=y
CONFIG_SPL_STACK_R_ADDR=0x82000000
CONFIG_FIT=y

1
configs/am335x_igep0033_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_IGEP0033=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_ict_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_netboot_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_prompt_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_sdboot_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_shc_sdboot_prompt_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SHC=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/am335x_sl50_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_AM335X_SL50=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/birdland_bav335a_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_BAV335X=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/birdland_bav335b_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_BAV335X=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/cm_t335_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_CM_T335=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/pcm051_rev1_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_PCM051=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/pcm051_rev3_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_PCM051=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/pengwyn_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_PENGWYN=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
configs/pepper_defconfig
Unescape View File

@ -1,4 +1,5 @@
CONFIG_ARM=y
CONFIG_AM33XX=y
CONFIG_TARGET_PEPPER=y
CONFIG_SPL_GPIO_SUPPORT=y
CONFIG_SPL_LIBCOMMON_SUPPORT=y

1
include/configs/ti_am335x_common.h
Unescape View File

@ -12,7 +12,6 @@
#ifndef __CONFIG_TI_AM335X_COMMON_H__
#define __CONFIG_TI_AM335X_COMMON_H__
#define CONFIG_AM33XX
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */
#define CONFIG_SYS_TIMERBASE 0x48040000 /* Use Timer2 */

Write Preview
Loading…
Cancel
Save