diff options
| -rw-r--r-- | src/mainboard/amd/norwich/Config.lb | 26 | ||||
| -rw-r--r-- | src/mainboard/amd/norwich/cache_as_ram_auto.c | 12 | ||||
| -rw-r--r-- | src/mainboard/amd/norwich/failover.c | 1 |
3 files changed, 8 insertions, 31 deletions
diff --git a/src/mainboard/amd/norwich/Config.lb b/src/mainboard/amd/norwich/Config.lb index 537d43c9b7..24fc3f46b4 100644 --- a/src/mainboard/amd/norwich/Config.lb +++ b/src/mainboard/amd/norwich/Config.lb @@ -49,8 +49,8 @@ driver mainboard.o if HAVE_PIRQ_TABLE object irq_tables.o end - #object reset.o +#object reset.o if USE_DCACHE_RAM #compile cache_as_ram.c to auto.inc @@ -63,29 +63,6 @@ if USE_DCACHE_RAM end - -## -## Romcc output -## -#makerule ./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 "$(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 ./romcc" -# action "./romcc -E -mcpu=p2 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" -#end -#makerule ./auto.inc -# depends "$(MAINBOARD)/auto.c option_table.h ./romcc" -# action "./romcc -mcpu=p2 -O -I$(TOP)/src -I. $(CPPFLAGS) $(MAINBOARD)/auto.c -o $@" -#end - ## ## Build our 16 bit and 32 bit linuxBIOS entry code ## @@ -183,6 +160,5 @@ chip northbridge/amd/lx device apic 0 on end end end - end diff --git a/src/mainboard/amd/norwich/cache_as_ram_auto.c b/src/mainboard/amd/norwich/cache_as_ram_auto.c index ed6f742f9c..8aae9a4c22 100644 --- a/src/mainboard/amd/norwich/cache_as_ram_auto.c +++ b/src/mainboard/amd/norwich/cache_as_ram_auto.c @@ -24,7 +24,6 @@ #include <device/pci_def.h> #include <arch/io.h> #include <device/pnp_def.h> -#include <arch/romcc_io.h> #include <arch/hlt.h> #include "pc80/serial.c" #include "arch/i386/lib/console.c" @@ -109,11 +108,14 @@ void cache_as_ram_main(void) cs5536_early_setup(); - /* Note: must do this AFTER the early_setup! It is counting on some early - * MSR setup for CS5536. + /* Note: must do this AFTER the early_setup! It is counting on some + * early MSR setup for CS5536. */ - /* cs5536_disable_internal_uart disable them for now, set them up later... */ - cs5536_setup_onchipuart(); /* if debug. real setup done in chipset init via config.lb */ + /* cs5536_disable_internal_uart: disable them for now, set them + * up later... + */ + /* If debug. real setup done in chipset init via Config.lb. */ + cs5536_setup_onchipuart(); mb_gpio_init(); uart_init(); console_init(); diff --git a/src/mainboard/amd/norwich/failover.c b/src/mainboard/amd/norwich/failover.c index dabee48579..f21a9f5a07 100644 --- a/src/mainboard/amd/norwich/failover.c +++ b/src/mainboard/amd/norwich/failover.c @@ -3,7 +3,6 @@ #include <device/pci_def.h> #include <device/pci_ids.h> #include <arch/io.h> -#include "arch/romcc_io.h" #include "pc80/mc146818rtc_early.c" static unsigned long main(unsigned long bist) |