r229 - in buildrom-devel: config/platforms packages/grub2 packages/roms

Author: jcrouse
Date: 2008-09-22 22:56:04 +0200 (Mon, 22 Sep 2008)
New Revision: 229

Modified:
   buildrom-devel/config/platforms/Config.in
   buildrom-devel/config/platforms/platforms.conf
   buildrom-devel/packages/grub2/grub2.mk
   buildrom-devel/packages/roms/roms.mk
Log:
Add AMD dbm690t mainboard to buildrom.
The dbm690t uses an embedded VBIOS which buildrom can attach to the ROM image.

Signed-off-by: Marc Jones 
Signed-off-by: Jordan Crouse 
Acked-by: Ward Vandewege

Modified: buildrom-devel/config/platforms/Config.in
===================================================================
--- buildrom-devel/config/platforms/Config.in	2008-09-18 16:30:48 UTC (rev 228)
+++ buildrom-devel/config/platforms/Config.in	2008-09-22 20:56:04 UTC (rev 229)
@@ -164,6 +164,12 @@
    depends on COREBOOT_V2
    select PLATFORM
    select PLATFORM_SUPPORT_64BIT
+
+config PLATFORM_DBM690T
+        bool "AMD dbM690T"
+        depends on VENDOR_AMD
+        select PLATFORM
+        select PLATFORM_SUPPORT_64BIT
 endchoice

choice
@@ -208,4 +214,35 @@
      Say 'y' here to patch the build to work on an
      emulated platform in the AMD SimNow (TM) simulator

+config AMD_R690_HEADLESS
+	bool "Build the R690 platform as headless (without VGA)"
+	depends on ADVANCED && PLATFORM_DBM690T
+	default n
+	help
+	  Say 'y' here to build without the VGA BIOS for the
+	  R690 chipset.  This will result in no video graphics
+	  for the platform.  This is not likely what you want,
+	  so you should say 'n' here unless you are absolutely
+	  sure.
+
+config AMD_R690_USE_VBIOS
+	bool
+	depends on !AMD_R690_HEADLESS
+	default y
+
+config AMD_R690_CUSTOM_VBIOS
+	bool "Specify a custom location for the R690 video BIOS"
+	depends on AMD_R690_USE_VBIOS
+	help
+	  Say 'y' here to specify a custom location for the R690
+	  video BIOS file.  Otherwise, it will be looked for in a
+	  default location.
+
+config AMD_R690_VBIOS
+	string "Location of the RS690 Video BIOS file"
+	depends on AMD_R690_CUSTOM_VBIOS
+	default ""
+	help
+	  Specify the full pathname for your RS690 video BIOS file
+
 endmenu

Modified: buildrom-devel/config/platforms/platforms.conf
===================================================================
--- buildrom-devel/config/platforms/platforms.conf	2008-09-18 16:30:48 UTC (rev 228)
+++ buildrom-devel/config/platforms/platforms.conf	2008-09-22 20:56:04 UTC (rev 229)
@@ -27,6 +27,7 @@
 PLATFORM-$(CONFIG_PLATFORM_CHEETAH_FAM10) = serengeti_cheetah.conf
 PLATFORM-$(CONFIG_PLATFORM_GA_2761GXDK) = ga-2761gxdk.conf
 PLATFORM-$(CONFIG_PLATFORM_QEMU-X86) = qemu.conf
+PLATFORM-$(CONFIG_PLATFORM_DBM690T) = dbm690t.conf

include $(CONFIG_DIR)/platforms/$(PLATFORM-y)

@@ -35,3 +36,5 @@

# For those platforms that have option roms, add the following line
 #DEPENDS-$(MYPLATFORM) += roms
+
+DEPENDS-$(CONFIG_PLATFORM_DBM690T) += roms

Modified: buildrom-devel/packages/grub2/grub2.mk
===================================================================
--- buildrom-devel/packages/grub2/grub2.mk	2008-09-18 16:30:48 UTC (rev 228)
+++ buildrom-devel/packages/grub2/grub2.mk	2008-09-22 20:56:04 UTC (rev 229)
@@ -22,11 +22,13 @@
          serial terminal lar terminfo memdisk ata ls \
               configfile boot hexdump linux multiboot ext2

+ifeq ($(CONFIG_PAYLOAD_GRUB2),y)
 HAVE_RUBY:=$(call find-tool,ruby)

ifeq ($(HAVE_RUBY),n)
 $(error To build GRUB2, you need to install 'ruby')
 endif
+endif

$(SOURCE_DIR)/$(GRUB2_TAR):
    @ mkdir -p $(SOURCE_DIR)

Modified: buildrom-devel/packages/roms/roms.mk
===================================================================
--- buildrom-devel/packages/roms/roms.mk	2008-09-18 16:30:48 UTC (rev 228)
+++ buildrom-devel/packages/roms/roms.mk	2008-09-22 20:56:04 UTC (rev 229)
@@ -1,12 +1,13 @@
 # Each platform that needs an option ROM or other binary blob is specified
 # here

-OPTIONROM_TARGETS?=
+OPTIONROM_TARGETS ?=

-OPTIONROM-y =
+OPTIONROMS-y =
+OPTIONROMS-$(CONFIG_PLATFORM_DBM690T) += $(PACKAGE_DIR)/roms/amd_r690.mk

ifneq ($(OPTIONROMS-y),)
-include $(OPTIONROM-y)
+include $(OPTIONROMS-y)
 endif

$(ROM_DIR):
@@ -15,8 +16,5 @@
 roms: $(ROM_DIR) $(OPTIONROM_TARGETS)

roms-clean:
-ifneq ($(OPTIONROM_TARGETS),)
-	@ rm -rf $(OPTIONROM_TARGETS)
-endif

-roms-distclean: roms-clean
+roms-distclean: