Re: [coreboot] fix alix.1c build for v3

[Jordan Crouse]

On 04/04/08 14:57 -0600, Ward Vandewege wrote:
>
> This fixes v3 build for alix.1c. Tested on real hardware.
>
> Signed-off-by: Ward Vandewege

Acked-by: Jordan Crouse
> Index: config/platforms/alix1c.conf
>
> --- config/platforms/alix1c.conf	(revision 140)
> +++ config/platforms/alix1c.conf	(working copy)
> @@ -32,6 +32,8 @@
>  CBV2_TDIR=alix1c
>  CBV2_TAG=3079
>
> +CBV3_TAG=638
>
> # FILO configuration
>
> FILO_CONFIG=alix1c-Config
> Index: Makefile
> ===================================================================
> --- Makefile	(revision 140)
> +++ Makefile	(working copy)
> @@ -79,10 +79,17 @@
>
> 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)
> Index: packages/filo/conf/alix1c-Config
> ===================================================================
> --- packages/filo/conf/alix1c-Config	(revision 0)
> +++ packages/filo/conf/alix1c-Config	(revision 0)
> @@ -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
> Index: packages/coreboot-v3/coreboot-v3.mk
>
> --- packages/coreboot-v3/coreboot-v3.mk	(revision 140)
> +++ packages/coreboot-v3/coreboot-v3.mk	(working copy)
> @@ -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
>