Commit 99d95bbd authored by Michael Hennerich's avatar Michael Hennerich Committed by Bryan Wu
Browse files

Blackfin arch: Remove redundant kernel option 



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

Signed-off-by: default avatarMichael Hennerich <michael.hennerich@analog.com>
Signed-off-by: default avatarBryan Wu <cooloney@kernel.org>
parent 96b86e94

arch/blackfin/Kconfig

+1 −6
Original line number Diff line number Diff line
@@ -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

arch/blackfin/kernel/cplb-nompu/cplbinit.c

+1 −5
Original line number Diff line number Diff line
@@ -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



/*

* Number of required data CPLB switchtable entries

arch/blackfin/kernel/setup.c

+5 −9
Original line number Diff line number Diff line
@@ -664,9 +664,6 @@ 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)

	int ret = 0;
@@ -694,7 +691,6 @@ static inline int __init get_mem_size(void) 
		case DEVWD_16: break;

	}

	return ret;

# endif

#endif

	BUG();

}

arch/blackfin/mach-common/arch_checks.c

+0 −6
Original line number Diff line number Diff line
@@ -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