summaryrefslogtreecommitdiff
path: root/src/mainboard/ibm
diff options
context:
space:
mode:
authorStefan Reinauer <stepan@coresystems.de>2010-03-29 22:08:01 +0000
committerStefan Reinauer <stepan@openbios.org>2010-03-29 22:08:01 +0000
commit798ef2893c44ce3194c539c8c5db33d11e8edbac (patch)
tree405318f804b41070e16ca6b907d65a1e27cc5071 /src/mainboard/ibm
parent72bdfeb6987f9578ac7fee3f21140ab5853d6179 (diff)
downloadcoreboot-798ef2893c44ce3194c539c8c5db33d11e8edbac.tar.xz
This drops the ASSEMBLY define from romstage.c, too
(since it's not assembly code, this was a dirty hack anyways) Also run awk 1 RS= ORS="\n\n" < $FILE > $FILE.nonewlines mv $FILE.nonewlines $FILE on romstage.c because my perl -pi -e 's,#define ASSEMBLY 1,,g' */*/romstage.c cut some holes into the source. Signed-off-by: Stefan Reinauer <stepan@coresystems.de> Acked-by: Stefan Reinauer <stepan@coresystems.de> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@5320 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
Diffstat (limited to 'src/mainboard/ibm')
-rw-r--r--src/mainboard/ibm/e325/romstage.c5
-rw-r--r--src/mainboard/ibm/e326/romstage.c4
2 files changed, 2 insertions, 7 deletions
diff --git a/src/mainboard/ibm/e325/romstage.c b/src/mainboard/ibm/e325/romstage.c
index 8af9cffd0c..a9dccf0dcf 100644
--- a/src/mainboard/ibm/e325/romstage.c
+++ b/src/mainboard/ibm/e325/romstage.c
@@ -1,5 +1,3 @@
-#define ASSEMBLY 1
-
#include <stdint.h>
#include <string.h>
@@ -59,7 +57,6 @@ static void memreset(int controllers, const struct mem_controller *ctrl)
}
}
-
static inline void activate_spd_rom(const struct mem_controller *ctrl)
{
/* nothing to do */
@@ -92,7 +89,6 @@ static inline int spd_read_byte(unsigned device, unsigned address)
#include "cpu/amd/model_fxx/init_cpus.c"
-
#include "southbridge/amd/amd8111/amd8111_enable_rom.c"
#include "northbridge/amd/amdk8/early_ht.c"
@@ -167,3 +163,4 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
post_cache_as_ram();
}
+
diff --git a/src/mainboard/ibm/e326/romstage.c b/src/mainboard/ibm/e326/romstage.c
index 751b20b56f..1843a8fbba 100644
--- a/src/mainboard/ibm/e326/romstage.c
+++ b/src/mainboard/ibm/e326/romstage.c
@@ -1,5 +1,3 @@
-#define ASSEMBLY 1
-
#include <stdint.h>
#include <string.h>
@@ -59,7 +57,6 @@ static void memreset(int controllers, const struct mem_controller *ctrl)
}
}
-
static inline void activate_spd_rom(const struct mem_controller *ctrl)
{
/* nothing to do */
@@ -166,3 +163,4 @@ void cache_as_ram_main(unsigned long bist, unsigned long cpu_init_detectedx)
post_cache_as_ram();
}
+