Remove CONFIG_ from #defines that aren't config variables. Trivial.
Signed-off-by: Myles Watson <mylesgw@gmail.com> Acked-by: Myles Watson <mylesgw@gmail.com> git-svn-id: svn://svn.coreboot.org/coreboot/trunk@4802 2b7e53f0-3cfb-0310-b3e9-8179ed1497e1
This commit is contained in:
parent
d7b37b0a67
commit
0bc615482e
11 changed files with 22 additions and 22 deletions
|
@ -269,7 +269,7 @@ clear_fixed_var_mtrr_out:
|
|||
|
||||
|
||||
/* TODO: make this a config variable */
|
||||
#if CONFIG_CARTEST
|
||||
#if CARTEST
|
||||
/* check the cache as ram */
|
||||
movl $CacheBase, %esi
|
||||
movl $(CacheSize>>2), %ecx
|
||||
|
|
|
@ -102,9 +102,9 @@ cpu_reset_x:
|
|||
:"=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 */
|
||||
|
|
|
@ -102,9 +102,9 @@ cpu_reset_x:
|
|||
:"=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 */
|
||||
|
|
|
@ -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 @@ void memory_init(void)
|
|||
udelay(10000);
|
||||
}
|
||||
|
||||
#endif /* CONFIG_SDRAM_BANK0 */
|
||||
#endif /* CONFIGURE_SDRAM_BANK0 */
|
||||
|
|
|
@ -131,7 +131,7 @@ clear_fixed_var_mtrr_out:
|
|||
movl $(CacheBase+CacheSize-4), %eax
|
||||
movl %eax, %esp
|
||||
|
||||
#ifdef CONFIG_CARTEST
|
||||
#ifdef CARTEST
|
||||
testok: movb $0x40,%al
|
||||
outb %al, $0x80
|
||||
xorl %edx, %edx
|
||||
|
|
|
@ -223,7 +223,7 @@ static inline u32 aty_ld_le32(int regindex,
|
|||
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 @@ static inline void aty_st_le32(int regindex, u32 val,
|
|||
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 @@ static inline u8 aty_ld_8(int regindex,
|
|||
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 @@ static inline void aty_st_8(int regindex, u8 val,
|
|||
if (regindex >= 0x400)
|
||||
regindex -= 0x800;
|
||||
|
||||
#ifdef CONFIG_ATARI
|
||||
#ifdef ATARI
|
||||
out_8 (info->ati_regbase + regindex, val);
|
||||
#else
|
||||
writeb (val, info->ati_regbase + regindex);
|
||||
|
|
|
@ -65,7 +65,7 @@ struct display {
|
|||
#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))
|
||||
|
|
|
@ -65,7 +65,7 @@ struct display {
|
|||
#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))
|
||||
|
|
|
@ -112,7 +112,7 @@ static inline void lapic_write_atomic(unsigned long reg, unsigned long v)
|
|||
}
|
||||
|
||||
|
||||
#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))
|
||||
|
|
|
@ -256,9 +256,9 @@ cpu_reset_x:
|
|||
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 */
|
||||
|
|
|
@ -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 @@ static void main(unsigned long bist)
|
|||
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);
|
||||
|
|
Loading…
Reference in a new issue