tree 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714
parent 54095a6ec7b11a008c07c5016b025206a051f560
author Tom Rini <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:25 -0700
committer Linus Torvalds <[EMAIL PROTECTED]> Sun, 17 Apr 2005 05:24:25 -0700
[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]>
ppc/boot/simple/Makefile | 3 +++
ppc/platforms/pmac_cache.S | 4 ++++
2 files changed, 7 insertions(+)
Index: arch/ppc/boot/simple/Makefile
===================================================================
--- 7e2abe2dc483e05387c331ec41e1f5c51678dd3e/arch/ppc/boot/simple/Makefile
(mode:100644 sha1:d8d801fcee10a626c3e454a0e5ae488089c38316)
+++ 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714/arch/ppc/boot/simple/Makefile
(mode:100644 sha1:c28061ad5982eb7c89745a66f5b448a37f2b66ba)
@@ -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
===================================================================
--- 7e2abe2dc483e05387c331ec41e1f5c51678dd3e/arch/ppc/platforms/pmac_cache.S
(mode:100644 sha1:c00e0352044d494db87214dffb631ca9821b06f3)
+++ 4cc7f6529b1a50a862c8b5c02c05a1ca0a371714/arch/ppc/platforms/pmac_cache.S
(mode:100644 sha1:da34a9bc9299ed93432604f8cc0b371add4dad0a)
@@ -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
