diff options
Diffstat (limited to 'src/arch')
| -rw-r--r-- | src/arch/arm/Kconfig | 8 | ||||
| -rw-r--r-- | src/arch/arm64/Kconfig | 6 | ||||
| -rw-r--r-- | src/arch/arm64/armv8/Makefile.inc | 5 | ||||
| -rw-r--r-- | src/arch/x86/Kconfig | 4 |
4 files changed, 8 insertions, 15 deletions
diff --git a/src/arch/arm/Kconfig b/src/arch/arm/Kconfig index 124dc3fcd5..77ed41aeeb 100644 --- a/src/arch/arm/Kconfig +++ b/src/arch/arm/Kconfig @@ -24,14 +24,6 @@ config ARM_BOOTBLOCK_CUSTOM bool default n -config CPU_HAS_BOOTBLOCK_INIT - bool - default n - -config MAINBOARD_HAS_BOOTBLOCK_INIT - bool - default n - config ARM_LPAE bool default n diff --git a/src/arch/arm64/Kconfig b/src/arch/arm64/Kconfig index 2465bb1f66..16830bc155 100644 --- a/src/arch/arm64/Kconfig +++ b/src/arch/arm64/Kconfig @@ -26,3 +26,9 @@ config ARCH_SPINTABLE depends on ARCH_RAMSTAGE_ARM64 source src/arch/arm64/armv8/Kconfig + +# If a custom bootblock is necessary, this option should be "select"-ed by +# the thing that needs it, probably the CPU. +config ARM64_BOOTBLOCK_CUSTOM + bool + default n diff --git a/src/arch/arm64/armv8/Makefile.inc b/src/arch/arm64/armv8/Makefile.inc index 955ca67602..ae9f38dd75 100644 --- a/src/arch/arm64/armv8/Makefile.inc +++ b/src/arch/arm64/armv8/Makefile.inc @@ -32,11 +32,10 @@ armv8_asm_flags = $(armv8_flags) ################################################################################ ifeq ($(CONFIG_ARCH_BOOTBLOCK_ARMV8_64),y) -ifneq ($(CONFIG_ARM_BOOTBLOCK_CUSTOM),y) +ifneq ($(CONFIG_ARM64_BOOTBLOCK_CUSTOM),y) bootblock-y += bootblock.S +bootblock-y += bootblock_simple.c endif -bootblock-$(CONFIG_ARM_BOOTBLOCK_SIMPLE) += bootblock_simple.c -bootblock-$(CONFIG_ARM_BOOTBLOCK_NORMAL) += bootblock_normal.c bootblock-y += cache.c bootblock-y += cpu.S bootblock-$(CONFIG_BOOTBLOCK_CONSOLE) += exception.c diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index 580814f323..93474a8a3f 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -49,10 +49,6 @@ config RAMBASE hex default 0x100000 -config STACK_SIZE - hex - default 0x1000 - # This is something you almost certainly don't want to mess with. # How many SIPIs do we send when starting up APs and cores? # The answer in 2000 or so was '2'. Nowadays, on many systems, |