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 <patrick@georgi-clan.de>
Reviewed-on: http://review.coreboot.org/320
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>

diff --git a/src/arch/x86/Kconfig b/src/arch/x86/Kconfig
index f98cf5bd546b3a2ecfc832eab6edbd0469cc82a6..e71d0f313ae3b0b515970ee7dfb04d34f7c1d761 100644 (file)
--- a/src/arch/x86/Kconfig
+++ b/src/arch/x86/Kconfig
@@ -30,22 +30,12 @@ config MAX_REBOOT_CNT
        int
        default 3
 
        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
 # 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"
 
 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
 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
        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 (file)
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 65c2a922478377d4e6925879889361d0557eb5dd..db8f7070cea23c58999cf33c44cc0af3b2240df5 100755 (executable)
--- 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
 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
 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)
 
 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
 
 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
 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
 
 ramstage-srcs += src/mainboard/$(MAINBOARDDIR)/get_bus_conf.c
 endif
 

-ifeq ($(CONFIG_TINY_BOOTBLOCK),y)

 include $(src)/arch/x86/Makefile.bootblock.inc
 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 \
 
 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 88541a8379aa9ddd9599e8a6c8dcfc28a671d6c3..37a58d00399f7c00664389be9a0e97ac5813518b 100644 (file)
--- 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 MMX
        select SSE
        select CACHE_AS_RAM

-       select TINY_BOOTBLOCK

 
 config DCACHE_RAM_SIZE
        hex
 
 config DCACHE_RAM_SIZE
        hex

diff --git a/src/mainboard/advansus/a785e-i/Kconfig b/src/mainboard/advansus/a785e-i/Kconfig
index 29c1c6bacc45845d5f8e85838ff0b6a9fb57594c..7f1d136007f2fe4158bcaca5d3cb51bd55fbe7cd 100644 (file)
--- 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 BOARD_ROMSIZE_KB_1024
        select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID

-       select TINY_BOOTBLOCK

        select GFXUMA
        select HAVE_DEBUG_CAR
        select SET_FIDVID
        select GFXUMA
        select HAVE_DEBUG_CAR
        select SET_FIDVID

diff --git a/src/mainboard/amd/inagua/Kconfig b/src/mainboard/amd/inagua/Kconfig
index 80bc621207df8b7b6def05c58a575e829e40c665..4bb0d60168546aa9d13d1cf4b0e33b40f21f83c0 100644 (file)
--- 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 HAVE_ACPI_TABLES
   select BOARD_ROMSIZE_KB_2048
   select ENABLE_APIC_EXT_ID

-  select TINY_BOOTBLOCK

         select GFXUMA
 
 config AMD_AGESA
         select GFXUMA
 
 config AMD_AGESA

diff --git a/src/mainboard/amd/persimmon/Kconfig b/src/mainboard/amd/persimmon/Kconfig
index 72b7947d60878452fa67af56f07ee8d705614db0..93b45546708d6170a7a5116a6b0bb445b897188d 100644 (file)
--- 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 AMDMCT
         select HAVE_ACPI_TABLES
   select BOARD_ROMSIZE_KB_4096

-  select TINY_BOOTBLOCK

         select GFXUMA
 
 config AMD_AGESA
         select GFXUMA
 
 config AMD_AGESA

diff --git a/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig b/src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
index 4c9d2a06bf1d0697fab706cb3db05dbf43214c4e..0fc857bb839038e03ea4e7371f4ff6e343afa4c6 100644 (file)
--- 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 RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select LIFT_BSP_APIC_ID

-       select TINY_BOOTBLOCK

        select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
        select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/amd/torpedo/Kconfig b/src/mainboard/amd/torpedo/Kconfig
index 6da53a0b95d425ae85ef23b014834222507f0548..f36827967c31783482a1e15f7136227371e37490 100755 (executable)
--- 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 HAVE_ACPI_TABLES
   select BOARD_ROMSIZE_KB_2048
   select ENABLE_APIC_EXT_ID

-  select TINY_BOOTBLOCK

         select GFXUMA
 
 config AMD_AGESA
         select GFXUMA
 
 config AMD_AGESA

diff --git a/src/mainboard/asrock/e350m1/Kconfig b/src/mainboard/asrock/e350m1/Kconfig
index 802b58f37bb5cef60f15422fbd2a15e4c5e30dbc..8324fa458e1a5183d56275124a2606eb8a1f0e94 100644 (file)
--- 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 AMDMCT
         select HAVE_ACPI_TABLES
   select BOARD_ROMSIZE_KB_4096

-  select TINY_BOOTBLOCK

         select GFXUMA
 
 config AMD_AGESA
         select GFXUMA
 
 config AMD_AGESA

diff --git a/src/mainboard/asus/m2v-mx_se/Kconfig b/src/mainboard/asus/m2v-mx_se/Kconfig
index 1d8f36746749ee0d19bda26c26b9077a16ceda53..6434306e6e22372e7c18a4ab02103cf714cd7a54 100644 (file)
--- 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 BOARD_ROMSIZE_KB_512
        select RAMINIT_SYSINFO
        select VGA

-       select TINY_BOOTBLOCK

        select HAVE_ACPI_RESUME
        select HAVE_MAINBOARD_RESOURCES
        select QRANK_DIMM_SUPPORT
        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 571b940bf7357490ab87d6714e1d91c6fe0c324f..747c2734ae0a719e4d37969ffe3b86d26746d20e 100644 (file)
--- 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 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
        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 7aa90c8a6643355f93163b2f826b3fea96bc5c4b..aabd724ac07c712fe1377dc766bf6a990a8278fa 100644 (file)
--- 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 BOARD_ROMSIZE_KB_2048
        select RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID

-       select TINY_BOOTBLOCK

        select GFXUMA
        select HAVE_DEBUG_CAR
        select SET_FIDVID
        select GFXUMA
        select HAVE_DEBUG_CAR
        select SET_FIDVID

diff --git a/src/mainboard/digitallogic/adl855pc/Kconfig b/src/mainboard/digitallogic/adl855pc/Kconfig
index ec5acb1c0c03f9f5198fa15556dc5f6155595050..4b2bcd24253cebc7e666db9b5614c9d3a65905d0 100644 (file)
--- 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 HAVE_PIRQ_TABLE
        select HAVE_HARD_RESET
        select BOARD_ROMSIZE_KB_1024

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/emulation/qemu-x86/Kconfig b/src/mainboard/emulation/qemu-x86/Kconfig
index 9625c0ad49ab82550564a9f76c09037fccc0ad07..db1a0270b88c06cc602e6617d609f84f4497d7a3 100644 (file)
--- 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 HAVE_OPTION_TABLE
        select HAVE_PIRQ_TABLE
        select BOARD_ROMSIZE_KB_256

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/getac/p470/Kconfig b/src/mainboard/getac/p470/Kconfig
index 35a4be64f332797727ee68ecaca690523528712b..ec30859e4f25125d3a7a466306490479002b6938 100644 (file)
--- 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 HAVE_SMI_HANDLER
        select BOARD_ROMSIZE_KB_1024
        select GFXUMA

-       select TINY_BOOTBLOCK

        select CHANNEL_XOR_RANDOMIZATION
 
 config MAINBOARD_DIR
        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 e20420df09ffcbf640fe49194d560974180831ea..e3dbf6b6265a24c6f5e1c2767a8277c90e58af4d 100644 (file)
--- 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 RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT

-       select TINY_BOOTBLOCK

        select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR
        select QRANK_DIMM_SUPPORT
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/ibase/mb899/Kconfig b/src/mainboard/ibase/mb899/Kconfig
index 3569e35c657fa73626e5bff6940e530fe0a2613b..02ccfab32cfb839015a1f70a62cb23dbc9f7c4d4 100644 (file)
--- 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 HAVE_SMI_HANDLER
        select BOARD_ROMSIZE_KB_512
        select GFXUMA

-       select TINY_BOOTBLOCK

        select CHANNEL_XOR_RANDOMIZATION
 
 config MAINBOARD_DIR
        select CHANNEL_XOR_RANDOMIZATION
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/intel/d945gclf/Kconfig b/src/mainboard/intel/d945gclf/Kconfig
index ff8c638f0aa5574fd28282d517233a6f299165eb..2b0161c1fdd855ce9ade2acda4b01738a79b6b58 100644 (file)
--- 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 HAVE_SMI_HANDLER
        select BOARD_ROMSIZE_KB_512
        select GFXUMA

-       select TINY_BOOTBLOCK

        select CHANNEL_XOR_RANDOMIZATION
 
 config MAINBOARD_DIR
        select CHANNEL_XOR_RANDOMIZATION
 
 config MAINBOARD_DIR

diff --git a/src/mainboard/kontron/986lcd-m/Kconfig b/src/mainboard/kontron/986lcd-m/Kconfig
index e242afd31486525e24d9a187fa82960a72f885f3..01e4b2f8cfc188bba758f6b5314df0d9c7b5c936 100644 (file)
--- 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 HAVE_SMI_HANDLER
        select BOARD_ROMSIZE_KB_1024
        select GFXUMA

-       select TINY_BOOTBLOCK

        select CHANNEL_XOR_RANDOMIZATION
        select OVERRIDE_CLOCK_DISABLE
 
        select CHANNEL_XOR_RANDOMIZATION
        select OVERRIDE_CLOCK_DISABLE
 

diff --git a/src/mainboard/lanner/em8510/Kconfig b/src/mainboard/lanner/em8510/Kconfig
index 136e181d04242097cfe126e444d2c8322db8062e..52f5a72f947c329530ce005281eec231f85d6405 100644 (file)
--- 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 HAVE_PIRQ_TABLE
        select HAVE_HARD_RESET
        select BOARD_ROMSIZE_KB_512

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/lenovo/t60/Kconfig b/src/mainboard/lenovo/t60/Kconfig
index 9141fc91512465ad44594c1e561296a295fe7a2e..d1abcf656aca7d2e86836079cc0e28ce94420bf5 100644 (file)
--- 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 HAVE_SMI_HANDLER
        select HAVE_ACPI_TABLES
        select HAVE_ACPI_RESUME

-       select TINY_BOOTBLOCK

 config MAINBOARD_DIR
        string
        default lenovo/t60
 config MAINBOARD_DIR
        string
        default lenovo/t60

diff --git a/src/mainboard/msi/ms9652_fam10/Kconfig b/src/mainboard/msi/ms9652_fam10/Kconfig
index 948d320735b5774dfb11eb7a85ae8fe66e5d08c4..71568d74c036caeae6fd553e8e0cd2f5cc8ebf21 100644 (file)
--- 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 RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT

-       select TINY_BOOTBLOCK

        select SB_HT_CHAIN_UNITID_OFFSET_ONLY
        select QRANK_DIMM_SUPPORT
 
        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 e2879fe9ae007815fc29c17bb049c6bb00d100bb..5a9901e3fc8f622a3501ac86e50c97ea4b3f8828 100644 (file)
--- 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 HAVE_MAINBOARD_RESOURCES
        select HAVE_SMI_HANDLER
        select GFXUMA

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/supermicro/h8dmr_fam10/Kconfig b/src/mainboard/supermicro/h8dmr_fam10/Kconfig
index 195bc5cf411bc4e8ee6ab24cb060f0f4d3d781dd..3583300d2902afe7c8e5a22e88008f11f9b6f140 100644 (file)
--- 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 AMDMCT
        select BOARD_ROMSIZE_KB_1024
        select RAMINIT_SYSINFO

-       select TINY_BOOTBLOCK

        select ENABLE_APIC_EXT_ID
        select QRANK_DIMM_SUPPORT
 
        select ENABLE_APIC_EXT_ID
        select QRANK_DIMM_SUPPORT
 

diff --git a/src/mainboard/supermicro/h8qgi/Kconfig b/src/mainboard/supermicro/h8qgi/Kconfig
index 22760d2e0377ba15c81a2d44e66c6f959fbe0e21..5df0bb49097c0ea3b41260b7a13a82fd5a2e4be9 100755 (executable)
--- 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 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
        #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 1d4f8e76ccc5aee0aaba2dbd453110fea3a53e0e..85d0fb0fc537c65bc26baa35016ad8e7a800d7a6 100644 (file)
--- 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 AMDMCT
        select BOARD_ROMSIZE_KB_1024
        select RAMINIT_SYSINFO

-       select TINY_BOOTBLOCK

        select ENABLE_APIC_EXT_ID
        select QRANK_DIMM_SUPPORT
 
        select ENABLE_APIC_EXT_ID
        select QRANK_DIMM_SUPPORT
 

diff --git a/src/mainboard/thomson/ip1000/Kconfig b/src/mainboard/thomson/ip1000/Kconfig
index e4f76fc4d8d34ae09cf7f1ab7a2e8202553d4a1d..d9ea7875bb9d86e2a7245de0010b15f5961cc542 100644 (file)
--- 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 HAVE_MAINBOARD_RESOURCES
        select HAVE_SMI_HANDLER
        select GFXUMA

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/mainboard/tyan/s2912_fam10/Kconfig b/src/mainboard/tyan/s2912_fam10/Kconfig
index d7d5114507911117655021bab3e82564752df5e7..ffe665d403ee1cb8550a59ba80a69e530d4f9d54 100644 (file)
--- 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 RAMINIT_SYSINFO
        select ENABLE_APIC_EXT_ID
        select AMDMCT

-       select TINY_BOOTBLOCK

        select MMCONF_SUPPORT_DEFAULT
        select QRANK_DIMM_SUPPORT
 
        select MMCONF_SUPPORT_DEFAULT
        select QRANK_DIMM_SUPPORT
 

diff --git a/src/mainboard/via/vt8454c/Kconfig b/src/mainboard/via/vt8454c/Kconfig
index 6c08007ba07c56e5176a861f23bbfee127355310..c9a0105c5b5d467333e9dbad027d99cc07aa51c5 100644 (file)
--- 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 HAVE_HARD_RESET
        select HAVE_ACPI_TABLES
        select BOARD_ROMSIZE_KB_512

-       select TINY_BOOTBLOCK

 
 config MAINBOARD_DIR
        string
 
 config MAINBOARD_DIR
        string

diff --git a/src/southbridge/amd/amd8111/Kconfig b/src/southbridge/amd/amd8111/Kconfig
index 666c7d5ef138e956ce6f332d7eaf10dda6909749..83fb8fc0eba59aef170dea7bb16efad9e25fd2f8 100644 (file)
--- a/src/southbridge/amd/amd8111/Kconfig
+++ b/src/southbridge/amd/amd8111/Kconfig
@@ -20,7 +20,6 @@
 config SOUTHBRIDGE_AMD_AMD8111
        bool
        select IOAPIC
 config SOUTHBRIDGE_AMD_AMD8111
        bool
        select IOAPIC

-       select TINY_BOOTBLOCK

 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string

diff --git a/src/southbridge/amd/sb600/Kconfig b/src/southbridge/amd/sb600/Kconfig
index 9b164b3758a80ad4fd6f29e7912ab39c9e9b4126..07028a0d329aaefea610733df6dc44ec4ccb63d2 100644 (file)
--- 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
        bool
        select IOAPIC
        select HAVE_USBDEBUG

-       select TINY_BOOTBLOCK

 
 if SOUTHBRIDGE_AMD_SB600
 config BOOTBLOCK_SOUTHBRIDGE_INIT
 
 if SOUTHBRIDGE_AMD_SB600
 config BOOTBLOCK_SOUTHBRIDGE_INIT

diff --git a/src/southbridge/amd/sb700/Kconfig b/src/southbridge/amd/sb700/Kconfig
index b4cae5699864e970832ddbdd80ecf14b1d2255de..98b8e2a433714ba83cb2ed5e8c48e91fae0134e2 100644 (file)
--- 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
        bool
        select IOAPIC
        select HAVE_USBDEBUG

-       select TINY_BOOTBLOCK

 
 config SOUTHBRIDGE_AMD_SP5100
        bool
        select IOAPIC
        select HAVE_USBDEBUG
 
 config SOUTHBRIDGE_AMD_SP5100
        bool
        select IOAPIC
        select HAVE_USBDEBUG

-       select TINY_BOOTBLOCK

 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string

diff --git a/src/southbridge/amd/sb800/Kconfig b/src/southbridge/amd/sb800/Kconfig
index 1afd242d35ede423a7518964011fee6f7bf2a84b..67cb8ef08ef9ccca3a731441b049b2b32352af61 100644 (file)
--- 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
        bool
        select IOAPIC
        select HAVE_USBDEBUG

-       select TINY_BOOTBLOCK

 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string

diff --git a/src/southbridge/broadcom/bcm5785/Kconfig b/src/southbridge/broadcom/bcm5785/Kconfig
index dae9a63f2c1da50ed13f1b5a6f79f75fe3183f12..d72afd8d2c9924315d2b5214732b967eaafbde3a 100644 (file)
--- 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
 config SOUTHBRIDGE_BROADCOM_BCM5785
        bool
        select HAVE_HARD_RESET

-       select TINY_BOOTBLOCK

 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string

diff --git a/src/southbridge/intel/i82371eb/Kconfig b/src/southbridge/intel/i82371eb/Kconfig
index 3b5679657f17c6b36967dc825014aad2446de823..7e5109ade36d120f6d7fecc7bb87ec9c4fbc9889 100644 (file)
--- a/src/southbridge/intel/i82371eb/Kconfig
+++ b/src/southbridge/intel/i82371eb/Kconfig
@@ -1,6 +1,5 @@
 config SOUTHBRIDGE_INTEL_I82371EB
        bool
 config SOUTHBRIDGE_INTEL_I82371EB
        bool

-       select TINY_BOOTBLOCK

        select HAVE_ACPI_RESUME if HAVE_ACPI_TABLES
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        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 4b35306a346b95734ba46e5420f826c334163051..ed2c6c4b0324ac6284da219c0777f763f08c545f 100644 (file)
--- a/src/southbridge/intel/sch/Kconfig
+++ b/src/southbridge/intel/sch/Kconfig
@@ -19,7 +19,6 @@
 
 config SOUTHBRIDGE_INTEL_SCH
        bool
 
 config SOUTHBRIDGE_INTEL_SCH
        bool

-       select TINY_BOOTBLOCK

        select HAVE_USBDEBUG
 
 if SOUTHBRIDGE_INTEL_SCH
        select HAVE_USBDEBUG
 
 if SOUTHBRIDGE_INTEL_SCH

diff --git a/src/southbridge/nvidia/ck804/Kconfig b/src/southbridge/nvidia/ck804/Kconfig
index 9ea14235e883bb34aeb49b5b864babcfe971f546..88ab7ff1fee4de2a5178f1263809b2ade2fd5ec0 100644 (file)
--- 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 HAVE_HARD_RESET
        select HAVE_USBDEBUG
        select IOAPIC

-       select TINY_BOOTBLOCK

 
 if SOUTHBRIDGE_NVIDIA_CK804
 
 
 if SOUTHBRIDGE_NVIDIA_CK804
 

diff --git a/src/southbridge/nvidia/mcp55/Kconfig b/src/southbridge/nvidia/mcp55/Kconfig
index af6bb2bbfcda678f69e48d322aae0e168f0f932d..adca4bdf07b90e3fa02d38c51407de7a3e73ff9c 100644 (file)
--- 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
        bool
        select HAVE_USBDEBUG
        select IOAPIC

-       select TINY_BOOTBLOCK

 
 if SOUTHBRIDGE_NVIDIA_MCP55
 
 
 if SOUTHBRIDGE_NVIDIA_MCP55
 

diff --git a/src/southbridge/sis/sis966/Kconfig b/src/southbridge/sis/sis966/Kconfig
index 867d08c347337d2221ef7964d69eaf8fb8df6288..909a7419be9021df27078853f1330d85029ffdb5 100644 (file)
--- 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
        bool
        select IOAPIC
        select HAVE_USBDEBUG

-       select TINY_BOOTBLOCK

 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string
 
 config BOOTBLOCK_SOUTHBRIDGE_INIT
        string