summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/mainboard/arima/hdama/Config.lb2
-rw-r--r--targets/arima/hdama/Config.lb43
2 files changed, 20 insertions, 25 deletions
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index 76cec53210..77e68701d8 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -141,3 +141,5 @@ cpu p5 end
cpu p6 end
cpu k7 end
cpu k8 end
+
+makedefine CFLAGS += -g
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index cb21b6e4ab..0cceb92a47 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -63,13 +63,6 @@ option SIO_BASE=0x2e
option SIO_SYSTEM_CLK_INPUT=0
#
###
-### Build code for the fallback boot
-###
-# at some point it will be possible to set both of these to 1.
-option HAVE_FALLBACK_BOOT=0
-option USE_NORMAL_IMAGE=0
-#
-###
### Build code to export a programmable irq routing table
###
option HAVE_PIRQ_TABLE=1
@@ -117,27 +110,12 @@ option ENABLE_FIXED_AND_VARIABLE_MTRRS=1
### Call the final_mainboard_fixup function
###
option FINAL_MAINBOARD_FIXUP=1
-option USE_FALLBACK_IMAGE=1
###
-### Only use the option table in a normal image
-###
-option USE_OPTION_TABLE=!USE_FALLBACK_IMAGE
-#
-###
### Compute the location and size of where this firmware image
### (linuxBIOS plus bootloader) will live in the boot rom chip.
###
#option FALLBACK_SIZE=524288
-if USE_FALLBACK_IMAGE
- print "Using fallback ROM setup"
- option ROM_SECTION_SIZE = FALLBACK_SIZE
- option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
-end
-if USE_NORMAL_IMAGE
- option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
- option ROM_SECTION_OFFSET= 0
-end
###
### Compute where this copy of linuxBIOS will start in the boot rom
###
@@ -185,9 +163,24 @@ option PAYLOAD_SIZE = (ROM_SECTION_SIZE - ROM_IMAGE_SIZE)
option CONFIG_ROM_STREAM_START = (0xffffffff - ROM_SIZE + ROM_SECTION_OFFSET + 1)
option CONFIG_ROM_STREAM = 1
option _ROMBASE = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
+
#
# Arima hdama
-mainboard arima/hdama
- makedefine CFLAGS += -g
- payload ../eepro100.ebi
+romimage "normal"
+ option USE_FALLBACK_IMAGE=0
+ option ROM_SECTION_SIZE = (ROM_SIZE - FALLBACK_SIZE)
+ option ROM_SECTION_OFFSET= 0
+ mainboard arima/hdama
+ payload ../eepro100.ebi
end
+
+romimage "fallback"
+ option USE_FALLBACK_IMAGE=1
+ option HAVE_FALLBACK_BOOT=1
+ option ROM_SECTION_SIZE = FALLBACK_SIZE
+ option ROM_SECTION_OFFSET= (ROM_SIZE - FALLBACK_SIZE)
+ mainboard arima/hdama
+ payload ../eepro100.ebi
+end
+
+buildrom ROM_SIZE "normal" "fallback"