Samsung CPUs: Unify Kconfig

For all other CPUs, we unconditionally include the CPU Kconfig
files in the CPU directory, not in the vendor directory. Do the
same thing for the Exynos CPUs. This allows us to make CPU dependent
changes in the directory of that CPU alone.
Also, drop some unused Kconfig variables from the Exynos Kconfig
files.

Change-Id: I4e4c22a0693988834e619dd33d121bf994ed57e8
Signed-off-by: Stefan Reinauer <reinauer@chromium.org>
Signed-off-by: Gabe Black <gabeblack@chromium.org>
Reviewed-on: http://review.coreboot.org/3683
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Stefan Reinauer 2013-06-19 12:02:47 -07:00 committed by Stefan Reinauer
parent 2867060098
commit 3511b92d31
3 changed files with 23 additions and 46 deletions

View File

@ -1,24 +1,2 @@
config CPU_SAMSUNG_EXYNOS5250
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select DEFAULT_BOOTBLOCK_CONSOLE
select DEFAULT_EARLY_CONSOLE
bool
default n
config CPU_SAMSUNG_EXYNOS5420
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select DEFAULT_EARLY_CONSOLE
bool
default n
if CPU_SAMSUNG_EXYNOS5250
source src/cpu/samsung/exynos5250/Kconfig
endif
if CPU_SAMSUNG_EXYNOS5420
source src/cpu/samsung/exynos5420/Kconfig
endif

View File

@ -1,3 +1,14 @@
config CPU_SAMSUNG_EXYNOS5250
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select DEFAULT_BOOTBLOCK_CONSOLE
select DEFAULT_EARLY_CONSOLE
bool
default n
if CPU_SAMSUNG_EXYNOS5250
config BOOTBLOCK_CPU_INIT
string
default "cpu/samsung/exynos5250/bootblock.c"
@ -6,10 +17,6 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
config EXYNOS_ACE_SHA
bool
default n
# ROM image layout.
#
# 0x0000: vendor-provided BL1 (8k).
@ -77,17 +84,6 @@ config CBFS_CACHE_SIZE
hex "size of CBFS cache data"
default 0x000017000
# FIXME: This is for copying SPI content into SRAM temporarily and
# will be removed when we have the SPI streaming driver implemented.
config SPI_IMAGE_HACK
hex
default 0x02060000
# FIXME: other magic numbers that should probably go away
config XIP_ROM_SIZE
hex
default ROMSTAGE_SIZE
config SYS_SDRAM_BASE
hex
default 0x40000000
@ -137,3 +133,4 @@ config CONSOLE_SERIAL_UART_ADDRESS
help
Map the UART names to the respective MMIO address.
endif

View File

@ -1,3 +1,13 @@
config CPU_SAMSUNG_EXYNOS5420
depends on ARCH_ARMV7
select HAVE_MONOTONIC_TIMER
select HAVE_UART_SPECIAL
select DEFAULT_EARLY_CONSOLE
bool
default n
if CPU_SAMSUNG_EXYNOS5420
config BOOTBLOCK_CPU_INIT
string
default "cpu/samsung/exynos5420/bootblock.c"
@ -6,10 +16,6 @@ config BOOTBLOCK_CPU_INIT
bootblock must load microcode or copy data from ROM before
searching for the bootblock.
config EXYNOS_ACE_SHA
bool
default n
# ROM image layout.
#
# 0x0000: vendor-provided BL1 (8k).
@ -79,11 +85,6 @@ config CBFS_CACHE_SIZE
hex "size of CBFS cache data"
default 0x000013000
# FIXME: other magic numbers that should probably go away
config XIP_ROM_SIZE
hex
default ROMSTAGE_SIZE
config SYS_SDRAM_BASE
hex
default 0x20000000
@ -133,3 +134,4 @@ config CONSOLE_SERIAL_UART_ADDRESS
help
Map the UART names to the respective MMIO address.
endif