[v2] r4802 - in trunk/coreboot-v2/src: arch/i386/init cpu/intel/model_6ex cpu/intel/model_6fx cpu/ppc/ppc4xx cpu/via/car drivers/ati/ragexl drivers/emulation/qemu include/cpu/x86 mainboard/tyan/s2735 mainboard/via/vt8454c

Author: myles
Date: 2009-10-17 15:25:07 +0200 (Sat, 17 Oct 2009)
New Revision: 4802

Modified:
   trunk/coreboot-v2/src/arch/i386/init/car.S
   trunk/coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c
   trunk/coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c
   trunk/coreboot-v2/src/cpu/ppc/ppc4xx/sdram.c
   trunk/coreboot-v2/src/cpu/via/car/cache_as_ram.inc
   trunk/coreboot-v2/src/drivers/ati/ragexl/atyfb.h
   trunk/coreboot-v2/src/drivers/ati/ragexl/fbcon.h
   trunk/coreboot-v2/src/drivers/emulation/qemu/fbcon.h
   trunk/coreboot-v2/src/include/cpu/x86/lapic.h
   trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c
   trunk/coreboot-v2/src/mainboard/via/vt8454c/auto.c
Log:
Remove CONFIG_ from #defines that aren't config variables.  Trivial.

Signed-off-by: Myles Watson 
Acked-by: Myles Watson

Modified: trunk/coreboot-v2/src/arch/i386/init/car.S
===================================================================
--- trunk/coreboot-v2/src/arch/i386/init/car.S	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/arch/i386/init/car.S	2009-10-17 13:25:07 UTC (rev 4802)
@@ -269,7 +269,7 @@

/* TODO: make this a config variable */
-#if CONFIG_CARTEST
+#if CARTEST
    /* check the cache as ram */
    movl  $CacheBase, %esi
    movl    $(CacheSize>>2), %ecx

Modified: trunk/coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/cpu/intel/model_6ex/cache_as_ram_disable.c	2009-10-17 13:25:07 UTC (rev 4802)
@@ -102,9 +102,9 @@
    		:"=a" (new_cpu_reset)
    	);

-#ifdef CONFIG_DEACTIVATE_CAR
+#ifdef DEACTIVATE_CAR
    	print_debug("Deactivating CAR");
-#include CONFIG_DEACTIVATE_CAR_FILE
+#include DEACTIVATE_CAR_FILE
    	print_debug(" - Done.\r\n");
 #endif
    	/* Copy and execute coreboot_ram */

Modified: trunk/coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c
===================================================================
--- trunk/coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/cpu/intel/model_6fx/cache_as_ram_disable.c	2009-10-17 13:25:07 UTC (rev 4802)
@@ -102,9 +102,9 @@
    		:"=a" (new_cpu_reset)
    	);

-#ifdef CONFIG_DEACTIVATE_CAR
+#ifdef DEACTIVATE_CAR
    	print_debug("Deactivating CAR");
-#include CONFIG_DEACTIVATE_CAR_FILE
+#include DEACTIVATE_CAR_FILE
    	print_debug(" - Done.\r\n");
 #endif
    	/* Copy and execute coreboot_ram */

Modified: trunk/coreboot-v2/src/cpu/ppc/ppc4xx/sdram.c
===================================================================
--- trunk/coreboot-v2/src/cpu/ppc/ppc4xx/sdram.c	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/cpu/ppc/ppc4xx/sdram.c	2009-10-17 13:25:07 UTC (rev 4802)
@@ -28,8 +28,8 @@
 #include <clock.h>
 #include <stdint.h>

-#define CONFIG_SDRAM_BANK0
-#ifdef CONFIG_SDRAM_BANK0
+#define CONFIGURE_SDRAM_BANK0
+#ifdef CONFIGURE_SDRAM_BANK0

/*
  * According to the PPC405GPr Users Manual, only non-reserved
@@ -130,4 +130,4 @@
    udelay(10000);
 }

-#endif /* CONFIG_SDRAM_BANK0 */
+#endif /* CONFIGURE_SDRAM_BANK0 */

Modified: trunk/coreboot-v2/src/cpu/via/car/cache_as_ram.inc
===================================================================
--- trunk/coreboot-v2/src/cpu/via/car/cache_as_ram.inc	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/cpu/via/car/cache_as_ram.inc	2009-10-17 13:25:07 UTC (rev 4802)
@@ -131,7 +131,7 @@
    movl    $(CacheBase+CacheSize-4), %eax
    movl    %eax, %esp

-#ifdef CONFIG_CARTEST
+#ifdef CARTEST
 testok:	movb $0x40,%al
    outb %al, $0x80
    xorl  %edx, %edx

Modified: trunk/coreboot-v2/src/drivers/ati/ragexl/atyfb.h
===================================================================
--- trunk/coreboot-v2/src/drivers/ati/ragexl/atyfb.h	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/drivers/ati/ragexl/atyfb.h	2009-10-17 13:25:07 UTC (rev 4802)
@@ -223,7 +223,7 @@
     if (regindex >= 0x400)
    regindex -= 0x800;

-#ifdef CONFIG_ATARI
+#ifdef ATARI
     return in_le32((volatile u32 *)(info->ati_regbase+regindex));
 #else
     return readl (info->ati_regbase + regindex);
@@ -237,7 +237,7 @@
     if (regindex >= 0x400)
    regindex -= 0x800;

-#ifdef CONFIG_ATARI
+#ifdef ATARI
     out_le32 (info->ati_regbase+regindex, val);
 #else
     writel (val, info->ati_regbase + regindex);
@@ -279,7 +279,7 @@
     if (regindex >= 0x400)
    regindex -= 0x800;

-#ifdef CONFIG_ATARI
+#ifdef ATARI
     return in_8 (info->ati_regbase + regindex);
 #else
     return readb (info->ati_regbase + regindex);
@@ -293,7 +293,7 @@
     if (regindex >= 0x400)
    regindex -= 0x800;

-#ifdef CONFIG_ATARI
+#ifdef ATARI
     out_8 (info->ati_regbase + regindex, val);
 #else
     writeb (val, info->ati_regbase + regindex);

Modified: trunk/coreboot-v2/src/drivers/ati/ragexl/fbcon.h
===================================================================
--- trunk/coreboot-v2/src/drivers/ati/ragexl/fbcon.h	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/drivers/ati/ragexl/fbcon.h	2009-10-17 13:25:07 UTC (rev 4802)
@@ -65,7 +65,7 @@
 #define fontheight(p) ((p)->_fontheight)
 #define fontheightlog(p) ((p)->_fontheightlog)

-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
+#ifdef FBCON_FONTWIDTH8_ONLY

/* fontwidth w is supported by dispsw */
 #define FONTWIDTH(w)	(1 << ((8) - 1))

Modified: trunk/coreboot-v2/src/drivers/emulation/qemu/fbcon.h
===================================================================
--- trunk/coreboot-v2/src/drivers/emulation/qemu/fbcon.h	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/drivers/emulation/qemu/fbcon.h	2009-10-17 13:25:07 UTC (rev 4802)
@@ -65,7 +65,7 @@
 #define fontheight(p) ((p)->_fontheight)
 #define fontheightlog(p) ((p)->_fontheightlog)

-#ifdef CONFIG_FBCON_FONTWIDTH8_ONLY
+#ifdef FBCON_FONTWIDTH8_ONLY

/* fontwidth w is supported by dispsw */
 #define FONTWIDTH(w)	(1 << ((8) - 1))

Modified: trunk/coreboot-v2/src/include/cpu/x86/lapic.h
===================================================================
--- trunk/coreboot-v2/src/include/cpu/x86/lapic.h	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/include/cpu/x86/lapic.h	2009-10-17 13:25:07 UTC (rev 4802)
@@ -112,7 +112,7 @@
 }

-#ifdef CONFIG_X86_GOOD_APIC
+#ifdef X86_GOOD_APIC
 # define FORCE_READ_AROUND_WRITE 0
 # define lapic_read_around(x) lapic_read(x)
 # define lapic_write_around(x,y) lapic_write((x),(y))

Modified: trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/mainboard/tyan/s2735/cache_as_ram_auto.c	2009-10-17 13:25:07 UTC (rev 4802)
@@ -256,9 +256,9 @@
                 print_debug("new_cpu_reset = "); print_debug_hex32(new_cpu_reset); print_debug("\r\n");
 #endif
    
-#ifdef CONFIG_DEACTIVATE_CAR
+#ifdef DEACTIVATE_CAR
    	print_debug("Deactivating CAR");
-#include CONFIG_DEACTIVATE_CAR_FILE
+#include DEACTIVATE_CAR_FILE
    	print_debug(" - Done.\r\n");
 #endif
    	/*copy and execute coreboot_ram */

Modified: trunk/coreboot-v2/src/mainboard/via/vt8454c/auto.c
===================================================================
--- trunk/coreboot-v2/src/mainboard/via/vt8454c/auto.c	2009-10-17 03:00:04 UTC (rev 4801)
+++ trunk/coreboot-v2/src/mainboard/via/vt8454c/auto.c	2009-10-17 13:25:07 UTC (rev 4802)
@@ -35,8 +35,8 @@
 #include "cpu/x86/mtrr/earlymtrr.c"
 #include "cpu/x86/bist.h"

-#define CONFIG_DEACTIVATE_CAR 1
-#define CONFIG_DEACTIVATE_CAR_FILE "cpu/via/car/cache_as_ram_post.c"
+#define DEACTIVATE_CAR 1
+#define DEACTIVATE_CAR_FILE "cpu/via/car/cache_as_ram_post.c"
 #include "cpu/x86/car/copy_and_run.c"
 #include "pc80/udelay_io.c"
 #include "lib/delay.c"
@@ -120,9 +120,9 @@
    enable_shadow_ram(cx700);
    sdram_enable(cx700);

-#ifdef CONFIG_DEACTIVATE_CAR
+#ifdef DEACTIVATE_CAR
    print_debug("Deactivating CAR");
-#include CONFIG_DEACTIVATE_CAR_FILE
+#include DEACTIVATE_CAR_FILE
    print_debug(" - Done.\r\n");
 #endif
    copy_and_run(0);