summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorFurquan Shaikh <furquan@google.com>2014-05-06 18:00:19 -0700
committerPatrick Georgi <patrick@georgi-clan.de>2014-05-10 14:32:26 +0200
commita3b06c99d066600c3462fe5fdebc5006cb9631ea (patch)
treea60d8f1b93e571cfbca4e8d1576b207c5e7d30e4 /src/arch
parent5c3f384f064f5c05945d561784fd7e8ef002a295 (diff)
downloadcoreboot-a3b06c99d066600c3462fe5fdebc5006cb9631ea.tar.xz
Arch-level Kconfig menu cleanup
Remove arch-level Kconfig menu option as it shows all available architectures in make menuconfig. Instead pull the bootblock options for choice and update image to top-level Kconfig since it is already present for both x86 and arm. Change-Id: Iab9c4539f05cd54a7f751565fefcaf7b6f0edc86 Signed-off-by: Furquan Shaikh <furquan@google.com> Reviewed-on: http://review.coreboot.org/5673 Tested-by: build bot (Jenkins) Reviewed-by: Edward O'Callaghan <eocallaghan@alterapraxis.com> Reviewed-by: Patrick Georgi <patrick@georgi-clan.de>
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/armv7/Kconfig30
-rw-r--r--src/arch/x86/Kconfig33
2 files changed, 0 insertions, 63 deletions
diff --git a/src/arch/armv7/Kconfig b/src/arch/armv7/Kconfig
index e541074393..ec24e17f58 100644
--- a/src/arch/armv7/Kconfig
+++ b/src/arch/armv7/Kconfig
@@ -1,5 +1,3 @@
-menu "Architecture (armv7)"
-
config ARCH_BOOTBLOCK_ARMV7
bool
default n
@@ -12,31 +10,3 @@ config ARCH_ROMSTAGE_ARMV7
config ARCH_RAMSTAGE_ARMV7
bool
default n
-
-choice
- prompt "Bootblock behaviour"
- default ARM_BOOTBLOCK_SIMPLE
-
-config ARM_BOOTBLOCK_SIMPLE
- bool "Always load fallback"
-
-config ARM_BOOTBLOCK_NORMAL
- bool "Switch to normal if non-volatile memory says so"
-
-endchoice
-
-config BOOTBLOCK_SOURCE
- string
- default "bootblock_simple.c" if ARM_BOOTBLOCK_SIMPLE
- default "bootblock_normal.c" if ARM_BOOTBLOCK_NORMAL
-
-config UPDATE_IMAGE
- bool "Update existing coreboot.rom image"
- default n
- help
- If this option is enabled, no new coreboot.rom file
- is created. Instead it is expected that there already
- is a suitable file for further processing.
- The bootblock will not be modified.
-
-endmenu
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index 1ce11dfc9c..c2e062424d 100644
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -1,5 +1,3 @@
-menu "Architecture (x86)"
-
config ARCH_BOOTBLOCK_X86_32
bool
default n
@@ -49,35 +47,6 @@ config NUM_IPI_STARTS
int
default 2
-# We had to rename the choice options under arch/ because otherwise
-# the options would conflict between different architectures despite
-# the if ARCH_xxx guarding the arch/xxx/Kconfig sourcing.
-choice
- prompt "Bootblock behaviour"
- default X86_BOOTBLOCK_SIMPLE
-
-config X86_BOOTBLOCK_SIMPLE
- bool "Always load fallback"
-
-config X86_BOOTBLOCK_NORMAL
- bool "Switch to normal if CMOS says so"
-
-endchoice
-
-config BOOTBLOCK_SOURCE
- string
- default "bootblock_simple.c" if X86_BOOTBLOCK_SIMPLE
- default "bootblock_normal.c" if X86_BOOTBLOCK_NORMAL
-
-config UPDATE_IMAGE
- bool "Update existing coreboot.rom image"
- default n
- help
- If this option is enabled, no new coreboot.rom file
- is created. Instead it is expected that there already
- is a suitable file for further processing.
- The bootblock will not be modified.
-
config ROMCC
bool
default n
@@ -118,5 +87,3 @@ config HPET_ADDRESS
config ID_SECTION_OFFSET
hex
default 0x80
-
-endmenu