[coreboot] [v2] r4542 - in trunk/coreboot-v2: src/arch/i386 src/cpu/amd/model_fxx util/cbfstool

[svn at coreboot.org]

Author: oxygene
Date: 2009-08-13 17:29:01 +0200 (Thu, 13 Aug 2009)
New Revision: 4542

Modified:
   trunk/coreboot-v2/src/arch/i386/Makefile.inc
   trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig
   trunk/coreboot-v2/util/cbfstool/util.c
Log:
- AMD selected a couple of options that are incompatible with QEmu (and
probably others). Only select them for AMD

- Make the bootblock smaller (only one copy of it), and don't pad the
bootblock using dd(1), but top-align inside cbfstool, to reduce
dependencies on unix tools.

Signed-off-by: Patrick Georgi <patrick.georgi at coresystems.de>
Acked-by: Stefan Reinauer <stepan at coresystems.de>


Modified: trunk/coreboot-v2/src/arch/i386/Makefile.inc
===================================================================
--- trunk/coreboot-v2/src/arch/i386/Makefile.inc	2009-08-13 07:33:55 UTC (rev 4541)
+++ trunk/coreboot-v2/src/arch/i386/Makefile.inc	2009-08-13 15:29:01 UTC (rev 4542)
@@ -8,12 +8,14 @@
 obj-y += ../../option_table.o
 
 ifdef POST_EVALUATION
+BOOTBLOCK_SIZE=65536
+
 #######################################################################
 # Build the final rom image
 
 $(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) $@ create $(shell expr 1024 \* $(CONFIG_COREBOOT_ROMSIZE_KB)) $(BOOTBLOCK_SIZE) $(obj)/coreboot.bootblock
 	$(Q)if [ -f fallback/coreboot_apc ]; \
 	then \
 		$(CBFSTOOL) $@ add-stage fallback/coreboot_apc fallback/coreboot_apc $(CBFS_COMPRESS_FLAG); \
@@ -31,14 +33,7 @@
 #######################################################################
 # Build the bootblock
 
-BOOTBLOCK_SIZE=65536
-
-$(obj)/coreboot.bootblock: $(obj)/coreboot.strip
-	$(Q)printf "    CREATE     $(subst $(obj)/,,$(@))\n"
-	$(Q)dd if=$< of=$(obj)/coreboot.bootblock.one obs=$(BOOTBLOCK_SIZE) conv=sync
-	$(Q)cat $(obj)/coreboot.bootblock.one $(obj)/coreboot.bootblock.one > $(obj)/coreboot.bootblock
-
-$(obj)/coreboot.strip: $(obj)/coreboot
+$(obj)/coreboot.bootblock: $(obj)/coreboot
 	$(Q)printf "    OBJCOPY    $(subst $(obj)/,,$(@))\n"
 	$(Q)$(OBJCOPY) -O binary $< $@
 

Modified: trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig
===================================================================
--- trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig	2009-08-13 07:33:55 UTC (rev 4541)
+++ trunk/coreboot-v2/src/cpu/amd/model_fxx/Kconfig	2009-08-13 15:29:01 UTC (rev 4542)
@@ -1,13 +1,16 @@
 config HAVE_INIT_TIMER
 	bool
 	default y
+	depends on CPU_AMD_SOCKET_F
 
 config HAVE_MOVNTI
 	bool
 	default y
+	depends on CPU_AMD_SOCKET_F
 
 config CPU_ADDR_BITS
 	int
 	default 40
+	depends on CPU_AMD_SOCKET_F
 
 

Modified: trunk/coreboot-v2/util/cbfstool/util.c
===================================================================
--- trunk/coreboot-v2/util/cbfstool/util.c	2009-08-13 07:33:55 UTC (rev 4541)
+++ trunk/coreboot-v2/util/cbfstool/util.c	2009-08-13 15:29:01 UTC (rev 4542)
@@ -256,7 +256,7 @@
 	}
 
 	/* Copy the bootblock into place at the end of the file */
-	ret = copy_from_fd(fd, ROM_PTR(rom, rom->size - ntohl(rom->header->bootblocksize)), size);
+	ret = copy_from_fd(fd, ROM_PTR(rom, rom->size - size), size);
 
 	close(fd);