[LinuxBIOS] r2684 - trunk/LinuxBIOSv2/src/mainboard/amd/norwich

Author: uwe
Date: 2007-05-21 23:33:24 +0200 (Mon, 21 May 2007)
New Revision: 2684

Modified:
   trunk/LinuxBIOSv2/src/mainboard/amd/norwich/Config.lb
   trunk/LinuxBIOSv2/src/mainboard/amd/norwich/cache_as_ram_auto.c
   trunk/LinuxBIOSv2/src/mainboard/amd/norwich/failover.c
Log:
Drop romcc related stuff, as this board only uses CAR.

Signed-off-by: Uwe Hermann 
Acked-by: Stefan Reinauer

Modified: trunk/LinuxBIOSv2/src/mainboard/amd/norwich/Config.lb
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/amd/norwich/Config.lb	2007-05-21 20:50:48 UTC (rev 2683)
+++ trunk/LinuxBIOSv2/src/mainboard/amd/norwich/Config.lb	2007-05-21 21:33:24 UTC (rev 2684)
@@ -49,8 +49,8 @@
 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,30 +63,7 @@
 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
 ##
 mainboardinit cpu/x86/16bit/entry16.inc
@@ -183,6 +160,5 @@
    		device apic 0 on end
    	end
    end
-
 end

Modified: trunk/LinuxBIOSv2/src/mainboard/amd/norwich/cache_as_ram_auto.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/amd/norwich/cache_as_ram_auto.c	2007-05-21 20:50:48 UTC (rev 2683)
+++ trunk/LinuxBIOSv2/src/mainboard/amd/norwich/cache_as_ram_auto.c	2007-05-21 21:33:24 UTC (rev 2684)
@@ -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 @@

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();

Modified: trunk/LinuxBIOSv2/src/mainboard/amd/norwich/failover.c
===================================================================
--- trunk/LinuxBIOSv2/src/mainboard/amd/norwich/failover.c	2007-05-21 20:50:48 UTC (rev 2683)
+++ trunk/LinuxBIOSv2/src/mainboard/amd/norwich/failover.c	2007-05-21 21:33:24 UTC (rev 2684)
@@ -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)