On 3 January 2015 at 19:26, Bin Meng bmeng.cn@gmail.com wrote:
On Fri, Jan 2, 2015 at 7:17 AM, Simon Glass sjg@chromium.org wrote:
We don't need this in U-Boot since we calculate it based on available memory.
Signed-off-by: Simon Glass sjg@chromium.org
Changes in v2:
- Remove CONFIG_RAMTOP from mtrr.h in this patch
arch/x86/Kconfig | 4 ---- arch/x86/include/asm/mtrr.h | 8 -------- 2 files changed, 12 deletions(-)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index 7d007bb..e992e64 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -47,10 +47,6 @@ config RAMBASE hex default 0x100000
-config RAMTOP
hexdefault 0x200000config XIP_ROM_SIZE hex default ROM_SIZE diff --git a/arch/x86/include/asm/mtrr.h b/arch/x86/include/asm/mtrr.h index 5f05a48..dcc995d 100644 --- a/arch/x86/include/asm/mtrr.h +++ b/arch/x86/include/asm/mtrr.h @@ -100,10 +100,6 @@ static inline long x86_mtrr_rom_cache_var_index(void) { return -1; }
#endif
-#if !defined(CONFIG_RAMTOP) -# error "CONFIG_RAMTOP not defined" -#endif
#if ((CONFIG_XIP_ROM_SIZE & (CONFIG_XIP_ROM_SIZE - 1)) != 0) # error "CONFIG_XIP_ROM_SIZE is not a power of 2" #endif @@ -114,8 +110,4 @@ static inline long x86_mtrr_rom_cache_var_index(void) { return -1; }
#define CACHE_ROM_BASE (((1 << 20) - (CONFIG_CACHE_ROM_SIZE >> 12)) << 12)
-#if (CONFIG_RAMTOP & (CONFIG_RAMTOP - 1)) != 0 -# error "CONFIG_RAMTOP must be a power of 2" -#endif
#endif
Reviewed-by: Bin Meng bmeng.cn@gmail.com
Applied to u-boot-x86/next.