From 914377efd61be7b473faca0e6bdfca6f3feb5dc5 Mon Sep 17 00:00:00 2001 From: Patrick Georgi Date: Sat, 22 Oct 2011 09:54:36 +0200 Subject: Get rid of the old romstage-as-bootblock ROM layout This change removes CONFIG_TINY_BOOTBLOCK, CONFIG_BIG_BOOTBLOCK, and all their uses, assuming TINY_BOOTBLOCK=y, BIG_BOOTBLOCK=n. This might break a couple of boards on runtime, but so far, fixes were quite simple. There's a flag day: Code that relies on CONFIG_TINY_BOOTBLOCK must be adapted. Change-Id: I1e17a4a1b9c9adb8b43ca4db8aed5a6d44d645f5 Signed-off-by: Patrick Georgi Reviewed-on: http://review.coreboot.org/320 Tested-by: build bot (Jenkins) Reviewed-by: Stefan Reinauer --- src/arch/x86/Kconfig | 11 ----------- 1 file changed, 11 deletions(-) (limited to 'src/arch/x86/Kconfig') diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index f98cf5bd54..e71d0f313a 100644 --- a/src/arch/x86/Kconfig +++ b/src/arch/x86/Kconfig @@ -30,22 +30,12 @@ config MAX_REBOOT_CNT int default 3 -config TINY_BOOTBLOCK - bool - default n - -config BIG_BOOTBLOCK - bool - default n if TINY_BOOTBLOCK - default y - # 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 - depends on TINY_BOOTBLOCK config X86_BOOTBLOCK_SIMPLE bool "Always load fallback" @@ -63,7 +53,6 @@ config BOOTBLOCK_SOURCE config UPDATE_IMAGE bool "Update existing coreboot.rom image" default n - depends on TINY_BOOTBLOCK help If this option is enabled, no new coreboot.rom file is created. Instead it is expected that there already -- cgit v1.2.3