mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-12 13:55:32 +00:00
Blackfin arch: Remove redundant kernel option
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:
parent
96b86e94bc
commit
99d95bbd48
4 changed files with 7 additions and 26 deletions
|
@ -310,11 +310,6 @@ config BFIN_KERNEL_CLOCK
|
|||
are also not changed, and the Bootloader does 100% of the hardware
|
||||
configuration.
|
||||
|
||||
config MEM_SIZE
|
||||
int "SDRAM Memory Size in MBytes"
|
||||
depends on BFIN_KERNEL_CLOCK
|
||||
default 64
|
||||
|
||||
config PLL_BYPASS
|
||||
bool "Bypass PLL"
|
||||
depends on BFIN_KERNEL_CLOCK
|
||||
|
@ -376,7 +371,7 @@ config SCLK_DIV
|
|||
|
||||
config MAX_MEM_SIZE
|
||||
int "Max SDRAM Memory Size in MBytes"
|
||||
depends on !BFIN_KERNEL_CLOCK && !MPU
|
||||
depends on !MPU
|
||||
default 512
|
||||
help
|
||||
This is the max memory size that the kernel will create CPLB
|
||||
|
|
|
@ -26,11 +26,7 @@
|
|||
#include <asm/cplb.h>
|
||||
#include <asm/cplbinit.h>
|
||||
|
||||
#ifdef CONFIG_MAX_MEM_SIZE
|
||||
# define CPLB_MEM CONFIG_MAX_MEM_SIZE
|
||||
#else
|
||||
# define CPLB_MEM CONFIG_MEM_SIZE
|
||||
#endif
|
||||
#define CPLB_MEM CONFIG_MAX_MEM_SIZE
|
||||
|
||||
/*
|
||||
* Number of required data CPLB switchtable entries
|
||||
|
|
|
@ -664,11 +664,8 @@ static __init void setup_bootmem_allocator(void)
|
|||
})
|
||||
static inline int __init get_mem_size(void)
|
||||
{
|
||||
#ifdef CONFIG_MEM_SIZE
|
||||
return CONFIG_MEM_SIZE;
|
||||
#else
|
||||
# if defined(EBIU_SDBCTL)
|
||||
# if defined(BF561_FAMILY)
|
||||
#if defined(EBIU_SDBCTL)
|
||||
# if defined(BF561_FAMILY)
|
||||
int ret = 0;
|
||||
u32 sdbctl = bfin_read_EBIU_SDBCTL();
|
||||
ret += EBSZ_TO_MEG(sdbctl >> 0);
|
||||
|
@ -676,10 +673,10 @@ static inline int __init get_mem_size(void)
|
|||
ret += EBSZ_TO_MEG(sdbctl >> 16);
|
||||
ret += EBSZ_TO_MEG(sdbctl >> 24);
|
||||
return ret;
|
||||
# else
|
||||
# else
|
||||
return EBSZ_TO_MEG(bfin_read_EBIU_SDBCTL());
|
||||
# endif
|
||||
# elif defined(EBIU_DDRCTL1)
|
||||
# endif
|
||||
#elif defined(EBIU_DDRCTL1)
|
||||
u32 ddrctl = bfin_read_EBIU_DDRCTL1();
|
||||
int ret = 0;
|
||||
switch (ddrctl & 0xc0000) {
|
||||
|
@ -694,7 +691,6 @@ static inline int __init get_mem_size(void)
|
|||
case DEVWD_16: break;
|
||||
}
|
||||
return ret;
|
||||
# endif
|
||||
#endif
|
||||
BUG();
|
||||
}
|
||||
|
|
|
@ -53,9 +53,3 @@
|
|||
# endif
|
||||
|
||||
#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
|
||||
|
|
Loading…
Reference in a new issue