diff options
| author | Stefan Reinauer <stepan@coresystems.de> | 2010-03-29 22:08:01 +0000 |
|---|---|---|
| committer | Stefan Reinauer <stepan@openbios.org> | 2010-03-29 22:08:01 +0000 |
| commit | 798ef2893c44ce3194c539c8c5db33d11e8edbac (patch) | |
| tree | 405318f804b41070e16ca6b907d65a1e27cc5071 /src/mainboard/digitallogic | |
| parent | 72bdfeb6987f9578ac7fee3f21140ab5853d6179 (diff) | |
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/digitallogic')
| -rw-r--r-- | src/mainboard/digitallogic/adl855pc/romstage.c | 7 | ||||
| -rw-r--r-- | src/mainboard/digitallogic/msm586seg/romstage.c | 11 | ||||
| -rw-r--r-- | src/mainboard/digitallogic/msm800sev/romstage.c | 4 |
3 files changed, 2 insertions, 20 deletions
diff --git a/src/mainboard/digitallogic/adl855pc/romstage.c b/src/mainboard/digitallogic/adl855pc/romstage.c index b7d8fd0f10..1e0a8dcc47 100644 --- a/src/mainboard/digitallogic/adl855pc/romstage.c +++ b/src/mainboard/digitallogic/adl855pc/romstage.c @@ -1,5 +1,3 @@ -#define ASSEMBLY 1 - #define ASM_CONSOLE_LOGLEVEL 8 #include <stdint.h> #include <device/pci_def.h> @@ -46,8 +44,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 */ @@ -83,7 +79,6 @@ static void main(unsigned long bist) uart_init(); console_init(); - /* Halt if there was a built in self test failure */ report_bist_failure(bist); @@ -99,7 +94,6 @@ static void main(unsigned long bist) // dump_smbus_registers(); #endif - memreset_setup(); sdram_initialize(ARRAY_SIZE(memctrl), memctrl); @@ -142,3 +136,4 @@ static void main(unsigned long bist) #endif */ } + diff --git a/src/mainboard/digitallogic/msm586seg/romstage.c b/src/mainboard/digitallogic/msm586seg/romstage.c index 918aef59c2..8db527d52b 100644 --- a/src/mainboard/digitallogic/msm586seg/romstage.c +++ b/src/mainboard/digitallogic/msm586seg/romstage.c @@ -1,5 +1,3 @@ -#define ASSEMBLY 1 - #define ASM_CONSOLE_LOGLEVEL 8 #include <stdint.h> #include <device/pci_def.h> @@ -45,8 +43,6 @@ void setup_pars(void) typedef void (*lj)(void); - - struct mem_controller { int i; }; @@ -59,8 +55,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 */ @@ -90,7 +84,6 @@ static inline void dumpmem(void){ } } - static inline void irqinit(void){ volatile unsigned char *cp; #if 0 @@ -186,15 +179,12 @@ static inline void irqinit(void){ #endif } - - static void main(unsigned long bist) { volatile int i; for(i = 0; i < 100; i++) ; - setupsc520(); irqinit(); uart_init(); @@ -213,7 +203,6 @@ static void main(unsigned long bist) outb(0xee, 0x80); print_err("loop forever ...\n"); - #if 0 /* clear memory 1meg */ diff --git a/src/mainboard/digitallogic/msm800sev/romstage.c b/src/mainboard/digitallogic/msm800sev/romstage.c index c7dde03ef0..9d5d431f39 100644 --- a/src/mainboard/digitallogic/msm800sev/romstage.c +++ b/src/mainboard/digitallogic/msm800sev/romstage.c @@ -1,6 +1,3 @@ -#define ASSEMBLY 1 - - #include <stdint.h> #include <device/pci_def.h> #include <arch/io.h> @@ -118,3 +115,4 @@ void cache_as_ram_main(void) void done_cache_as_ram_main(void); done_cache_as_ram_main(); } + |