From 41d2dbcf89d4b69c84be4e3322432c0a1a490f4a Mon Sep 17 00:00:00 2001
From: "Hyok S. Choi" <hyok.choi@samsung.com>
Date: Mon, 27 Mar 2006 15:14:19 +0100
Subject: [PATCH] --- yaml --- r: 24999 b: refs/heads/master c:
 f8c07de6beac55c3273cbd679bfa67555ef14ef5 h: refs/heads/master i:   24997:
 78d473dd62429d56d6fce22146bcc36f110cea23   24995:
 b623f07808019bacff37663e222757230ed03517   24991:
 a62f1db2e0b6ec5aba9ee3fa8d9faaad6021d0dc v: v3

---
 [refs]                       |  2 +-
 trunk/arch/arm/Kconfig-nommu | 27 +++++++++++++++++++++++++++
 trunk/arch/arm/Makefile      |  7 ++++++-
 3 files changed, 34 insertions(+), 2 deletions(-)
 create mode 100644 trunk/arch/arm/Kconfig-nommu

diff --git a/[refs] b/[refs]
index c333e315644c..77ad67b6a4b0 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 75d90832d58aa5855972cfc2bdaa94970ccd4aca
+refs/heads/master: f8c07de6beac55c3273cbd679bfa67555ef14ef5
diff --git a/trunk/arch/arm/Kconfig-nommu b/trunk/arch/arm/Kconfig-nommu
new file mode 100644
index 000000000000..8ce56e5bd78f
--- /dev/null
+++ b/trunk/arch/arm/Kconfig-nommu
@@ -0,0 +1,27 @@
+#
+# Kconfig for uClinux(non-paged MM) depend configurations
+# Hyok S. Choi <hyok.choi@samsung.com>
+# 
+
+config SET_MEM_PARAM
+	bool "Set flash/sdram size and base addr"
+	help
+	 Say Y to manually set the base addresses and sizes.
+	 otherwise, the default values are assigned.
+
+config DRAM_BASE
+	hex '(S)DRAM Base Address' if SET_MEM_PARAM
+	default 0x00800000
+
+config DRAM_SIZE
+	hex '(S)DRAM SIZE' if SET_MEM_PARAM
+	default 0x00800000
+
+config FLASH_MEM_BASE
+	hex 'FLASH Base Address' if SET_MEM_PARAM
+	default 0x00400000
+
+config FLASH_SIZE
+	hex 'FLASH Size' if SET_MEM_PARAM
+	default 0x00400000
+
diff --git a/trunk/arch/arm/Makefile b/trunk/arch/arm/Makefile
index e3770ed87825..73df2297a5f3 100644
--- a/trunk/arch/arm/Makefile
+++ b/trunk/arch/arm/Makefile
@@ -17,6 +17,11 @@ GZFLAGS		:=-9
 # Select a platform tht is kept up-to-date
 KBUILD_DEFCONFIG := versatile_defconfig
 
+# defines filename extension depending memory manement type.
+ifeq ($(CONFIG_MMU),)
+MMUEXT		:= -nommu
+endif
+
 ifeq ($(CONFIG_FRAME_POINTER),y)
 CFLAGS		+=-fno-omit-frame-pointer -mapcs -mno-sched-prolog
 endif
@@ -127,7 +132,7 @@ else
 MACHINE  :=
 endif
   
-export	TEXT_OFFSET GZFLAGS
+export	TEXT_OFFSET GZFLAGS MMUEXT
 
 # Do we have FASTFPE?
 FASTFPE		:=arch/arm/fastfpe