Kyösti Mälkki (kyosti.malkki@gmail.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/3519
-gerrit
commit 850cd497eac8d43cc8e9ba29838159d78965dbe5 Author: Kyösti Mälkki kyosti.malkki@gmail.com Date: Sun Jun 23 13:52:56 2013 +0300
ARCH_ARMV7: Apply Kconfig style
The style selected on x86 side is to not surround the "source" statements, but place the conditional "if" statement in the file to be sourced instead.
Change-Id: Ia3d8badbba941687c623c1ccc8b7b5ac4325f929 Signed-off-by: Kyösti Mälkki kyosti.malkki@gmail.com --- src/cpu/armltd/Kconfig | 7 ------- src/cpu/armltd/cortex-a9/Kconfig | 7 +++++++ src/cpu/samsung/Kconfig | 6 +----- src/cpu/samsung/Makefile.inc | 2 +- src/cpu/samsung/exynos5250/Kconfig | 11 +++++++++++ src/cpu/ti/Kconfig | 10 ---------- src/cpu/ti/am335x/Kconfig | 13 +++++++++++++ src/mainboard/google/snow/Kconfig | 2 +- 8 files changed, 34 insertions(+), 24 deletions(-)
diff --git a/src/cpu/armltd/Kconfig b/src/cpu/armltd/Kconfig index b1f4c2e..af0c5c5 100644 --- a/src/cpu/armltd/Kconfig +++ b/src/cpu/armltd/Kconfig @@ -1,8 +1 @@ -config CPU_ARMLTD_CORTEX_A9 - depends on ARCH_ARMV7 - bool - default n - -if CPU_ARMLTD_CORTEX_A9 source src/cpu/armltd/cortex-a9/Kconfig -endif diff --git a/src/cpu/armltd/cortex-a9/Kconfig b/src/cpu/armltd/cortex-a9/Kconfig index 7f35cfd..16ededc 100644 --- a/src/cpu/armltd/cortex-a9/Kconfig +++ b/src/cpu/armltd/cortex-a9/Kconfig @@ -1,5 +1,12 @@ +config CPU_ARMLTD_CORTEX_A9 + bool + +if CPU_ARMLTD_CORTEX_A9 + config BOOTBLOCK_CPU_INIT string default "cpu/armltd/cortex-a9/bootblock.c" help CPU/SoC-specific bootblock code. + +endif # CPU_ARMLTD_CORTEX_A9 diff --git a/src/cpu/samsung/Kconfig b/src/cpu/samsung/Kconfig index 9e2ec4c..c3d825e 100644 --- a/src/cpu/samsung/Kconfig +++ b/src/cpu/samsung/Kconfig @@ -1,11 +1,7 @@ config CPU_SAMSUNG_EXYNOS5 - depends on ARCH_ARMV7 + def_bool n select HAVE_MONOTONIC_TIMER select HAVE_UART_SPECIAL select DEFAULT_EARLY_CONSOLE - bool - default n
-if CPU_SAMSUNG_EXYNOS5 source src/cpu/samsung/exynos5250/Kconfig -endif diff --git a/src/cpu/samsung/Makefile.inc b/src/cpu/samsung/Makefile.inc index 97e9aab..c427925 100644 --- a/src/cpu/samsung/Makefile.inc +++ b/src/cpu/samsung/Makefile.inc @@ -1,2 +1,2 @@ subdirs-$(CONFIG_CPU_SAMSUNG_EXYNOS5) += exynos5-common -subdirs-$(CONFIG_CPU_SAMSUNG_EXYNOS5) += exynos5250 +subdirs-$(CONFIG_CPU_SAMSUNG_EXYNOS5250) += exynos5250 diff --git a/src/cpu/samsung/exynos5250/Kconfig b/src/cpu/samsung/exynos5250/Kconfig index cc67abd..034dd51 100644 --- a/src/cpu/samsung/exynos5250/Kconfig +++ b/src/cpu/samsung/exynos5250/Kconfig @@ -1,3 +1,12 @@ +config CPU_SAMSUNG_EXYNOS5250 + bool + +if CPU_SAMSUNG_EXYNOS5250 + +config SOCKET_SPECIFIC_OPTIONS # dummy + def_bool y + select CPU_SAMSUNG_EXYNOS5 + config BOOTBLOCK_CPU_INIT string default "cpu/samsung/exynos5250/bootblock.c" @@ -97,3 +106,5 @@ config SYS_TEXT_BASE config COREBOOT_TABLES_SIZE hex default 0x4000000 + +endif # CPU_SAMSUNG_EXYNOS5250 diff --git a/src/cpu/ti/Kconfig b/src/cpu/ti/Kconfig index c82c290..5a62219 100644 --- a/src/cpu/ti/Kconfig +++ b/src/cpu/ti/Kconfig @@ -1,11 +1 @@ -config CPU_TI_AM335X - depends on ARCH_ARMV7 - select HAVE_MONOTONIC_TIMER - select HAVE_UART_SPECIAL - select DEFAULT_EARLY_CONSOLE - bool - default n - -if CPU_TI_AM335X source src/cpu/ti/am335x/Kconfig -endif diff --git a/src/cpu/ti/am335x/Kconfig b/src/cpu/ti/am335x/Kconfig index 472fbe7..5b3c7b5 100644 --- a/src/cpu/ti/am335x/Kconfig +++ b/src/cpu/ti/am335x/Kconfig @@ -1,3 +1,14 @@ +config CPU_TI_AM335X + bool + +if CPU_TI_AM335X + +config SOCKET_SPECIFIC_OPTIONS # dummy + def_bool y + select HAVE_MONOTONIC_TIMER + select HAVE_UART_SPECIAL + select DEFAULT_EARLY_CONSOLE + config BOOTBLOCK_CPU_INIT string default "cpu/ti/am335x/bootblock.c" @@ -46,3 +57,5 @@ config SYS_SDRAM_BASE config COREBOOT_TABLES_SIZE hex default 0x800 + +endif # CPU_TI_AM335X diff --git a/src/mainboard/google/snow/Kconfig b/src/mainboard/google/snow/Kconfig index aa4c3c4..3f7fb19 100644 --- a/src/mainboard/google/snow/Kconfig +++ b/src/mainboard/google/snow/Kconfig @@ -22,7 +22,7 @@ if BOARD_GOOGLE_SNOW config BOARD_SPECIFIC_OPTIONS # dummy def_bool y select ARCH_ARMV7 - select CPU_SAMSUNG_EXYNOS5 + select CPU_SAMSUNG_EXYNOS5250 select HAVE_UART_MEMORY_MAPPED select EC_GOOGLE_CHROMEEC select EC_GOOGLE_CHROMEEC_I2C
-
Kyösti Mälkki