Commit 6384726d2dd941411bfb3253f37f61eb1afa1c21

Authored by Madan Srinivas
Committed by Tom Rini
1 parent ce31ac7f72

arm: Kconfig: Add support for AM43xx SoC specific Kconfig

Adding support for AM43xx secure devices require the addition
of some SOC specific config options like the amount of memory
used by public ROM and the address of the entry point of u-boot
or SPL, as seen by the ROM code, for the image to be built
correctly.

This mandates the addition of am AM43xx CONFIG option and the
ARM Kconfig file has been modified to source this SOC Kconfig
file. Moving the TARGET_AM43XX_EVM config option to the SOC
KConfig and out of the arch/arm/Kconfig.

Updating defconfigs to add the CONFIG_AM43XX=y statement and
removing the #define CONFIG_AM43XX from the header file.

Signed-off-by: Madan Srinivas <madans@ti.com>
Signed-off-by: Daniel Allred <d-allred@ti.com>

Tested-by: Andreas Dannenberg <dannenberg@ti.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 9 changed files with 32 additions and 8 deletions Side-by-side Diff

... ... @@ -381,12 +381,6 @@
381 381 select DM
382 382 select DM_SERIAL
383 383  
384   -config TARGET_AM43XX_EVM
385   - bool "Support am43xx_evm"
386   - select CPU_V7
387   - select SUPPORT_SPL
388   - select TI_I2C_BOARD_DETECT
389   -
390 384 config TARGET_BAV335X
391 385 bool "Support bav335x"
392 386 select CPU_V7
... ... @@ -514,6 +508,17 @@
514 508 select CPU_V7
515 509 select SUPPORT_SPL
516 510  
  511 +config AM43XX
  512 + bool "AM43XX SoC"
  513 + select CPU_V7
  514 + select SUPPORT_SPL
  515 + help
  516 + Support for AM43xx SOC from Texas Instruments.
  517 + The AM43xx high performance SOC features a Cortex-A9
  518 + ARM core, a quad core PRU-ICSS for industrial Ethernet
  519 + protocols, dual camera support, optional 3D graphics
  520 + and an optional customer programmable secure boot.
  521 +
517 522 config RMOBILE
518 523 bool "Renesas ARM SoCs"
519 524 select CPU_V7
... ... @@ -794,6 +799,8 @@
794 799 source "arch/arm/cpu/armv7/omap4/Kconfig"
795 800  
796 801 source "arch/arm/cpu/armv7/omap5/Kconfig"
  802 +
  803 +source "arch/arm/cpu/armv7/am33xx/Kconfig"
797 804  
798 805 source "arch/arm/mach-orion5x/Kconfig"
799 806  
arch/arm/cpu/armv7/am33xx/Kconfig
  1 +if AM43XX
  2 +config TARGET_AM43XX_EVM
  3 + bool "Support am43xx_evm"
  4 + select TI_I2C_BOARD_DETECT
  5 + help
  6 + This option specifies support for the AM43xx
  7 + GP and HS EVM development platforms.The AM437x
  8 + GP EVM is a standalone test, development, and
  9 + evaluation module system that enables developers
  10 + to write software and develop hardware around
  11 + an AM43xx processor subsystem.
  12 +
1 13 config ISW_ENTRY_ADDR
2 14 hex "Address in memory or XIP flash of bootloader entry point"
3 15 help
... ... @@ -25,4 +37,5 @@
25 37 image, this area is no longer used, and can be reclaimed
26 38 for run time use by the boot image.
27 39 default 0x8400
  40 +endif
configs/am437x_gp_evm_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_DM_SERIAL=y
4 5 CONFIG_DM_GPIO=y
configs/am437x_sk_evm_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_DM_SERIAL=y
4 5 CONFIG_DM_SPI=y
configs/am43xx_evm_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_SPL=y
4 5 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
configs/am43xx_evm_ethboot_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_SPL=y
4 5 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT"
configs/am43xx_evm_qspiboot_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
4 5 CONFIG_HUSH_PARSER=y
configs/am43xx_evm_usbhost_boot_defconfig
1 1 CONFIG_ARM=y
  2 +CONFIG_AM43XX=y
2 3 CONFIG_TARGET_AM43XX_EVM=y
3 4 CONFIG_SPL=y
4 5 CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT"
include/configs/am43xx_evm.h
... ... @@ -9,8 +9,6 @@
9 9 #ifndef __CONFIG_AM43XX_EVM_H
10 10 #define __CONFIG_AM43XX_EVM_H
11 11  
12   -#define CONFIG_AM43XX
13   -
14 12 #define CONFIG_BOARD_LATE_INIT
15 13 #define CONFIG_ARCH_CPU_INIT
16 14 #define CONFIG_SYS_CACHELINE_SIZE 32