Patrick Georgi (patrick@georgi-clan.de) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/320
-gerrit
commit 1d8164114f88f64e2890a1c618937f2e3635f646 Author: Patrick Georgi patrick@georgi-clan.de Date: Sat Oct 22 09:54:36 2011 +0200
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.
For ROMCC boards, MTRR behaviour changed a bit: Instead of the static address it now derives its MTRR base address from the MTRR size (given by configuration) and an address in the romstage (some variable stored in .rom.data).
This might break a couple of boards on runtime, but so far, fixes were quite simple.
Change-Id: I1e17a4a1b9c9adb8b43ca4db8aed5a6d44d645f5 Signed-off-by: Patrick Georgi patrick@georgi-clan.de --- src/arch/x86/Kconfig | 11 ------ src/arch/x86/Makefile.bigbootblock.inc | 38 --------------------- src/arch/x86/Makefile.inc | 19 ---------- src/cpu/intel/socket_FC_PGA370/Kconfig | 1 - src/mainboard/advansus/a785e-i/Kconfig | 1 - src/mainboard/amd/inagua/Kconfig | 1 - src/mainboard/amd/persimmon/Kconfig | 1 - src/mainboard/amd/serengeti_cheetah_fam10/Kconfig | 1 - src/mainboard/amd/torpedo/Kconfig | 1 - src/mainboard/asrock/e350m1/Kconfig | 1 - src/mainboard/asus/m2v-mx_se/Kconfig | 1 - src/mainboard/asus/m2v/Kconfig | 1 - src/mainboard/avalue/eax-785e/Kconfig | 1 - src/mainboard/digitallogic/adl855pc/Kconfig | 1 - src/mainboard/emulation/qemu-x86/Kconfig | 1 - src/mainboard/getac/p470/Kconfig | 1 - src/mainboard/hp/dl165_g6_fam10/Kconfig | 1 - src/mainboard/ibase/mb899/Kconfig | 1 - src/mainboard/intel/d945gclf/Kconfig | 1 - src/mainboard/kontron/986lcd-m/Kconfig | 1 - src/mainboard/lanner/em8510/Kconfig | 1 - src/mainboard/lenovo/t60/Kconfig | 1 - src/mainboard/msi/ms9652_fam10/Kconfig | 1 - src/mainboard/rca/rm4100/Kconfig | 1 - src/mainboard/supermicro/h8dmr_fam10/Kconfig | 1 - src/mainboard/supermicro/h8qgi/Kconfig | 1 - src/mainboard/supermicro/h8qme_fam10/Kconfig | 1 - src/mainboard/thomson/ip1000/Kconfig | 1 - src/mainboard/tyan/s2912_fam10/Kconfig | 1 - src/mainboard/via/vt8454c/Kconfig | 1 - src/southbridge/amd/amd8111/Kconfig | 1 - src/southbridge/amd/sb600/Kconfig | 1 - src/southbridge/amd/sb700/Kconfig | 2 - src/southbridge/amd/sb800/Kconfig | 1 - src/southbridge/broadcom/bcm5785/Kconfig | 1 - src/southbridge/intel/i82371eb/Kconfig | 1 - src/southbridge/intel/sch/Kconfig | 1 - src/southbridge/nvidia/ck804/Kconfig | 1 - src/southbridge/nvidia/mcp55/Kconfig | 1 - src/southbridge/sis/sis966/Kconfig | 1 - 40 files changed, 0 insertions(+), 106 deletions(-)
diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig index f98cf5b..e71d0f3 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 diff --git a/src/arch/x86/Makefile.bigbootblock.inc b/src/arch/x86/Makefile.bigbootblock.inc deleted file mode 100644 index d486a03..0000000 --- a/src/arch/x86/Makefile.bigbootblock.inc +++ /dev/null @@ -1,38 +0,0 @@ -####################################################################### -# Build the final rom image - -$(obj)/coreboot.pre: $(obj)/coreboot.pre1 $(CBFSTOOL) - rm -f $@ - cp $(obj)/coreboot.pre1 $@ - -####################################################################### -# Build the bootblock - -$(obj)/coreboot.bootblock: $(obj)/coreboot - @printf " OBJCOPY $(subst $(obj)/,,$(@))\n" - $(OBJCOPY) -O binary $< $@ - -$(obj)/ldscript.ld: $$(ldscripts) $(obj)/ldoptions - printf 'INCLUDE "ldoptions"\n' > $@ - printf '$(foreach ldscript,$(ldscripts),INCLUDE "$(ldscript:$(obj)/%=%)"\n)' >> $@ - -$(obj)/crt0.S: $$(crt0s) - @printf " GEN $(subst $(obj)/,,$(@))\n" - printf '$(foreach crt0,config.h $(crt0s),#include "$(crt0:$(obj)/%=%)"\n)' > $@ - -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.romstage.o: $(obj)/mainboard/$(MAINBOARDDIR)/crt0.s - @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -MMD -I$(obj) -Wa,-acdlns -c -o $@ $< > $(dir $@)/crt0.disasm - -$(obj)/mainboard/$(MAINBOARDDIR)/crt0.s: $(obj)/crt0.S - @printf " CC $(subst $(obj)/,,$(@))\n" - $(CC) -MMD -x assembler-with-cpp -E -I$(src)/include -I$(src)/arch/x86/include -I$(obj) -include $(obj)/config.h -I. -I$(src) $< -o $@ - -$(obj)/coreboot: $$(romstage-objs) $(obj)/ldscript.ld - @printf " LINK $(subst $(obj)/,,$(@))\n" - $(CC) -nostdlib -nostartfiles -static -o $@ -L$(obj) -T $(obj)/ldscript.ld $(romstage-objs) - $(NM) -n $(obj)/coreboot | sort > $(obj)/coreboot.map - $(OBJCOPY) --only-keep-debug $@ $(obj)/bootblock.debug - $(OBJCOPY) --strip-debug $@ - $(OBJCOPY) --add-gnu-debuglink=$(obj)/bootblock.debug $@ - diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 65c2a92..db8f707 100755 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -180,18 +180,8 @@ endif crt0s = $(src)/arch/x86/init/prologue.inc ldscripts = ldscripts += $(src)/arch/x86/init/bootblock.ld -ifeq ($(CONFIG_BIG_BOOTBLOCK),y) -crt0s += $(src)/cpu/x86/16bit/entry16.inc -ldscripts += $(src)/cpu/x86/16bit/entry16.lds -endif crt0s += $(src)/cpu/x86/32bit/entry32.inc ldscripts += $(src)/cpu/x86/32bit/entry32.lds -ifeq ($(CONFIG_BIG_BOOTBLOCK),y) -crt0s += $(src)/cpu/x86/16bit/reset16.inc -ldscripts += $(src)/cpu/x86/16bit/reset16.lds -crt0s += $(src)/arch/x86/lib/id.inc -ldscripts += $(src)/arch/x86/lib/id.lds -endif
crt0s += $(src)/cpu/x86/fpu_enable.inc ifeq ($(CONFIG_SSE),y) @@ -220,11 +210,6 @@ ifeq ($(CONFIG_MMX),y) crt0s += $(src)/cpu/x86/mmx_disable.inc endif
-ifeq ($(CONFIG_BIG_BOOTBLOCK),y) -crt0s += $(chipset_bootblock_inc) -ldscripts += $(chipset_bootblock_lds) -endif - ifeq ($(CONFIG_ROMCC),y) crt0s += $(src)/arch/x86/init/crt0_romcc_epilogue.inc endif @@ -285,11 +270,7 @@ ifeq ($(CONFIG_HAVE_BUS_CONFIG),y) ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c endif
-ifeq ($(CONFIG_TINY_BOOTBLOCK),y) include $(src)/arch/x86/Makefile.bootblock.inc -else -include $(src)/arch/x86/Makefile.bigbootblock.inc -endif
seabios: $(MAKE) -C payloads/external/SeaBIOS -f Makefile.inc \ diff --git a/src/cpu/intel/socket_FC_PGA370/Kconfig b/src/cpu/intel/socket_FC_PGA370/Kconfig index 88541a8..37a58d0 100644 --- a/src/cpu/intel/socket_FC_PGA370/Kconfig +++ b/src/cpu/intel/socket_FC_PGA370/Kconfig @@ -24,7 +24,6 @@ config CPU_INTEL_SOCKET_FC_PGA370 select MMX select SSE select CACHE_AS_RAM - select TINY_BOOTBLOCK
config DCACHE_RAM_SIZE hex diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig index 29c1c6b..7f1d136 100644 --- a/src/mainboard/advansus/a785e-i/Kconfig +++ b/src/mainboard/advansus/a785e-i/Kconfig @@ -29,7 +29,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID - select TINY_BOOTBLOCK select GFXUMA select HAVE_DEBUG_CAR select SET_FIDVID diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig index 80bc621..4bb0d60 100644 --- a/src/mainboard/amd/inagua/Kconfig +++ b/src/mainboard/amd/inagua/Kconfig @@ -43,7 +43,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_2048 select ENABLE_APIC_EXT_ID - select TINY_BOOTBLOCK select GFXUMA
config AMD_AGESA diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig index 72b7947..93b4554 100644 --- a/src/mainboard/amd/persimmon/Kconfig +++ b/src/mainboard/amd/persimmon/Kconfig @@ -40,7 +40,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select AMDMCT select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_4096 - select TINY_BOOTBLOCK select GFXUMA
config AMD_AGESA diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig index 4c9d2a0..0fc857b 100644 --- a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig @@ -24,7 +24,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID select LIFT_BSP_APIC_ID - select TINY_BOOTBLOCK select QRANK_DIMM_SUPPORT
config MAINBOARD_DIR diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig index 6da53a0..f368279 100755 --- a/src/mainboard/amd/torpedo/Kconfig +++ b/src/mainboard/amd/torpedo/Kconfig @@ -43,7 +43,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_2048 select ENABLE_APIC_EXT_ID - select TINY_BOOTBLOCK select GFXUMA
config AMD_AGESA diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig index 802b58f..8324fa4 100644 --- a/src/mainboard/asrock/e350m1/Kconfig +++ b/src/mainboard/asrock/e350m1/Kconfig @@ -41,7 +41,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select AMDMCT select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_4096 - select TINY_BOOTBLOCK select GFXUMA
config AMD_AGESA diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig index 1d8f367..6434306 100644 --- a/src/mainboard/asus/m2v-mx_se/Kconfig +++ b/src/mainboard/asus/m2v-mx_se/Kconfig @@ -34,7 +34,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO select VGA - select TINY_BOOTBLOCK select HAVE_ACPI_RESUME select HAVE_MAINBOARD_RESOURCES select QRANK_DIMM_SUPPORT diff --git a/src/mainboard/asus/m2v/Kconfig b/src/mainboard/asus/m2v/Kconfig index 571b940..747c273 100644 --- a/src/mainboard/asus/m2v/Kconfig +++ b/src/mainboard/asus/m2v/Kconfig @@ -15,7 +15,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select SUPERIO_ITE_IT8712F select BOARD_ROMSIZE_KB_512 select RAMINIT_SYSINFO - select TINY_BOOTBLOCK select HAVE_ACPI_RESUME select HAVE_PIRQ_TABLE select PIRQ_ROUTE diff --git a/src/mainboard/avalue/eax-785e/Kconfig b/src/mainboard/avalue/eax-785e/Kconfig index 7aa90c8..aabd724 100644 --- a/src/mainboard/avalue/eax-785e/Kconfig +++ b/src/mainboard/avalue/eax-785e/Kconfig @@ -28,7 +28,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select BOARD_ROMSIZE_KB_2048 select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID - select TINY_BOOTBLOCK select GFXUMA select HAVE_DEBUG_CAR select SET_FIDVID diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig index ec5acb1..4b2bcd2 100644 --- a/src/mainboard/digitallogic/adl855pc/Kconfig +++ b/src/mainboard/digitallogic/adl855pc/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_1024 - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig index 9625c0a..db1a027 100644 --- a/src/mainboard/emulation/qemu-x86/Kconfig +++ b/src/mainboard/emulation/qemu-x86/Kconfig @@ -8,7 +8,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_OPTION_TABLE select HAVE_PIRQ_TABLE select BOARD_ROMSIZE_KB_256 - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig index 35a4be6..ec30859 100644 --- a/src/mainboard/getac/p470/Kconfig +++ b/src/mainboard/getac/p470/Kconfig @@ -40,7 +40,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_1024 select GFXUMA - select TINY_BOOTBLOCK select CHANNEL_XOR_RANDOMIZATION
config MAINBOARD_DIR diff --git a/src/mainboard/hp/dl165_g6_fam10/Kconfig b/src/mainboard/hp/dl165_g6_fam10/Kconfig index e20420d..e3dbf6b 100644 --- a/src/mainboard/hp/dl165_g6_fam10/Kconfig +++ b/src/mainboard/hp/dl165_g6_fam10/Kconfig @@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID select AMDMCT - select TINY_BOOTBLOCK select QRANK_DIMM_SUPPORT
config MAINBOARD_DIR diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig index 3569e35..02ccfab 100644 --- a/src/mainboard/ibase/mb899/Kconfig +++ b/src/mainboard/ibase/mb899/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_512 select GFXUMA - select TINY_BOOTBLOCK select CHANNEL_XOR_RANDOMIZATION
config MAINBOARD_DIR diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig index ff8c638..2b0161c 100644 --- a/src/mainboard/intel/d945gclf/Kconfig +++ b/src/mainboard/intel/d945gclf/Kconfig @@ -38,7 +38,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_512 select GFXUMA - select TINY_BOOTBLOCK select CHANNEL_XOR_RANDOMIZATION
config MAINBOARD_DIR diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig index e242afd..01e4b2f 100644 --- a/src/mainboard/kontron/986lcd-m/Kconfig +++ b/src/mainboard/kontron/986lcd-m/Kconfig @@ -17,7 +17,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select BOARD_ROMSIZE_KB_1024 select GFXUMA - select TINY_BOOTBLOCK select CHANNEL_XOR_RANDOMIZATION select OVERRIDE_CLOCK_DISABLE
diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig index 136e181..52f5a72 100644 --- a/src/mainboard/lanner/em8510/Kconfig +++ b/src/mainboard/lanner/em8510/Kconfig @@ -11,7 +11,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_PIRQ_TABLE select HAVE_HARD_RESET select BOARD_ROMSIZE_KB_512 - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig index 9141fc9..d1abcf6 100644 --- a/src/mainboard/lenovo/t60/Kconfig +++ b/src/mainboard/lenovo/t60/Kconfig @@ -23,7 +23,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_SMI_HANDLER select HAVE_ACPI_TABLES select HAVE_ACPI_RESUME - select TINY_BOOTBLOCK config MAINBOARD_DIR string default lenovo/t60 diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig index 948d320..71568d7 100644 --- a/src/mainboard/msi/ms9652_fam10/Kconfig +++ b/src/mainboard/msi/ms9652_fam10/Kconfig @@ -21,7 +21,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID select AMDMCT - select TINY_BOOTBLOCK select SB_HT_CHAIN_UNITID_OFFSET_ONLY select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/rca/rm4100/Kconfig b/src/mainboard/rca/rm4100/Kconfig index e2879fe..5a9901e 100644 --- a/src/mainboard/rca/rm4100/Kconfig +++ b/src/mainboard/rca/rm4100/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MAINBOARD_RESOURCES select HAVE_SMI_HANDLER select GFXUMA - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig index 195bc5c..3583300 100644 --- a/src/mainboard/supermicro/h8dmr_fam10/Kconfig +++ b/src/mainboard/supermicro/h8dmr_fam10/Kconfig @@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select AMDMCT select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO - select TINY_BOOTBLOCK select ENABLE_APIC_EXT_ID select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig index 22760d2..5df0bb4 100755 --- a/src/mainboard/supermicro/h8qgi/Kconfig +++ b/src/mainboard/supermicro/h8qgi/Kconfig @@ -39,7 +39,6 @@ config BOARD_SPECIFIC_OPTIONS select AMDMCT select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_2048 - select TINY_BOOTBLOCK #select MMCONF_SUPPORT_DEFAULT #TODO enable it to resolve Multicore IO conflict
config AMD_AGESA diff --git a/src/mainboard/supermicro/h8qme_fam10/Kconfig b/src/mainboard/supermicro/h8qme_fam10/Kconfig index 1d4f8e7..85d0fb0 100644 --- a/src/mainboard/supermicro/h8qme_fam10/Kconfig +++ b/src/mainboard/supermicro/h8qme_fam10/Kconfig @@ -19,7 +19,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select AMDMCT select BOARD_ROMSIZE_KB_1024 select RAMINIT_SYSINFO - select TINY_BOOTBLOCK select ENABLE_APIC_EXT_ID select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig index e4f76fc..d9ea787 100644 --- a/src/mainboard/thomson/ip1000/Kconfig +++ b/src/mainboard/thomson/ip1000/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_MAINBOARD_RESOURCES select HAVE_SMI_HANDLER select GFXUMA - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig index d7d5114..ffe665d 100644 --- a/src/mainboard/tyan/s2912_fam10/Kconfig +++ b/src/mainboard/tyan/s2912_fam10/Kconfig @@ -20,7 +20,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select RAMINIT_SYSINFO select ENABLE_APIC_EXT_ID select AMDMCT - select TINY_BOOTBLOCK select MMCONF_SUPPORT_DEFAULT select QRANK_DIMM_SUPPORT
diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig index 6c08007..c9a0105 100644 --- a/src/mainboard/via/vt8454c/Kconfig +++ b/src/mainboard/via/vt8454c/Kconfig @@ -14,7 +14,6 @@ config BOARD_SPECIFIC_OPTIONS # dummy select HAVE_HARD_RESET select HAVE_ACPI_TABLES select BOARD_ROMSIZE_KB_512 - select TINY_BOOTBLOCK
config MAINBOARD_DIR string diff --git a/src/southbridge/amd/amd8111/Kconfig b/src/southbridge/amd/amd8111/Kconfig index 666c7d5..83fb8fc 100644 --- a/src/southbridge/amd/amd8111/Kconfig +++ b/src/southbridge/amd/amd8111/Kconfig @@ -20,7 +20,6 @@ config SOUTHBRIDGE_AMD_AMD8111 bool select IOAPIC - select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/amd/sb600/Kconfig b/src/southbridge/amd/sb600/Kconfig index 9b164b3..07028a0 100644 --- a/src/southbridge/amd/sb600/Kconfig +++ b/src/southbridge/amd/sb600/Kconfig @@ -21,7 +21,6 @@ config SOUTHBRIDGE_AMD_SB600 bool select IOAPIC select HAVE_USBDEBUG - select TINY_BOOTBLOCK
if SOUTHBRIDGE_AMD_SB600 config BOOTBLOCK_SOUTHBRIDGE_INIT diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig index b4cae56..98b8e2a 100644 --- a/src/southbridge/amd/sb700/Kconfig +++ b/src/southbridge/amd/sb700/Kconfig @@ -21,13 +21,11 @@ config SOUTHBRIDGE_AMD_SB700 bool select IOAPIC select HAVE_USBDEBUG - select TINY_BOOTBLOCK
config SOUTHBRIDGE_AMD_SP5100 bool select IOAPIC select HAVE_USBDEBUG - select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig index 1afd242..67cb8ef 100644 --- a/src/southbridge/amd/sb800/Kconfig +++ b/src/southbridge/amd/sb800/Kconfig @@ -21,7 +21,6 @@ config SOUTHBRIDGE_AMD_SB800 bool select IOAPIC select HAVE_USBDEBUG - select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/broadcom/bcm5785/Kconfig b/src/southbridge/broadcom/bcm5785/Kconfig index dae9a63..d72afd8 100644 --- a/src/southbridge/broadcom/bcm5785/Kconfig +++ b/src/southbridge/broadcom/bcm5785/Kconfig @@ -1,7 +1,6 @@ config SOUTHBRIDGE_BROADCOM_BCM5785 bool select HAVE_HARD_RESET - select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT string diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig index 3b56796..7e5109a 100644 --- a/src/southbridge/intel/i82371eb/Kconfig +++ b/src/southbridge/intel/i82371eb/Kconfig @@ -1,6 +1,5 @@ config SOUTHBRIDGE_INTEL_I82371EB bool - select TINY_BOOTBLOCK select HAVE_ACPI_RESUME if HAVE_ACPI_TABLES
config BOOTBLOCK_SOUTHBRIDGE_INIT diff --git a/src/southbridge/intel/sch/Kconfig b/src/southbridge/intel/sch/Kconfig index 4b35306..ed2c6c4 100644 --- a/src/southbridge/intel/sch/Kconfig +++ b/src/southbridge/intel/sch/Kconfig @@ -19,7 +19,6 @@
config SOUTHBRIDGE_INTEL_SCH bool - select TINY_BOOTBLOCK select HAVE_USBDEBUG
if SOUTHBRIDGE_INTEL_SCH diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig index 9ea1423..88ab7ff 100644 --- a/src/southbridge/nvidia/ck804/Kconfig +++ b/src/southbridge/nvidia/ck804/Kconfig @@ -3,7 +3,6 @@ config SOUTHBRIDGE_NVIDIA_CK804 select HAVE_HARD_RESET select HAVE_USBDEBUG select IOAPIC - select TINY_BOOTBLOCK
if SOUTHBRIDGE_NVIDIA_CK804
diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig index af6bb2b..adca4bd 100644 --- a/src/southbridge/nvidia/mcp55/Kconfig +++ b/src/southbridge/nvidia/mcp55/Kconfig @@ -2,7 +2,6 @@ config SOUTHBRIDGE_NVIDIA_MCP55 bool select HAVE_USBDEBUG select IOAPIC - select TINY_BOOTBLOCK
if SOUTHBRIDGE_NVIDIA_MCP55
diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig index 867d08c..909a741 100644 --- a/src/southbridge/sis/sis966/Kconfig +++ b/src/southbridge/sis/sis966/Kconfig @@ -2,7 +2,6 @@ config SOUTHBRIDGE_SIS_SIS966 bool select IOAPIC select HAVE_USBDEBUG - select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT string