[coreboot] r141 - in buildrom-devel: . config/platforms packages/coreboot-v3 packages/filo/conf packages/roms

[svn at coreboot.org]

Author: ward
Date: 2008-04-05 06:28:24 +0200 (Sat, 05 Apr 2008)
New Revision: 141

Added:
   buildrom-devel/packages/filo/conf/alix1c-Config
Modified:
   buildrom-devel/Makefile
   buildrom-devel/config/platforms/alix1c.conf
   buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
   buildrom-devel/packages/roms/roms.mk
Log:


This fixes v3 build for alix.1c. Tested on real hardware.

Signed-off-by: Ward Vandewege <ward at gnu.org>
Acked-by: Jordan Crouse <jordan.crouse at amd.com>



Modified: buildrom-devel/Makefile
===================================================================
--- buildrom-devel/Makefile	2008-03-29 18:22:02 UTC (rev 140)
+++ buildrom-devel/Makefile	2008-04-05 04:28:24 UTC (rev 141)
@@ -76,13 +76,25 @@
 else
 LAR_PAYLOAD_FLAGS=-a
 endif
+	
+ifeq ($(or $(CONFIG_VSA_LEGACY), $(CONFIG_VSA_OPENVSA)),)
+else
+OPTIONROM_TARGETS+=geodevsa
+endif
 
 rom: $(HOSTTOOLS-y) payload $(COREBOOT-y)
 	@ cp $(CBV3_OUTPUT) $(TARGET_ROM_FILE)
-	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS) $(TARGET_ROM_FILE) $(PAYLOAD_TARGET):normal/payload
+	@ $(STAGING_DIR)/bin/lar $(LAR_PAYLOAD_FLAGS) $(TARGET_ROM_FILE) $(CBV3_PAYLOAD_TARGET):normal/payload
+ifeq ($(CONFIG_VSA_LEGACY),y)
+	@ $(STAGING_DIR)/bin/lar -a $(TARGET_ROM_FILE) $(SOURCE_DIR)/amd_vsa_lx_1.01.bin:blob/vsa
+endif
+ifeq ($(CONFIG_VSA_OPENVSA),y)
+	@ echo "Adding OpenVSA: TODO FIXME - let's actually implement this?"
+endif
 	@ for file in `ls $(ROM_DIR)`; do \
 		$(STAGING_DIR)/bin/lar -a $(TARGET_ROM_FILE) $(ROM_DIR)/$$file:$$file; \
 	done
+	@ $(STAGING_DIR)/bin/lar -z $(TARGET_ROM_FILE)
 endif
 
 payload: $(PAYLOAD_TARGET)

Modified: buildrom-devel/config/platforms/alix1c.conf
===================================================================
--- buildrom-devel/config/platforms/alix1c.conf	2008-03-29 18:22:02 UTC (rev 140)
+++ buildrom-devel/config/platforms/alix1c.conf	2008-04-05 04:28:24 UTC (rev 141)
@@ -32,6 +32,8 @@
 CBV2_TDIR=alix1c
 CBV2_TAG=3079
 
+CBV3_TAG=656
+
 # FILO configuration
 
 FILO_CONFIG=alix1c-Config

Modified: buildrom-devel/packages/coreboot-v3/coreboot-v3.mk
===================================================================
--- buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-03-29 18:22:02 UTC (rev 140)
+++ buildrom-devel/packages/coreboot-v3/coreboot-v3.mk	2008-04-05 04:28:24 UTC (rev 141)
@@ -32,6 +32,12 @@
 
 CBV3_PATCHES ?=
 
+CBV3_PAYLOAD_TARGET=$(CBV3_DIR)/payload.elf
+
+$(CBV3_PAYLOAD_TARGET): $(PAYLOAD_TARGET)
+	@ echo $(PAYLOAD_TARGET)
+	@ cp $< $@
+
 $(SOURCE_DIR)/$(CBV3_TARBALL):
 	@ mkdir -p $(SOURCE_DIR)/coreboot-v3
 	@ $(BIN_DIR)/fetchsvn.sh $(CBV3_URL) \
@@ -62,7 +68,7 @@
 endif
 	@ touch $@
 
-$(CBV3_OUTPUT): $(CBV3_STAMP_DIR)/.configured
+$(CBV3_OUTPUT): $(CBV3_STAMP_DIR)/.configured $(CBV3_PAYLOAD_TARGET)
 	@ echo "Building coreboot v3..."
 	@ $(MAKE) -C $(CBV3_SRC_DIR) $(CBV3_ROM_SIZE) > $(CBV3_BUILD_LOG) 2>&1
 

Added: buildrom-devel/packages/filo/conf/alix1c-Config
===================================================================
--- buildrom-devel/packages/filo/conf/alix1c-Config	                        (rev 0)
+++ buildrom-devel/packages/filo/conf/alix1c-Config	2008-04-05 04:28:24 UTC (rev 141)
@@ -0,0 +1,50 @@
+# Use grub instead of autoboot?
+USE_GRUB = 1
+# Grub menu.lst path
+MENULST_FILE = "hda1:/boot/grub/menu.lst"
+# Driver for hard disk, CompactFlash, and CD-ROM on IDE bus
+IDE_DISK = 1
+# Add a short delay when polling status registers
+# (required on some broken SATA controllers)
+IDE_DISK_POLL_DELAY = 1
+# Driver for USB Storage
+USB_DISK = 1
+# VGA text console
+VGA_CONSOLE = 1
+PC_KEYBOARD = 1
+# Enable the serial console
+SERIAL_CONSOLE = 1
+# Serial console; real external serial port
+SERIAL_IOBASE = 0x3f8
+SERIAL_SPEED = 115200
+# Filesystems
+FSYS_EXT2FS = 1
+FSYS_ISO9660 = 1
+# Support for boot disk image in bootable CD-ROM (El Torito)
+ELTORITO = 1
+# PCI support
+SUPPORT_PCI = 1
+# Enable this to scan PCI busses above bus 0
+# AMD64 based boards do need this.
+PCI_BRUTE_SCAN = 1
+# Loader for standard Linux kernel image, a.k.a. /vmlinuz
+LINUX_LOADER = 1
+
+# Debugging
+#DEBUG_ALL = 1
+#DEBUG_ELFBOOT = 1
+#DEBUG_ELFNOTE = 1
+#DEBUG_LINUXBIOS = 1
+#DEBUG_MALLOC = 1
+#DEBUG_MULTIBOOT = 1
+#DEBUG_SEGMENT = 1
+#DEBUG_SYS_INFO = 1
+#DEBUG_TIMER = 1
+#DEBUG_BLOCKDEV = 1
+#DEBUG_PCI = 1
+#DEBUG_VIA_SOUND = 1
+#DEBUG_LINUXLOAD = 1
+#DEBUG_IDE = 1
+#DEBUG_USB = 1
+#DEBUG_ELTORITO = 1
+

Modified: buildrom-devel/packages/roms/roms.mk
===================================================================
--- buildrom-devel/packages/roms/roms.mk	2008-03-29 18:22:02 UTC (rev 140)
+++ buildrom-devel/packages/roms/roms.mk	2008-04-05 04:28:24 UTC (rev 141)
@@ -2,7 +2,7 @@
 # here
 
 
-OPTIONROM_TARGETS=
+OPTIONROM_TARGETS?=
 
 OPTIONROM-y =
 OPTIONROM-$(CONFIG_PLATFORM_NORWICH) += rom-geode.inc