summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald G. Minnich <rminnich@gmail.com>2003-06-24 22:51:16 +0000
committerRonald G. Minnich <rminnich@gmail.com>2003-06-24 22:51:16 +0000
commited27a5e5474b0c23dbedca9519f72265a8f1cf51 (patch)
tree8512216396179f442157576b07b17d4709dbfc7e
parentcb18b80e38c34238279d5fe3584e9ee500df9201 (diff)
needed rules for DRIVER
more fixes to various Config.lb one last problem and we're there git-svn-id: svn://svn.coreboot.org/coreboot/trunk@911 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
-rw-r--r--src/config/Config.lb2
-rw-r--r--src/mainboard/arima/hdama/Config.lb2
-rw-r--r--targets/arima/hdama/Config.lb3
-rw-r--r--util/newconfig/config.g3
4 files changed, 7 insertions, 3 deletions
diff --git a/src/config/Config.lb b/src/config/Config.lb
index 86c58d0654..b1881dd9c1 100644
--- a/src/config/Config.lb
+++ b/src/config/Config.lb
@@ -21,7 +21,7 @@ makerule ldoptions dep "Makefile.settings" act " perl -e 'foreach $$var (split
makerule linuxbios.strip dep "linuxbios" act " $(OBJCOPY) -O binary linuxbios linuxbios.strip"
-makerule linuxbios_c.o dep "$(DRIVERS-1) linuxbios.a $(LIBGCC_FILE_NAME)" act " $(CC) -nostdlib -r -o $@ c_start.o $(DRIVERS-1) linuxbios.a $(LIBGCC_FILE_NAME)"
+makerule linuxbios_c.o dep "$(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)" act " $(CC) -nostdlib -r -o $@ c_start.o $(DRIVER) linuxbios.a $(LIBGCC_FILE_NAME)"
makerule linuxbios_c dep "linuxbios_c.o $(TOP)/src/config/linuxbios_c.ld ldoptions" act " $(CC) -nostdlib -nostartfiles -static -o $@ -T $(TOP)/src/config/linuxbios_c.ld linuxbios_c.o"
diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index 38cda39c0c..a7ae2dea93 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -95,7 +95,7 @@ end
#mainboardinit superiowinbond/w83627hf/setup_serial.inc
mainboardinit pc80/serial.inc
mainboardinit arch/i386/lib/console.inc
-if USE_FALLBACK_IMAGE mainboardinit archi386/lib/noop_failover.inc end
+if USE_FALLBACK_IMAGE mainboardinit arch/i386/lib/noop_failover.inc end
#
###
### Romcc output
diff --git a/targets/arima/hdama/Config.lb b/targets/arima/hdama/Config.lb
index 0f002caa8b..bd20788f1f 100644
--- a/targets/arima/hdama/Config.lb
+++ b/targets/arima/hdama/Config.lb
@@ -19,6 +19,7 @@ uses FINAL_MAINBOARD_FIXUP
uses HAVE_FALLBACK_BOOT
uses HAVE_MP_TABLE
uses HAVE_PIRQ_TABLE
+uses i586
uses i686
uses INTEL_PPRO_MTRR
uses HEAP_SIZE
@@ -49,6 +50,7 @@ option HAVE_MP_TABLE=1
option CPU_FIXUP=1
option CONFIG_UDELAY_TSC=0
option i686=1
+option i586=1
option INTEL_PPRO_MTRR=1
option k7=1
option k8=1
@@ -190,4 +192,5 @@ option _ROMBASE = (CONFIG_ROM_STREAM_START + PAYLOAD_SIZE)
# Arima hdama
mainboard arima/hdama
makedefine CFLAGS += -g
+ payload ../eepro100.ebi
end
diff --git a/util/newconfig/config.g b/util/newconfig/config.g
index ad06bc4ec0..0b96569889 100644
--- a/util/newconfig/config.g
+++ b/util/newconfig/config.g
@@ -796,7 +796,7 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))
# print out all the object dependencies
file.write("\n# object dependencies (objectrules:)\n")
file.write("OBJECTS :=\n")
- file.write("DRIVERS :=\n")
+ file.write("DRIVER :=\n")
for objrule in objectrules.keys():
obj = objectrules[objrule]
obj_name = obj[0]
@@ -857,6 +857,7 @@ CPUFLAGS := $(foreach _var_,$(VARIABLES),$(call D_item,$(_var_)))
driver = driverrules[driverrule]
source = topify(driver[1])
file.write("%s: %s\n" % (driver[0], source))
+ file.write("\t$(CC) -c $(CFLAGS) -o $@ $<\n")
#file.write("%s\n" % objrule[2])
# Print out the rules that will make cause the files