From c8c03fec0f268b955e5da2baf0ed93016dc2ae01 Mon Sep 17 00:00:00 2001
From: Michal Simek <monstr@monstr.eu>
Date: Tue, 26 May 2009 16:30:32 +0200
Subject: [PATCH] --- yaml --- r: 148644 b: refs/heads/master c:
 4b2368ffd6e3563b73b8391c133822a58b1b432a h: refs/heads/master v: v3

---
 [refs]                                | 2 +-
 trunk/arch/microblaze/Makefile        | 4 ++++
 trunk/arch/microblaze/boot/Makefile   | 2 ++
 trunk/arch/microblaze/kernel/Makefile | 1 +
 trunk/arch/microblaze/lib/Makefile    | 3 ++-
 trunk/arch/microblaze/mm/Makefile     | 2 ++
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 591028474d7a..e19b8bd68ba1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a116f6d5db4476d0c941b495a6122b0130bbf20b
+refs/heads/master: 4b2368ffd6e3563b73b8391c133822a58b1b432a
diff --git a/trunk/arch/microblaze/Makefile b/trunk/arch/microblaze/Makefile
index ab731b75c23b..d0bcf80a1136 100644
--- a/trunk/arch/microblaze/Makefile
+++ b/trunk/arch/microblaze/Makefile
@@ -1,4 +1,8 @@
+ifeq ($(CONFIG_MMU),y)
+UTS_SYSNAME = -DUTS_SYSNAME=\"Linux\"
+else
 UTS_SYSNAME = -DUTS_SYSNAME=\"uClinux\"
+endif
 
 # What CPU vesion are we building for, and crack it open
 # as major.minor.rev
diff --git a/trunk/arch/microblaze/boot/Makefile b/trunk/arch/microblaze/boot/Makefile
index 844edf406d34..c2bb043a029d 100644
--- a/trunk/arch/microblaze/boot/Makefile
+++ b/trunk/arch/microblaze/boot/Makefile
@@ -7,6 +7,8 @@ targets := linux.bin linux.bin.gz
 OBJCOPYFLAGS_linux.bin  := -O binary
 
 $(obj)/linux.bin: vmlinux FORCE
+	[ -n $(CONFIG_INITRAMFS_SOURCE) ] && [ ! -e $(CONFIG_INITRAMFS_SOURCE) ] && \
+	touch $(CONFIG_INITRAMFS_SOURCE) || echo "No CPIO image"
 	$(call if_changed,objcopy)
 	@echo 'Kernel: $@ is ready' ' (#'`cat .version`')'
 
diff --git a/trunk/arch/microblaze/kernel/Makefile b/trunk/arch/microblaze/kernel/Makefile
index da94bec4ecba..f4a5e19a20eb 100644
--- a/trunk/arch/microblaze/kernel/Makefile
+++ b/trunk/arch/microblaze/kernel/Makefile
@@ -15,5 +15,6 @@ obj-$(CONFIG_EARLY_PRINTK)	+= early_printk.o
 obj-$(CONFIG_SELFMOD)		+= selfmod.o
 obj-$(CONFIG_HEART_BEAT)	+= heartbeat.o
 obj-$(CONFIG_MODULES)		+= microblaze_ksyms.o module.o
+obj-$(CONFIG_MMU)		+= misc.o
 
 obj-y	+= entry$(MMUEXT).o
diff --git a/trunk/arch/microblaze/lib/Makefile b/trunk/arch/microblaze/lib/Makefile
index d27126bf306a..71c8cb6c9e43 100644
--- a/trunk/arch/microblaze/lib/Makefile
+++ b/trunk/arch/microblaze/lib/Makefile
@@ -10,4 +10,5 @@ else
 lib-y += memcpy.o memmove.o
 endif
 
-lib-y +=  uaccess.o
+lib-$(CONFIG_NO_MMU) += uaccess.o
+lib-$(CONFIG_MMU) += uaccess_old.o
diff --git a/trunk/arch/microblaze/mm/Makefile b/trunk/arch/microblaze/mm/Makefile
index bf9e4479a1fd..6c8a924d9e26 100644
--- a/trunk/arch/microblaze/mm/Makefile
+++ b/trunk/arch/microblaze/mm/Makefile
@@ -3,3 +3,5 @@
 #
 
 obj-y := init.o
+
+obj-$(CONFIG_MMU) += pgtable.o mmu_context.o fault.o