new config format

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@977 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1

2 files changed, 55 insertions, 16 deletions

diff --git a/src/mainboard/motorola/sandpoint/Config.lb b/src/mainboard/motorola/sandpoint/Config.lb
index dec1ea77f0..f5e6c17a50 100644
--- a/src/mainboard/motorola/sandpoint/Config.lb
+++ b/src/mainboard/motorola/sandpoint/Config.lb
@@ -2,6 +2,32 @@
 ## Config file for the Motorola Sandpoint III development system.
 ## Note that this has only been tested with the Altimus 7410 PMC.
 ##
+uses CONFIG_SANDPOINT_ALTIMUS
+uses CONFIG_SANDPOINT_TALUS
+uses CONFIG_SANDPOINT_UNITY
+uses CONFIG_SANDPOINT_VALIS
+uses CONFIG_SANDPOINT_GYRUS
+
+arch ppc end
+
+if CONFIG_SANDPOINT_ALTIMUS
+	pmc altimus/mpc7410 end
+#	pmc altimus/mpc7400 end
+#	pmc altimus/mpc75x end
+end
+if CONFIG_SANDPOINT_TALUS
+	pmc talus/mpc74x end
+	pmc talus/mpc603 end
+end
+if CONFIG_SANDPOINT_UNITY
+	pmc unity/mpc824x end
+end
+if CONFIG_SANDPOINT_VALIS
+	pmc valis/mpc745x end
+end
+if CONFIG_SANDPOINT_GYRUS
+	pmc gyrus/mpc744x end
+end
 
 ##
 ## Include the secondary Configuration files 
@@ -19,3 +45,6 @@ object sandpoint.o
 
 dir nvram
 dir flash
+
+addaction linuxbios.a "$(CROSS_COMPILE)ranlib linuxbios.a"
+makedefine CFLAGS += -g
diff --git a/targets/motorola/sandpoint/Config.lb b/targets/motorola/sandpoint/Config.lb
index a1fdd2a86e..356b81f269 100644
--- a/targets/motorola/sandpoint/Config.lb
+++ b/targets/motorola/sandpoint/Config.lb
@@ -6,13 +6,25 @@ loadoptions
 
 target sandpoint
 
-uses ARCH CROSS_COMPILE HAVE_OPTION_TABLE
-uses CONFIG_COMPRESS NO_POST
-uses CONFIG_IDE_STREAM IDE_BOOT_DRIVE
-uses USE_ELF_BOOT IDE_SWAB IDE_OFFSET 
-uses ROM_SIZE ROM_IMAGE_SIZE ROM_SECTION_SIZE ROM_SECTION_OFFSET _ROMBASE
-uses CACHE_RAM_BASE CACHE_RAM_SIZE STACK_SIZE HEAP_SIZE
-uses MAINBOARD MAINBOARD_PART_NUMBER MAINBOARD_VENDOR
+uses ARCH CROSS_COMPILE 
+uses HAVE_OPTION_TABLE
+uses CONFIG_SANDPOINT_ALTIMUS 
+uses CONFIG_COMPRESS 
+uses NO_POST
+uses CONFIG_IDE_STREAM 
+uses IDE_BOOT_DRIVE
+uses USE_ELF_BOOT 
+uses IDE_SWAB IDE_OFFSET 
+uses ROM_SIZE ROM_IMAGE_SIZE 
+uses ROM_SECTION_SIZE 
+uses ROM_SECTION_OFFSET 
+uses _ROMBASE
+uses CACHE_RAM_BASE 
+uses CACHE_RAM_SIZE 
+uses STACK_SIZE HEAP_SIZE
+uses MAINBOARD 
+uses MAINBOARD_PART_NUMBER 
+uses MAINBOARD_VENDOR
 
 ## use a cross compiler
 option CROSS_COMPILE="powerpc-eabi-"
@@ -32,9 +44,6 @@ option IDE_OFFSET=0
 
 option ROM_SIZE=1048576
 
-## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
-option ROM_IMAGE_SIZE=49152
-
 ## LinuxBIOS C code runs at this location in RAM
 option _RAMBASE=0x00100000
 
@@ -65,11 +74,12 @@ option ROM_SECTION_OFFSET=0
 option _ROMBASE=0xfff00000
 
 # Sandpoint Demo Board
-mainboard motorola/sandpoint
-	arch ppc end
-	pmc altimus/mpc7410 end
-
-	addaction linuxbios.a "$(CROSS_COMPILE)ranlib linuxbios.a"
+romimage "normal"
+	## ROM_IMAGE_SIZE is the amount of space to allow linuxBIOS to occupy.
+	option ROM_IMAGE_SIZE=49152
+	option CONFIG_SANDPOINT_ALTIMUS=1
 
-	makedefine CFLAGS += -g
+	mainboard motorola/sandpoint
 end
+
+buildrom ROM_SIZE "normal"