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

Fix some conflicting types of variables 

Remove the normal/* files from the image. they're just
copies of fallback/* anyway.

Signed-off-by: Patrick Georgi <patrick.georgi@coresystems.de>
Acked-by: Ronald G. Minnich <rminnich@gmail.com>


git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4541 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
Patrick Georgi 2009-08-13 07:33:55 +00:00
parent b6e03200a4
commit a5c8bb39b5
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/arch/i386/Makefile.inc
View File

@ -14,7 +14,6 @@ ifdef POST_EVALUATION
$(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL) $(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL)
$(Q)rm -f $@ $(Q)rm -f $@
$(Q)$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) 131072 $(obj)/coreboot.bootblock $(Q)$(CBFSTOOL) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) 131072 $(obj)/coreboot.bootblock
$(Q)$(CBFSTOOL) $@ add-stage $(obj)/coreboot_ram normal/coreboot_ram $(CBFS_COMPRESS_FLAG)
$(Q)if [ -f fallback/coreboot_apc ]; \ $(Q)if [ -f fallback/coreboot_apc ]; \
then \ then \
$(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \ $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
@ -25,8 +24,6 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y)
else else
printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n" printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
$(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_COMPRESS_FLAG) $(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_FALLBACK_PAYLOAD_FILE) fallback/payload $(CBFS_COMPRESS_FLAG)
printf " PAYLOAD $(CONFIG_NORMAL_PAYLOAD_FILE) $(COMPRESSFLAG)\n"
$(Q)$(CBFSTOOL) ./build/coreboot.rom add-payload $(CONFIG_NORMAL_PAYLOAD_FILE) normal/payload $(CBFS_COMPRESS_FLAG)
$(CBFSTOOL) ./build/coreboot.rom print $(CBFSTOOL) ./build/coreboot.rom print
endif endif

8
src/cpu/amd/model_fxx/Kconfig
View File

@ -1,10 +1,10 @@
config HAVE_INIT_TIMER config HAVE_INIT_TIMER
int bool
default 1 default y
config HAVE_MOVNTI config HAVE_MOVNTI
int bool
default 1 default y
config CPU_ADDR_BITS config CPU_ADDR_BITS
int int

12
src/mainboard/amd/serengeti_cheetah/Kconfig
View File

@ -49,13 +49,13 @@ config APIC_ID_OFFSET
depends on BOARD_AMD_SERENGETI_CHEETAH depends on BOARD_AMD_SERENGETI_CHEETAH
config HAVE_HARD_RESET config HAVE_HARD_RESET
int bool
default 1 default y
depends on BOARD_AMD_SERENGETI_CHEETAH depends on BOARD_AMD_SERENGETI_CHEETAH
config IOAPIC config IOAPIC
int bool
default 1 default y
depends on BOARD_AMD_SERENGETI_CHEETAH depends on BOARD_AMD_SERENGETI_CHEETAH
config SB_HT_CHAIN_ON_BUS0 config SB_HT_CHAIN_ON_BUS0
@ -164,8 +164,8 @@ config USE_INIT
depends on BOARD_AMD_SERENGETI_CHEETAH depends on BOARD_AMD_SERENGETI_CHEETAH
config SERIAL_CPU_INIT config SERIAL_CPU_INIT
int bool
default 0 default n
depends on BOARD_AMD_SERENGETI_CHEETAH depends on BOARD_AMD_SERENGETI_CHEETAH
config AP_CODE_IN_CAR config AP_CODE_IN_CAR

6
src/northbridge/amd/amdk8/Kconfig
View File

@ -26,8 +26,8 @@ config AGP_APERTURE_SIZE
default 0x4000000 default 0x4000000
config HAVE_HIGH_TABLES config HAVE_HIGH_TABLES
int bool
default 1 default y
source src/northbridge/amd/amdk8/root_complex/Kconfig source src/northbridge/amd/amdk8/root_complex/Kconfig