[LinuxBIOS] [patch 0/6] BuildROM updates

Hey all - following are some updates for BuildROM, including support
for the DB800 from Marc Jones.  Enjoy.

Jordan

[LinuxBIOS] [patch 1/6] Do a sanity check in fetchsvn and bail out if SVN is not installed.

Signed-off-by: Jordan Crouse 
Index: buildrom/bin/fetchsvn.sh
===================================================================
--- buildrom.orig/bin/fetchsvn.sh	2007-06-12 15:55:54.000000000 -0600
+++ buildrom/bin/fetchsvn.sh	2007-06-12 15:56:00.000000000 -0600
@@ -6,6 +6,13 @@
 REV=$3
 TARBALL=$4

+SVNV=`svn --version --quiet`
+
+if [ $? -ne 0 ]; then
+	echo "You don't have SVN installed."
+	exit 1
+fi
+
 # Simple case - the repository doesn't exist

if [ ! -d $DIR/svn/.svn ]; then

[LinuxBIOS] [patch 2/6] Bump the Norwich revision to the current HEAD ( grabbing any DB800 changes)

Signed-off-by: Jordan Crouse 
Index: buildrom/config/platforms/norwich.conf
===================================================================
--- buildrom.orig/config/platforms/norwich.conf	2007-06-14 10:43:33.000000000 -0600
+++ buildrom/config/platforms/norwich.conf	2007-06-14 11:08:45.000000000 -0600
@@ -30,7 +30,7 @@
 LINUXBIOS_BOARD=norwich
 LINUXBIOS_CONFIG=Config.lb
 LINUXBIOS_TDIR=norwich
-LINUXBIOS_TAG=2376
+LINUXBIOS_TAG=2722
 LINUXBIOS_ROM_NAME=norwich.rom

# FILO configuration

[LinuxBIOS] [patch 3/6] Allow the user to specify an arbitrary LinuxBIOS revision, overriding the value in the configuration file.

Signed-off-by: Jordan Crouse 
Index: buildrom/Config.in
===================================================================
--- buildrom.orig/Config.in	2007-06-12 15:59:38.000000000 -0600
+++ buildrom/Config.in	2007-06-12 15:59:51.000000000 -0600
@@ -43,6 +43,18 @@
    string "LinuxBIOS build directory"
    depends LB_USE_BUILD

+config LB_CUSTOM_REV
+	bool "Override the platform LinuxBIOS revision"
+	depends ADVANCED && !LB_USE_BUILD
+	default n
+	help
+	  Say 'y' here to overide the default LinuxBIOS SVN revsion
+  	  from the platform configuration
+
+config LB_REVISION
+	string "LinuxBIOS revision"
+	depends LB_CUSTOM_REV
+
 endmenu

config PLATFORM
Index: buildrom/config/platforms/platforms.conf
===================================================================
--- buildrom.orig/config/platforms/platforms.conf	2007-06-12 15:58:51.000000000 -0600
+++ buildrom/config/platforms/platforms.conf	2007-06-12 15:59:08.000000000 -0600
@@ -11,3 +11,14 @@
 PLATFORM-$(CONFIG_PLATFORM_MSM800SEV) = msm800sev.conf

include $(CONFIG_DIR)/platforms/$(PLATFORM-y)
+
+ifeq ($(CONFIG_LB_CUSTOM_REV),y)
+ifneq ($(CONFIG_LB_REVISION),)
+_LB=$(subst ",,$(CONFIG_LB_REVISION))
+ifneq ($(LINUXBIOS_TAG),)
+$(warning Overriding LinuxBIOS revision $(LINUXBIOS_TAG) with $(_LB))
+endif
+LINUXBIOS_TAG := $(_LB)
+endif
+endif
+

[LinuxBIOS] [patch 4/6] Fix a bug in the FILO download target

Signed-off-by: Jordan Crouse 
Index: buildrom/packages/filo/filo.mk
===================================================================
--- buildrom.orig/packages/filo/filo.mk	2007-06-12 16:07:18.000000000 -0600
+++ buildrom/packages/filo/filo.mk	2007-06-12 16:08:11.000000000 -0600
@@ -22,7 +22,7 @@

$(SOURCE_DIR)/$(FILO_TARBALL): 
    @ mkdir -p $(SOURCE_DIR)/filo
-	@ $(BIN_DIR)/fetchsvn.sh $(FILO_URL) $(SOURCE_DIR)/linuxbios \
+	@ $(BIN_DIR)/fetchsvn.sh $(FILO_URL) $(SOURCE_DIR)/filo \
    $(FILO_TAG) $(SOURCE_DIR)/$(FILO_TARBALL) \
    > $(FILO_FETCH_LOG) 2>&1

[LinuxBIOS] [patch 5/6] Add platform support for the db800 "salsa".

Signed-off-by: Marc Jones 
Signed-off-by: Jordan Crouse

Index: buildrom/config/platforms/db800.conf
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ buildrom/config/platforms/db800.conf	2007-06-14 11:09:03.000000000 -0600
@@ -0,0 +1,39 @@
+# Support for the AMD Geode 'norwich' platform
+# This should really work for any LX platform
+
+#### Platform configuration
+
+CC=gcc
+STRIP=strip
+AS=as
+
+TARGET_ARCH=i586
+CFLAGS_platform =
+
+# Targets
+
+KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk
+LINUXBIOS_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk
+
+# kernel configuration (for LAB)
+
+KERNEL_VERSION=2.6.20.2
+KERNEL_CONFIG=$(PACKAGE_DIR)/kernel/conf/norwich-defconfig
+UCLIBC_ARCH=i386
+
+# Etherboot configuration
+ETHERBOOT_ARCH=i386
+
+# LinuxBIOS configuration
+
+LINUXBIOS_VENDOR=amd
+LINUXBIOS_BOARD=db800
+LINUXBIOS_CONFIG=Config.lb
+LINUXBIOS_TDIR=db800
+LINUXBIOS_TAG=2722
+LINUXBIOS_ROM_NAME=db800.rom
+
+# FILO configuration
+
+FILO_CONFIG=db800-Config
+
Index: buildrom/config/platforms/Config.in
===================================================================
--- buildrom.orig/config/platforms/Config.in	2007-06-14 10:43:32.000000000 -0600
+++ buildrom/config/platforms/Config.in	2007-06-14 11:08:54.000000000 -0600
@@ -18,5 +18,9 @@
        bool "Digital Logic msm800sev"
        select PLATFORM

+config PLATFORM_DB800
+       bool "AMD DB800"
+       select PLATFORM
+
 endchoice
 endmenu
Index: buildrom/config/platforms/platforms.conf
===================================================================
--- buildrom.orig/config/platforms/platforms.conf	2007-06-14 11:08:49.000000000 -0600
+++ buildrom/config/platforms/platforms.conf	2007-06-14 11:08:54.000000000 -0600
@@ -9,7 +9,7 @@
 PLATFORM-$(CONFIG_PLATFORM_NORWICH) = norwich.conf
 PLATFORM-$(CONFIG_PLATFORM_OLPC) = olpc.conf
 PLATFORM-$(CONFIG_PLATFORM_MSM800SEV) = msm800sev.conf
-
+PLATFORM-$(CONFIG_PLATFORM_DB800) = db800.conf
 include $(CONFIG_DIR)/platforms/$(PLATFORM-y)

ifeq ($(CONFIG_LB_CUSTOM_REV),y)
Index: buildrom/packages/filo/conf/db800-Config
===================================================================
--- /dev/null	1970-01-01 00:00:00.000000000 +0000
+++ buildrom/packages/filo/conf/db800-Config	2007-06-14 11:08:54.000000000 -0600
@@ -0,0 +1,101 @@
+# !!! NOTE !!!
+# Do NOT add spaces or comments at the end of option lines.
+# It confuses some versions of make.
+
+# Use grub instead of autoboot?
+USE_GRUB = 1
+
+# Grub menu.lst path
+MENULST_FILE = "hda1:/boot/menu.lst"
+# Via Epia-MII CF boot:
+#MENULST_FILE = "hde1:/boot/filo/menu.lst"
+
+# time before default menu.lst is chosen. Set to 0 to ignore
+MENULST_TIMEOUT = 10
+
+# Image filename for automatic boot and optional command line parameter
+AUTOBOOT_FILE = "hda1:/vmlinuz root=/dev/hda1 console=tty0 console=ttyS0,115200"
+#AUTOBOOT_FILE = "mem@0xfff80000"
+#AUTOBOOT_FILE = "hde1@0"
+#AUTOBOOT_FILE = "uda1:/vmlinuz.elf"
+
+# Time in second before booting AUTOBOOT_FILE
+AUTOBOOT_DELAY = 2
+
+# 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)
+# NOTE: Slows down access significantly, so disable
+# whenever possible.
+#IDE_DISK_POLL_DELAY = 1
+
+# Use PCMCIA compact flash on Via Epia MII10000 and MII6000E
+# This device is referred to as hde.
+#PCMCIA_CF = 1
+
+# Driver for USB Storage
+# USB_DISK = 1
+
+# VGA text console
+# VGA_CONSOLE = 1
+# PC_KEYBOARD = 1
+
+# Serial console
+SERIAL_CONSOLE = 1
+SERIAL_IOBASE = 0x3f8
+# if SERIAL_SPEED is commented out, the speed will not be changed.
+#SERIAL_SPEED = 115200
+
+# Filesystems
+FSYS_EXT2FS = 1
+FSYS_FAT = 1
+#FSYS_JFS = 1
+#FSYS_MINIX = 1
+FSYS_REISERFS = 1
+#FSYS_XFS = 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
+
+# Sound support (needs SUPPORT_PCI)
+#SUPPORT_SOUND = 1
+
+# Sound drivers
+#VIA_SOUND = 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
+
+# i386 options
+
+# Loader for standard Linux kernel image, a.k.a. /vmlinuz
+LINUX_LOADER = 1
+
+# Boot FILO from Multiboot loader (eg. GRUB)
+#MULTIBOOT_IMAGE = 1
+

[LinuxBIOS] [patch 5/6] Add platform support for the db800 "salsa".

[Peter Stuge]

On Thu, Jun 14, 2007 at 11:16:38AM -0600, [e-mail] wrote:
> +++ buildrom/config/platforms/db800.conf	2007-06-14 11:09:03.000000000 -0600
> @@ -0,0 +1,39 @@
> +# Support for the AMD Geode 'norwich' platform

Is this for the norwich or the db800?
> +KERNEL_MK=$(PACKAGE_DIR)/kernel/norwich-kernel.mk
> +LINUXBIOS_MK=$(PACKAGE_DIR)/linuxbios/norwich-linuxbios.mk

..
> +LINUXBIOS_VENDOR=amd
> +LINUXBIOS_BOARD=db800

If there is reuse going on please write a few words about that and
why it is possible. (Along the lines of "The norwich code tries to be
really generic so it can be reused a lot" maybe?)
> +++ buildrom/config/platforms/platforms.conf	2007-06-14 11:08:54.000000000 -0600
> @@ -9,7 +9,7 @@
>  PLATFORM-$(CONFIG_PLATFORM_NORWICH) = norwich.conf
>  PLATFORM-$(CONFIG_PLATFORM_OLPC) = olpc.conf
>  PLATFORM-$(CONFIG_PLATFORM_MSM800SEV) = msm800sev.conf
>
> +PLATFORM-$(CONFIG_PLATFORM_DB800) = db800.conf

Ah so there is already norwich support. Please mention why it can be
reused.
> +++ buildrom/packages/filo/conf/db800-Config	2007-06-14 11:08:54.000000000 -0600

Perhaps this could reuse some norwich stuff too?

//Peter

[LinuxBIOS] [patch 6/6] Fix the targets a bit so that they do the right thing with payloads.

Signed-off-by: Jordan Crouse

Index: buildrom/packages/etherboot/etherboot.mk
===================================================================
--- buildrom.orig/packages/etherboot/etherboot.mk	2007-06-12 16:11:05.000000000 -0600
+++ buildrom/packages/etherboot/etherboot.mk	2007-06-13 05:55:09.000000000 -0600
@@ -53,7 +53,7 @@

etherboot: $(ETHERBOOT_STAMP_DIR) $(ETHERBOOT_LOG_DIR) $(ETHERBOOT_OUTPUT) 
    @ mkdir -p $(OUTPUT_DIR)
-	@ cp $(ETHERBOOT_OUTPUT) $(PAYLOAD_TARGET)
+	@ cp $(ETHERBOOT_OUTPUT) $(PAYLOAD_ELF)

etherboot-clean:
    @ echo "Cleaning etherboot..."
Index: buildrom/packages/filo/filo.mk
===================================================================
--- buildrom.orig/packages/filo/filo.mk	2007-06-13 05:55:09.000000000 -0600
+++ buildrom/packages/filo/filo.mk	2007-06-13 05:55:09.000000000 -0600
@@ -50,7 +50,7 @@

filo: $(FILO_STAMP_DIR) $(FILO_LOG_DIR) $(FILO_SRC_DIR)/filo.elf
    @ mkdir -p $(OUTPUT_DIR)
-	@ cp $(FILO_SRC_DIR)/filo.elf $(PAYLOAD_TARGET)
+	@ cp $(FILO_SRC_DIR)/filo.elf $(PAYLOAD_ELF)

filo-clean:
    @ echo "Cleaning filo..."
Index: buildrom/scripts/Makefile.generic
===================================================================
--- buildrom.orig/scripts/Makefile.generic	2007-06-12 16:11:05.000000000 -0600
+++ buildrom/scripts/Makefile.generic	2007-06-13 05:55:09.000000000 -0600
@@ -4,4 +4,4 @@
 $(PAYLOAD_ELF): $(PAYLOAD-y)
 $(PAYLOAD_COMPRESSED): $(PAYLOAD_ELF)
    @ echo "Compressing the ELF payload with lzma..."
-	@ $(STAGING_DIR)/bin/lzma e $< 2> /dev/null $@ 
+	@ $(STAGING_DIR)/bin/lzma e $< $@  2> /dev/null
Index: buildrom/scripts/Makefile.kernel
===================================================================
--- buildrom.orig/scripts/Makefile.kernel	2007-06-12 16:11:05.000000000 -0600
+++ buildrom/scripts/Makefile.kernel	2007-06-13 05:55:09.000000000 -0600
@@ -9,5 +9,5 @@

$(OUTPUT_DIR)/kernel-payload.elf.lzma: $(OUTPUT_DIR)/kernel-payload.elf
    @ echo "Compressing the ELF payload with lzma..."
-	@ $(STAGING_DIR)/bin/lzma e $< 2> /dev/null $@ 
+	@ $(STAGING_DIR)/bin/lzma e $< $@  2> /dev/null
    @ $(BIN_DIR)/checkrom.sh $@

[Stefan Reinauer]

* [e-mail]  [070614 19:16]:
> Hey all - following are some updates for BuildROM, including support
> for the DB800 from Marc Jones.  Enjoy.

Acked-by: Stefan Reinauer

for all of them.

[Peter Stuge]

On Thu, Jun 14, 2007 at 11:16:33AM -0600, [e-mail] wrote:
> Hey all - following are some updates for BuildROM, including support
> for the DB800 from Marc Jones.  Enjoy.

1-4, 6 are

Acked-by: Peter Stuge

separate comments on 5

//Peter