From f8a2dddb573faef41ad43ee111d91d4c5259ad59 Mon Sep 17 00:00:00 2001
From: Eric Biederman <ebiederm@xmission.com>
Date: Sat, 30 Oct 2004 08:05:41 +0000
Subject: - To reduce confuse rename the parts of linuxbios bios that run from 
  ram linuxbios_ram instead of linuxbios_c and linuxbios_payload... -
 Reordered the linker sections so the LinuxBIOS fallback image can take more
 the 64KiB on x86 - ROM_IMAGE_SIZE now will work when it is specified as
 larger than 64KiB. - Tweaked the reset16.inc and reset16.lds to move the
 sanity check to see if everything will work. - Start using romcc's built in
 preprocessor (This will simplify header compiler checks) - Add helper
 functions for examining all of the resources - Remove debug strings from
 chip.h - Add llshell to src/arch/i386/llshell (Sometime later I can try
 it...) - Add the ability to catch exceptions on x86 - Add gdb_stub support to
 x86 - Removed old cpu options - Added an option so we can detect movnti
 support - Remove some duplicate definitions from pci_ids.h - Remove the 64bit
 resource code in amdk8/northbridge.c in preparation for making it generic -
 Minor romcc bug fixes

git-svn-id: svn://svn.coreboot.org/coreboot/trunk@1727 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
---
 src/mainboard/arima/hdama/Config.lb   | 16 ++++++++--------
 src/mainboard/arima/hdama/Options.lb  |  6 ++++++
 src/mainboard/arima/hdama/mainboard.c |  1 -
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'src/mainboard')

diff --git a/src/mainboard/arima/hdama/Config.lb b/src/mainboard/arima/hdama/Config.lb
index 432542e3ca..0799be0117 100644
--- a/src/mainboard/arima/hdama/Config.lb
+++ b/src/mainboard/arima/hdama/Config.lb
@@ -47,22 +47,22 @@ if HAVE_PIRQ_TABLE object irq_tables.o end
 ## Romcc output
 ##
 makerule ./failover.E
-	depends "$(MAINBOARD)/failover.c" 
-	action "$(CPP) -I$(TOP)/src $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/failover.c > ./failover.E"
+	depends "$(MAINBOARD)/failover.c ./romcc" 
+	action "./romcc -E -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 end
 
 makerule ./failover.inc
-	depends "./failover.E ./romcc"
-	action "./romcc -O -o failover.inc --label-prefix=failover ./failover.E"
+	depends "$(MAINBOARD)/failover.c ./romcc"
+	action "./romcc    -O --label-prefix=failover -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/failover.c -o $@"
 end
 
 makerule ./auto.E 
-	depends	"$(MAINBOARD)/auto.c option_table.h " 
-	action	"$(CPP) -I$(TOP)/src -I. $(ROMCCPPFLAGS) $(CPPFLAGS) $(MAINBOARD)/auto.c > ./auto.E"
+	depends	"$(MAINBOARD)/auto.c option_table.h ./romcc" 
+	action	"./romcc -E -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
 makerule ./auto.inc 
-	depends "./auto.E ./romcc"
-	action	"./romcc -mcpu=k8 -O2 ./auto.E > auto.inc"
+	depends "$(MAINBOARD)/auto.c option_table.h ./romcc"
+	action	"./romcc    -mcpu=k8 -O2 -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@"
 end
 
 ##
diff --git a/src/mainboard/arima/hdama/Options.lb b/src/mainboard/arima/hdama/Options.lb
index 2f2df1c8ec..8eb01b384d 100644
--- a/src/mainboard/arima/hdama/Options.lb
+++ b/src/mainboard/arima/hdama/Options.lb
@@ -46,6 +46,7 @@ uses MAXIMUM_CONSOLE_LOGLEVEL
 uses MAINBOARD_POWER_ON_AFTER_POWER_FAIL
 uses CONFIG_CONSOLE_SERIAL8250
 uses HAVE_INIT_TIMER
+uses CONFIG_GDB_STUB
 
 ###
 ### Build options
@@ -165,6 +166,11 @@ default CONFIG_ROM_STREAM = 1
 default CC="gcc"
 default HOSTCC="gcc"
 
+##
+## Disable the gdb stub by default
+##
+default CONFIG_GDB_STUB=0
+
 ##
 ## The Serial Console
 ##
diff --git a/src/mainboard/arima/hdama/mainboard.c b/src/mainboard/arima/hdama/mainboard.c
index 8af64d9091..95ed7368f9 100644
--- a/src/mainboard/arima/hdama/mainboard.c
+++ b/src/mainboard/arima/hdama/mainboard.c
@@ -316,7 +316,6 @@ static void enable_dev(struct device *dev)
 	dev->ops = &mainboard_operations;
 }
 struct chip_operations mainboard_arima_hdama_ops = {
-	.name      = "Arima HDAMA mainboard ",
 	.enable_dev = enable_dev, 
 };
 
-- 
cgit v1.2.3