tree 8a1ddaae3e9f33ea1df5035abfde82780889cd6c
parent 4623560996c612c048d1117c26a4a8bd7c95b151
author Tom Rini <[EMAIL PROTECTED]> Tue Apr 12 08:24:59 2005
committer Linus Torvalds <[EMAIL PROTECTED]> Tue Apr 12 08:24:59 2005
[PATCH] ppc32: Fix building 32bit kernel for 64bit machines
When building a ppc32 MULTIPLATFORM kernel for a 64bit pmac, we try and
build certain files or use certain functions that make no sense in that
context. This catches the last of these.
Signed-off-by: Tom Rini <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
boot/simple/Makefile | 3 +++
platforms/pmac_cache.S | 4 ++++
2 files changed, 7 insertions(+)
Index: arch/ppc/boot/simple/Makefile
===================================================================
--- 42837313a716175b11e6d5f8141b947354e11752/arch/ppc/boot/simple/Makefile
(mode:100644 sha1:fc96d25b5ed7112e24d5c20bfda4f689a47d5d66)
+++ 8a1ddaae3e9f33ea1df5035abfde82780889cd6c/arch/ppc/boot/simple/Makefile
(mode:100644 sha1:3a410aef16e611bf3c125c79267288f4a73e7a8d)
@@ -123,10 +123,13 @@
end-$(pcore) := pcore
cacheflag-$(pcore) := -include $(clear_L2_L3)
+# Really only valid if CONFIG_6xx=y
zimage-$(CONFIG_PPC_PREP) := zImage-PPLUS
zimageinitrd-$(CONFIG_PPC_PREP) := zImage.initrd-PPLUS
+ifeq ($(CONFIG_6xx),y)
extra.o-$(CONFIG_PPC_PREP) := prepmap.o
misc-$(CONFIG_PPC_PREP) += misc-prep.o mpc10x_memory.o
+endif
end-$(CONFIG_PPC_PREP) := prep
end-$(CONFIG_SANDPOINT) := sandpoint
Index: arch/ppc/platforms/pmac_cache.S
===================================================================
--- 42837313a716175b11e6d5f8141b947354e11752/arch/ppc/platforms/pmac_cache.S
(mode:100644 sha1:777083fd79a34609f1ed0640ad6c10b9640fffb3)
+++ 8a1ddaae3e9f33ea1df5035abfde82780889cd6c/arch/ppc/platforms/pmac_cache.S
(mode:100644 sha1:8181bfea0792b2ebef710090b1f4e2f150dbb8aa)
@@ -28,6 +28,9 @@
*/
_GLOBAL(flush_disable_caches)
+#ifndef CONFIG_6xx
+ blr
+#else
BEGIN_FTR_SECTION
b flush_disable_745x
END_FTR_SECTION_IFSET(CPU_FTR_SPEC7450)
@@ -323,3 +326,4 @@
mtmsr r11 /* restore DR and EE */
isync
blr
+#endif /* CONFIG_6xx */
-
To unsubscribe from this list: send the line "unsubscribe bk-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
