GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Patrick Georgi 2011-10-22 09:54:36 +02:00 committed by Stefan Reinauer
parent 1da104647d
commit 914377efd6
40 changed files with 0 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/arch/x86/Kconfig
View File

@ -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

38
src/arch/x86/Makefile.bigbootblock.inc
View File

@ -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 $@

19
src/arch/x86/Makefile.inc
View File

@ -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 \

1
src/cpu/intel/socket_FC_PGA370/Kconfig
View File

@ -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

1
src/mainboard/advansus/a785e-i/Kconfig
View File

@ -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

1
src/mainboard/amd/inagua/Kconfig
View File

@ -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

1
src/mainboard/amd/persimmon/Kconfig
View File

@ -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

1
src/mainboard/amd/serengeti_cheetah_fam10/Kconfig
View File

@ -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

1
src/mainboard/amd/torpedo/Kconfig
View File

@ -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

1
src/mainboard/asrock/e350m1/Kconfig
View File

@ -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

1
src/mainboard/asus/m2v-mx_se/Kconfig
View File

@ -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

1
src/mainboard/asus/m2v/Kconfig
View File

@ -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

1
src/mainboard/avalue/eax-785e/Kconfig
View File

@ -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

1
src/mainboard/digitallogic/adl855pc/Kconfig
View File

@ -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

1
src/mainboard/emulation/qemu-x86/Kconfig
View File

@ -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

1
src/mainboard/getac/p470/Kconfig
View File

@ -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

1
src/mainboard/hp/dl165_g6_fam10/Kconfig
View File

@ -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

1
src/mainboard/ibase/mb899/Kconfig
View File

@ -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

1
src/mainboard/intel/d945gclf/Kconfig
View File

@ -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

1
src/mainboard/kontron/986lcd-m/Kconfig
View File

@ -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

1
src/mainboard/lanner/em8510/Kconfig
View File

@ -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

1
src/mainboard/lenovo/t60/Kconfig
View File

@ -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

1
src/mainboard/msi/ms9652_fam10/Kconfig
View File

@ -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

1
src/mainboard/rca/rm4100/Kconfig
View File

@ -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

1
src/mainboard/supermicro/h8dmr_fam10/Kconfig
View File

@ -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

1
src/mainboard/supermicro/h8qgi/Kconfig
View File

@ -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

1
src/mainboard/supermicro/h8qme_fam10/Kconfig
View File

@ -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

1
src/mainboard/thomson/ip1000/Kconfig
View File

@ -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

1
src/mainboard/tyan/s2912_fam10/Kconfig
View File

@ -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

1
src/mainboard/via/vt8454c/Kconfig
View File

@ -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

1
src/southbridge/amd/amd8111/Kconfig
View File

@ -20,7 +20,6 @@
config SOUTHBRIDGE_AMD_AMD8111
bool
select IOAPIC
select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT
string

1
src/southbridge/amd/sb600/Kconfig
View File

@ -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

2
src/southbridge/amd/sb700/Kconfig
View File

@ -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

1
src/southbridge/amd/sb800/Kconfig
View File

@ -21,7 +21,6 @@ config SOUTHBRIDGE_AMD_SB800
bool
select IOAPIC
select HAVE_USBDEBUG
select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT
string

1
src/southbridge/broadcom/bcm5785/Kconfig
View File

@ -1,7 +1,6 @@
config SOUTHBRIDGE_BROADCOM_BCM5785
bool
select HAVE_HARD_RESET
select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT
string

1
src/southbridge/intel/i82371eb/Kconfig
View File

@ -1,6 +1,5 @@
config SOUTHBRIDGE_INTEL_I82371EB
bool
select TINY_BOOTBLOCK
select HAVE_ACPI_RESUME if HAVE_ACPI_TABLES
config BOOTBLOCK_SOUTHBRIDGE_INIT

1
src/southbridge/intel/sch/Kconfig
View File

@ -19,7 +19,6 @@
config SOUTHBRIDGE_INTEL_SCH
bool
select TINY_BOOTBLOCK
select HAVE_USBDEBUG
if SOUTHBRIDGE_INTEL_SCH

1
src/southbridge/nvidia/ck804/Kconfig
View File

@ -3,7 +3,6 @@ config SOUTHBRIDGE_NVIDIA_CK804
select HAVE_HARD_RESET
select HAVE_USBDEBUG
select IOAPIC
select TINY_BOOTBLOCK
if SOUTHBRIDGE_NVIDIA_CK804

1
src/southbridge/nvidia/mcp55/Kconfig
View File

@ -2,7 +2,6 @@ config SOUTHBRIDGE_NVIDIA_MCP55
bool
select HAVE_USBDEBUG
select IOAPIC
select TINY_BOOTBLOCK
if SOUTHBRIDGE_NVIDIA_MCP55

1
src/southbridge/sis/sis966/Kconfig
View File

@ -2,7 +2,6 @@ config SOUTHBRIDGE_SIS_SIS966
bool
select IOAPIC
select HAVE_USBDEBUG
select TINY_BOOTBLOCK
config BOOTBLOCK_SOUTHBRIDGE_INIT
string