Commit ea5e9267 authored by Tom Rini's avatar Tom Rini Committed by Paul Mackerras

PPC32: Define default settings for advanced config options.

This simplifies the C code by removing some #ifdefs.
parent 72b7a11a
...@@ -1209,6 +1209,9 @@ config ADVANCED_OPTIONS ...@@ -1209,6 +1209,9 @@ config ADVANCED_OPTIONS
Unless you know what you are doing, say N here. Unless you know what you are doing, say N here.
comment "Default settings for advanced configuration options are used"
depends on !ADVANCED_OPTIONS
config HIGHMEM_START_BOOL config HIGHMEM_START_BOOL
bool "Set high memory pool address" bool "Set high memory pool address"
depends on ADVANCED_OPTIONS && HIGHMEM depends on ADVANCED_OPTIONS && HIGHMEM
...@@ -1224,6 +1227,11 @@ config HIGHMEM_START ...@@ -1224,6 +1227,11 @@ config HIGHMEM_START
depends on HIGHMEM_START_BOOL depends on HIGHMEM_START_BOOL
default "0xfe000000" default "0xfe000000"
config HIGHMEM_START
hex
depends on !HIGHMEM_START_BOOL
default "0xfe000000"
config LOWMEM_SIZE_BOOL config LOWMEM_SIZE_BOOL
bool "Set maximum low memory" bool "Set maximum low memory"
depends on ADVANCED_OPTIONS && HIGHMEM depends on ADVANCED_OPTIONS && HIGHMEM
...@@ -1241,6 +1249,11 @@ config LOWMEM_SIZE ...@@ -1241,6 +1249,11 @@ config LOWMEM_SIZE
depends on LOWMEM_SIZE_BOOL depends on LOWMEM_SIZE_BOOL
default "0x20000000" default "0x20000000"
config LOWMEM_SIZE
hex
depends on !LOWMEM_SIZE_BOOL
default "0x20000000"
config KERNEL_START_BOOL config KERNEL_START_BOOL
bool "Set custom kernel base address" bool "Set custom kernel base address"
depends on ADVANCED_OPTIONS depends on ADVANCED_OPTIONS
...@@ -1257,6 +1270,11 @@ config KERNEL_START ...@@ -1257,6 +1270,11 @@ config KERNEL_START
depends on KERNEL_START_BOOL depends on KERNEL_START_BOOL
default "0xc0000000" default "0xc0000000"
config KERNEL_START
hex
depends on !KERNEL_START_BOOL
default "0xc0000000"
config TASK_SIZE_BOOL config TASK_SIZE_BOOL
bool "Set custom user task size" bool "Set custom user task size"
depends on ADVANCED_OPTIONS depends on ADVANCED_OPTIONS
...@@ -1272,6 +1290,11 @@ config TASK_SIZE ...@@ -1272,6 +1290,11 @@ config TASK_SIZE
depends on TASK_SIZE_BOOL depends on TASK_SIZE_BOOL
default "0x80000000" default "0x80000000"
config TASK_SIZE
hex
depends on !TASK_SIZE_BOOL
default "0x80000000"
config PIN_TLB config PIN_TLB
bool "Pinned Kernel TLBs (860 ONLY)" bool "Pinned Kernel TLBs (860 ONLY)"
depends on ADVANCED_OPTIONS && 8xx depends on ADVANCED_OPTIONS && 8xx
......
...@@ -12,13 +12,10 @@ ...@@ -12,13 +12,10 @@
# Rewritten by Cort Dougan and Paul Mackerras # Rewritten by Cort Dougan and Paul Mackerras
# #
# Be sure to change PAGE_OFFSET in include/asm-ppc/page.h to match # This must match PAGE_OFFSET in include/asm-ppc/page.h.
ifdef CONFIG_KERNEL_START_BOOL
KERNELLOAD =$(CONFIG_KERNEL_START) KERNELLOAD =$(CONFIG_KERNEL_START)
else
KERNELLOAD =0xc0000000
endif
LDFLAGS_BLOB := --format binary --oformat elf32-powerpc
LDFLAGS_vmlinux = -Ttext $(KERNELLOAD) -Bstatic LDFLAGS_vmlinux = -Ttext $(KERNELLOAD) -Bstatic
CPPFLAGS := $(CPPFLAGS) -I$(TOPDIR)/arch/$(ARCH) CPPFLAGS := $(CPPFLAGS) -I$(TOPDIR)/arch/$(ARCH)
AFLAGS := $(AFLAGS) -I$(TOPDIR)/arch/$(ARCH) AFLAGS := $(AFLAGS) -I$(TOPDIR)/arch/$(ARCH)
......
...@@ -47,11 +47,13 @@ ...@@ -47,11 +47,13 @@
#include "mem_pieces.h" #include "mem_pieces.h"
#include "mmu_decl.h" #include "mmu_decl.h"
#ifdef CONFIG_LOWMEM_SIZE_BOOL #if defined(CONFIG_KERNEL_START_BOOL) || defined(CONFIG_LOWMEM_SIZE_BOOL)
/* The ammount of lowmem must be within 0xF0000000 - KERNELBASE. */
#if (CONFIG_LOWMEM_SIZE > (0xF0000000 - KERNELBASE))
#error "You must adjust CONFIG_LOWMEM_SIZE or CONFIG_START_KERNEL"
#endif
#endif
#define MAX_LOW_MEM CONFIG_LOWMEM_SIZE #define MAX_LOW_MEM CONFIG_LOWMEM_SIZE
#else
#define MAX_LOW_MEM (0xF0000000UL - KERNELBASE)
#endif /* CONFIG_LOWMEM_SIZE_BOOL */
#ifdef CONFIG_PPC_ISERIES #ifdef CONFIG_PPC_ISERIES
extern void create_virtual_bus_tce_table(void); extern void create_virtual_bus_tce_table(void);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment