diff options
| author | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-08-13 07:33:55 +0000 |
|---|---|---|
| committer | Patrick Georgi <patrick.georgi@coresystems.de> | 2009-08-13 07:33:55 +0000 |
| commit | a5c8bb39b5ec7d971971a56ecf386a71a2bc5a32 (patch) | |
| tree | 65cef9c27e7f696d8a641c3dc9950bd1c02c7982 | |
| parent | b6e03200a49d2f682633d102a193afc98e38594b (diff) | |
| download | coreboot-a5c8bb39b5ec7d971971a56ecf386a71a2bc5a32.tar.xz | |
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
| -rw-r--r-- | src/arch/i386/Makefile.inc | 3 | ||||
| -rw-r--r-- | src/cpu/amd/model_fxx/Kconfig | 8 | ||||
| -rw-r--r-- | src/mainboard/amd/serengeti_cheetah/Kconfig | 12 | ||||
| -rw-r--r-- | src/northbridge/amd/amdk8/Kconfig | 6 |
4 files changed, 13 insertions, 16 deletions
diff --git a/src/arch/i386/Makefile.inc b/src/arch/i386/Makefile.inc index 4195183f8d..ecfa7dc619 100644 --- a/src/arch/i386/Makefile.inc +++ b/src/arch/i386/Makefile.inc @@ -14,7 +14,6 @@ ifdef POST_EVALUATION $(obj)/coreboot.rom: $(obj)/coreboot.bootblock $(obj)/coreboot_ram $(CBFSTOOL) $(Q)rm -f $@ $(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 ]; \ then \ $(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \ @@ -25,8 +24,6 @@ ifeq ($(CONFIG_PAYLOAD_NONE),y) else printf " PAYLOAD $(CONFIG_FALLBACK_PAYLOAD_FILE) $(COMPRESSFLAG)\n" $(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 endif diff --git a/src/cpu/amd/model_fxx/Kconfig b/src/cpu/amd/model_fxx/Kconfig index f397c3ea98..db9f5c5a2e 100644 --- a/src/cpu/amd/model_fxx/Kconfig +++ b/src/cpu/amd/model_fxx/Kconfig @@ -1,10 +1,10 @@ config HAVE_INIT_TIMER - int - default 1 + bool + default y config HAVE_MOVNTI - int - default 1 + bool + default y config CPU_ADDR_BITS int diff --git a/src/mainboard/amd/serengeti_cheetah/Kconfig b/src/mainboard/amd/serengeti_cheetah/Kconfig index 3a64d0805a..b148558e46 100644 --- a/src/mainboard/amd/serengeti_cheetah/Kconfig +++ b/src/mainboard/amd/serengeti_cheetah/Kconfig @@ -49,13 +49,13 @@ config APIC_ID_OFFSET depends on BOARD_AMD_SERENGETI_CHEETAH config HAVE_HARD_RESET - int - default 1 + bool + default y depends on BOARD_AMD_SERENGETI_CHEETAH config IOAPIC - int - default 1 + bool + default y depends on BOARD_AMD_SERENGETI_CHEETAH config SB_HT_CHAIN_ON_BUS0 @@ -164,8 +164,8 @@ config USE_INIT depends on BOARD_AMD_SERENGETI_CHEETAH config SERIAL_CPU_INIT - int - default 0 + bool + default n depends on BOARD_AMD_SERENGETI_CHEETAH config AP_CODE_IN_CAR diff --git a/src/northbridge/amd/amdk8/Kconfig b/src/northbridge/amd/amdk8/Kconfig index 181f1c219a..a7e56d0e46 100644 --- a/src/northbridge/amd/amdk8/Kconfig +++ b/src/northbridge/amd/amdk8/Kconfig @@ -26,8 +26,8 @@ config AGP_APERTURE_SIZE default 0x4000000 config HAVE_HIGH_TABLES - int - default 1 + bool + default y -source src/northbridge/amd/amdk8/root_complex/Kconfig
\ No newline at end of file +source src/northbridge/amd/amdk8/root_complex/Kconfig |