leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Blackfin arch: Remove redundant kernel option

Browse Source 
use kernel command line mem and max_mem bootargs to limit
availabe memory instead.

Signed-off-by: Michael Hennerich <michael.hennerich@analog.com>
Signed-off-by: Bryan Wu <cooloney@kernel.org>
This commit is contained in:
Michael Hennerich 2008-07-14 17:04:14 +08:00 committed by Bryan Wu
parent 96b86e94bc
commit 99d95bbd48
4 changed files with 7 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
arch/blackfin/Kconfig
View File

@ -310,11 +310,6 @@ config BFIN_KERNEL_CLOCK
are also not changed, and the Bootloader does 100% of the hardware are also not changed, and the Bootloader does 100% of the hardware
configuration. configuration.
config MEM_SIZE
int "SDRAM Memory Size in MBytes"
depends on BFIN_KERNEL_CLOCK
default 64
config PLL_BYPASS config PLL_BYPASS
bool "Bypass PLL" bool "Bypass PLL"
depends on BFIN_KERNEL_CLOCK depends on BFIN_KERNEL_CLOCK
@ -376,7 +371,7 @@ config SCLK_DIV
config MAX_MEM_SIZE config MAX_MEM_SIZE
int "Max SDRAM Memory Size in MBytes" int "Max SDRAM Memory Size in MBytes"
depends on !BFIN_KERNEL_CLOCK && !MPU depends on !MPU
default 512 default 512
help help
This is the max memory size that the kernel will create CPLB This is the max memory size that the kernel will create CPLB

6
arch/blackfin/kernel/cplb-nompu/cplbinit.c
View File

@ -26,11 +26,7 @@
#include <asm/cplb.h> #include <asm/cplb.h>
#include <asm/cplbinit.h> #include <asm/cplbinit.h>
#ifdef CONFIG_MAX_MEM_SIZE #define CPLB_MEM CONFIG_MAX_MEM_SIZE
# define CPLB_MEM CONFIG_MAX_MEM_SIZE
#else
# define CPLB_MEM CONFIG_MEM_SIZE
#endif
/* /*
* Number of required data CPLB switchtable entries * Number of required data CPLB switchtable entries

8
arch/blackfin/kernel/setup.c
View File

@ -664,10 +664,7 @@ static __init void setup_bootmem_allocator(void)
}) })
static inline int __init get_mem_size(void) static inline int __init get_mem_size(void)
{ {
#ifdef CONFIG_MEM_SIZE #if defined(EBIU_SDBCTL)
return CONFIG_MEM_SIZE;
#else
# if defined(EBIU_SDBCTL)
# if defined(BF561_FAMILY) # if defined(BF561_FAMILY)
int ret = 0; int ret = 0;
u32 sdbctl = bfin_read_EBIU_SDBCTL(); u32 sdbctl = bfin_read_EBIU_SDBCTL();
@ -679,7 +676,7 @@ static inline int __init get_mem_size(void)
# else # else
return EBSZ_TO_MEG(bfin_read_EBIU_SDBCTL()); return EBSZ_TO_MEG(bfin_read_EBIU_SDBCTL());
# endif # endif
# elif defined(EBIU_DDRCTL1) #elif defined(EBIU_DDRCTL1)
u32 ddrctl = bfin_read_EBIU_DDRCTL1(); u32 ddrctl = bfin_read_EBIU_DDRCTL1();
int ret = 0; int ret = 0;
switch (ddrctl & 0xc0000) { switch (ddrctl & 0xc0000) {
@ -694,7 +691,6 @@ static inline int __init get_mem_size(void)
case DEVWD_16: break; case DEVWD_16: break;
} }
return ret; return ret;
# endif
#endif #endif
BUG(); BUG();
} }

6
arch/blackfin/mach-common/arch_checks.c
View File

@ -53,9 +53,3 @@
# endif # endif
#endif /* CONFIG_BFIN_KERNEL_CLOCK */ #endif /* CONFIG_BFIN_KERNEL_CLOCK */
#ifdef CONFIG_MEM_SIZE
#if (CONFIG_MEM_SIZE % 4)
#error "SDRAM mem size must be multible of 4MB"
#endif
#endif