[U-Boot] [PATCH v2 03/15] arm: Kconfig: Add support for AM43xx SoC specific Kconfig

[Heiko Schocher <hs@denx.de>]

Hello Daniel,

Am 27.04.2016 um 22:09 schrieb Daniel Allred:
> From: Madan Srinivas <madans@ti.com>
>
> 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>
> ---
>
> V2:
>   Update more defconfigs
>   Replace CREATE_BOARD_SYMLINK with TI_I2C_BOARD_DETECT
>   Rebase against latest master
>
>   arch/arm/Kconfig                          | 19 +++++++++++++------
>   arch/arm/cpu/armv7/am33xx/Kconfig         | 13 +++++++++++++
                        ^^^^^^
Is this correct?

>   configs/am437x_gp_evm_defconfig           |  1 +
>   configs/am437x_sk_evm_defconfig           |  1 +
>   configs/am43xx_evm_defconfig              |  1 +
>   configs/am43xx_evm_ethboot_defconfig      |  1 +
>   configs/am43xx_evm_qspiboot_defconfig     |  1 +
>   configs/am43xx_evm_usbhost_boot_defconfig |  1 +
>   include/configs/am43xx_evm.h              |  2 --
>   9 files changed, 32 insertions(+), 8 deletions(-)

Thanks for your patchseries looks very interesting.

May you have patches for am335x ? I ask, because I have an am335x based
board, which also uses HS boot mode, so I can test your patches, and
we can may sync our work.

> diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
> index 6b65d8e..6577572 100644
> --- a/arch/arm/Kconfig
> +++ b/arch/arm/Kconfig
> @@ -381,12 +381,6 @@ config TARGET_AM335X_SL50
>   	select DM
>   	select DM_SERIAL
>
> -config TARGET_AM43XX_EVM
> -	bool "Support am43xx_evm"
> -	select CPU_V7
> -	select SUPPORT_SPL
> -	select TI_I2C_BOARD_DETECT
> -
>   config TARGET_BAV335X
>   	bool "Support bav335x"
>   	select CPU_V7
> @@ -507,6 +501,17 @@ config OMAP54XX
>   	select CPU_V7
>   	select SUPPORT_SPL
>
> +config AM43XX
> +	bool "AM43XX SoC"
> +	select CPU_V7
> +	select SUPPORT_SPL
> +	help
> +	  Support for AM43xx SOC from Texas Instruments.
> +	  The AM43xx high performance SOC features a Cortex-A9
> +	  ARM core, a quad core PRU-ICSS for industrial Ethernet
> +	  protocols, dual camera support, optional 3D graphics
> +	  and an optional customer programmable secure boot.
> +
>   config RMOBILE
>   	bool "Renesas ARM SoCs"
>   	select CPU_V7
> @@ -777,6 +782,8 @@ source "arch/arm/cpu/armv7/omap4/Kconfig"
>
>   source "arch/arm/cpu/armv7/omap5/Kconfig"
>
> +source "arch/arm/cpu/armv7/am33xx/Kconfig"
> +
>   source "arch/arm/mach-orion5x/Kconfig"
>
>   source "arch/arm/cpu/armv7/rmobile/Kconfig"
> diff --git a/arch/arm/cpu/armv7/am33xx/Kconfig b/arch/arm/cpu/armv7/am33xx/Kconfig
> index 39759cd..dc51e9b 100644
> --- a/arch/arm/cpu/armv7/am33xx/Kconfig
> +++ b/arch/arm/cpu/armv7/am33xx/Kconfig
> @@ -1,3 +1,15 @@
> +if AM43XX

AM43XX in am33xx/Kconfig? This seems bogus to me.

bye,
Heiko
> +config TARGET_AM43XX_EVM
> +	bool "Support am43xx_evm"
> +	select TI_I2C_BOARD_DETECT
> +	help
> +	  This option specifies support for the AM43xx
> +	  GP and HS EVM development platforms.The AM437x
> +	  GP EVM is a standalone test, development, and
> +	  evaluation module system that enables developers
> +	  to write software and develop hardware around
> +	  an AM43xx processor subsystem.
> +
>   config ISW_ENTRY_ADDR
>   	hex "Address in memory or XIP flash of bootloader entry point"
>   	help
> @@ -25,3 +37,4 @@ config PUB_ROM_DATA_SIZE
>   	  image, this area is no longer used, and can be reclaimed
>   	  for run time use by the boot image.
>   	default 0x8400
> +endif
> diff --git a/configs/am437x_gp_evm_defconfig b/configs/am437x_gp_evm_defconfig
> index 03b02ac..f036bc7 100644
> --- a/configs/am437x_gp_evm_defconfig
> +++ b/configs/am437x_gp_evm_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_DM_GPIO=y
> diff --git a/configs/am437x_sk_evm_defconfig b/configs/am437x_sk_evm_defconfig
> index 48ec91f..0251270 100644
> --- a/configs/am437x_sk_evm_defconfig
> +++ b/configs/am437x_sk_evm_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_DM_SERIAL=y
>   CONFIG_DM_SPI=y
> diff --git a/configs/am43xx_evm_defconfig b/configs/am43xx_evm_defconfig
> index a6ae011..c9b6e6a 100644
> --- a/configs/am43xx_evm_defconfig
> +++ b/configs/am43xx_evm_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_SPL=y
>   CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND"
> diff --git a/configs/am43xx_evm_ethboot_defconfig b/configs/am43xx_evm_ethboot_defconfig
> index 662556a..e1499ad 100644
> --- a/configs/am43xx_evm_ethboot_defconfig
> +++ b/configs/am43xx_evm_ethboot_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_SPL=y
>   CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_ETH_SUPPORT"
> diff --git a/configs/am43xx_evm_qspiboot_defconfig b/configs/am43xx_evm_qspiboot_defconfig
> index 00fa6be..bda0ae1 100644
> --- a/configs/am43xx_evm_qspiboot_defconfig
> +++ b/configs/am43xx_evm_qspiboot_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,QSPI,QSPI_BOOT"
>   CONFIG_HUSH_PARSER=y
> diff --git a/configs/am43xx_evm_usbhost_boot_defconfig b/configs/am43xx_evm_usbhost_boot_defconfig
> index e3d6b57..d9fc4de 100644
> --- a/configs/am43xx_evm_usbhost_boot_defconfig
> +++ b/configs/am43xx_evm_usbhost_boot_defconfig
> @@ -1,4 +1,5 @@
>   CONFIG_ARM=y
> +CONFIG_AM43XX=y
>   CONFIG_TARGET_AM43XX_EVM=y
>   CONFIG_SPL=y
>   CONFIG_SYS_EXTRA_OPTIONS="SERIAL1,CONS_INDEX=1,NAND,SPL_USB_HOST_SUPPORT"
> diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h
> index 5b49988..a35541b 100644
> --- a/include/configs/am43xx_evm.h
> +++ b/include/configs/am43xx_evm.h
> @@ -9,8 +9,6 @@
>   #ifndef __CONFIG_AM43XX_EVM_H
>   #define __CONFIG_AM43XX_EVM_H
>
> -#define CONFIG_AM43XX
> -
>   #define CONFIG_BOARD_LATE_INIT
>   #define CONFIG_ARCH_CPU_INIT
>   #define CONFIG_SYS_CACHELINE_SIZE       32
>

-- 
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany