diff options
Diffstat (limited to 'src/cpu')
| -rw-r--r-- | src/cpu/intel/model_6ex/cache_as_ram_disable.c | 4 | ||||
| -rw-r--r-- | src/cpu/intel/model_6fx/cache_as_ram_disable.c | 4 | ||||
| -rw-r--r-- | src/cpu/ppc/ppc4xx/sdram.c | 6 | ||||
| -rw-r--r-- | src/cpu/via/car/cache_as_ram.inc | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/cpu/intel/model_6ex/cache_as_ram_disable.c b/src/cpu/intel/model_6ex/cache_as_ram_disable.c index ce508676e5..b95447da73 100644 --- a/src/cpu/intel/model_6ex/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6ex/cache_as_ram_disable.c @@ -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 */ diff --git a/src/cpu/intel/model_6fx/cache_as_ram_disable.c b/src/cpu/intel/model_6fx/cache_as_ram_disable.c index ce508676e5..b95447da73 100644 --- a/src/cpu/intel/model_6fx/cache_as_ram_disable.c +++ b/src/cpu/intel/model_6fx/cache_as_ram_disable.c @@ -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 */ diff --git a/src/cpu/ppc/ppc4xx/sdram.c b/src/cpu/ppc/ppc4xx/sdram.c index f7a508b4fd..17d07c769a 100644 --- a/src/cpu/ppc/ppc4xx/sdram.c +++ b/src/cpu/ppc/ppc4xx/sdram.c @@ -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 */ diff --git a/src/cpu/via/car/cache_as_ram.inc b/src/cpu/via/car/cache_as_ram.inc index 693bce36dd..3e5729aa1f 100644 --- a/src/cpu/via/car/cache_as_ram.inc +++ b/src/cpu/via/car/cache_as_ram.inc @@ -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 |