Author: oxygene Date: 2009-08-13 09:33:55 +0200 (Thu, 13 Aug 2009) New Revision: 4541
Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig trunk/coreboot-v2/src/northbridge/amd/amdk8/Kconfig Log: 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 <[email protected]> Acked-by: Ronald G. Minnich <[email protected]> Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc =================================================================== --- trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-08-12 20:25:24 UTC (rev 4540) +++ trunk/coreboot-v2/src/arch/i386/Makefile.inc 2009-08-13 07:33:55 UTC (rev 4541) @@ -14,7 +14,6 @@ $(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 @@ 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 Modified: trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig =================================================================== --- trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig 2009-08-12 20:25:24 UTC (rev 4540) +++ trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig 2009-08-13 07:33:55 UTC (rev 4541) @@ -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 Modified: trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig =================================================================== --- trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig 2009-08-12 20:25:24 UTC (rev 4540) +++ trunk/coreboot-v2/src/mainboard/amd/serengeti_cheetah/Kconfig 2009-08-13 07:33:55 UTC (rev 4541) @@ -49,13 +49,13 @@ 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 @@ 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 Modified: trunk/coreboot-v2/src/northbridge/amd/amdk8/Kconfig =================================================================== --- trunk/coreboot-v2/src/northbridge/amd/amdk8/Kconfig 2009-08-12 20:25:24 UTC (rev 4540) +++ trunk/coreboot-v2/src/northbridge/amd/amdk8/Kconfig 2009-08-13 07:33:55 UTC (rev 4541) @@ -26,8 +26,8 @@ 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 -- coreboot mailing list: [email protected] http://www.coreboot.org/mailman/listinfo/coreboot
