From 2ede879fcb67470524847bb4fc8972651bb46184 Mon Sep 17 00:00:00 2001 From: Stefan Roese Date: Wed, 11 Feb 2009 09:37:12 +0100 Subject: ppc4xx: Fix problem with CONFIG_MAX_MEM_MAPPED in include/asm-ppc/config.h CONFIG_SDRAM_PPC4xx_IBM_DDR2 is not set when include/asm-ppc/config.h is included. So for katmai, CONFIG_MAX_MEM_MAPPED will get set to 256MB. It makes perfect sense to set CONFIG_MAX_MEM_MAPPED to 2GB for all PPC4xx boards right now. Signed-off-by: Stefan Roese --- include/asm-ppc/config.h | 4 ++-- include/configs/katmai.h | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/include/asm-ppc/config.h b/include/asm-ppc/config.h index 6d27cb1..2a4ee15 100644 --- a/include/asm-ppc/config.h +++ b/include/asm-ppc/config.h @@ -22,10 +22,10 @@ #define _ASM_CONFIG_H_ #ifndef CONFIG_MAX_MEM_MAPPED -#if defined(CONFIG_SDRAM_PPC4xx_IBM_DDR2) && defined(CONFIG_SPD_EEPROM) +#if defined(CONFIG_4xx) #define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) #else -#define CONFIG_MAX_MEM_MAPPED (256 << 20) +#define CONFIG_MAX_MEM_MAPPED (256 << 20) #endif #endif diff --git a/include/configs/katmai.h b/include/configs/katmai.h index ea6cf0d..0d89594 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -45,7 +45,6 @@ */ #define CONFIG_PHYS_64BIT #define CONFIG_VERY_BIG_RAM -#define CONFIG_MAX_MEM_MAPPED ((phys_size_t)2 << 30) /* * Include common defines/options for all AMCC eval boards -- cgit v1.1