| From 7e1a6d476600c9bfcce4d9526906c59c9e941f47 Mon Sep 17 00:00:00 2001 |
| From: Magnus Damm <damm@opensource.se> |
| Date: Mon, 10 Jun 2013 18:46:57 +0900 |
| Subject: ARM: shmobile: Remove MEMORY_START/SIZE |
| |
| Remove CONFIG_MEMORY_START and CONFIG_MEMORY_SIZE from mach-shmobile. |
| |
| Boards should use DT to specify their memory setup. Boards that still |
| not support DT may pass ATAGS with memory information from the boot |
| loader. If those ATAGS turn out to be incorrect then appended DTB with |
| memory information should be used as a workaround. |
| |
| Signed-off-by: Magnus Damm <damm@opensource.se> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit 3c2b1042d2db50506b387611f7a60e81241cfabc) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| arch/arm/mach-shmobile/Kconfig | 31 ------------------------------- |
| 1 file changed, 31 deletions(-) |
| |
| diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig |
| index 70df9490..935a661c 100644 |
| --- a/arch/arm/mach-shmobile/Kconfig |
| +++ b/arch/arm/mach-shmobile/Kconfig |
| @@ -213,37 +213,6 @@ config CPU_HAS_INTEVT |
| bool |
| default y |
| |
| -menu "Memory configuration" |
| - |
| -config MEMORY_START |
| - hex "Physical memory start address" |
| - default "0x40000000" if MACH_AP4EVB || MACH_AG5EVM || \ |
| - MACH_MACKEREL || MACH_BONITO || \ |
| - MACH_ARMADILLO800EVA || MACH_APE6EVM || \ |
| - MACH_LAGER |
| - default "0x41000000" if MACH_KOTA2 |
| - default "0x00000000" |
| - ---help--- |
| - Tweak this only when porting to a new machine which does not |
| - already have a defconfig. Changing it from the known correct |
| - value on any of the known systems will only lead to disaster. |
| - |
| -config MEMORY_SIZE |
| - hex "Physical memory size" |
| - default "0x80000000" if MACH_LAGER |
| - default "0x40000000" if MACH_APE6EVM |
| - default "0x20000000" if MACH_AG5EVM || MACH_BONITO || \ |
| - MACH_ARMADILLO800EVA |
| - default "0x1e000000" if MACH_KOTA2 |
| - default "0x10000000" if MACH_AP4EVB || MACH_MACKEREL |
| - default "0x04000000" |
| - help |
| - This sets the default memory size assumed by your kernel. It can |
| - be overridden as normal by the 'mem=' argument on the kernel command |
| - line. |
| - |
| -endmenu |
| - |
| menu "Timer and clock configuration" |
| |
| config SHMOBILE_TIMER_HZ |
| -- |
| 1.8.4.3.gca3854a |
| |
