diff --git a/[refs] b/[refs] index ca4f062bdc5f..83c760209e0f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 54095a6ec7b11a008c07c5016b025206a051f560 +refs/heads/master: ef2f3253f061cbb86da25411a6e6e6a69a84b6ac diff --git a/trunk/arch/ppc/boot/simple/Makefile b/trunk/arch/ppc/boot/simple/Makefile index d8d801fcee10..c28061ad5982 100644 --- a/trunk/arch/ppc/boot/simple/Makefile +++ b/trunk/arch/ppc/boot/simple/Makefile @@ -123,10 +123,13 @@ zimageinitrd-$(pcore) := zImage.initrd-STRIPELF 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 diff --git a/trunk/arch/ppc/platforms/pmac_cache.S b/trunk/arch/ppc/platforms/pmac_cache.S index c00e0352044d..da34a9bc9299 100644 --- a/trunk/arch/ppc/platforms/pmac_cache.S +++ b/trunk/arch/ppc/platforms/pmac_cache.S @@ -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 @@ END_FTR_SECTION_IFSET(CPU_FTR_L3CR) mtmsr r11 /* restore DR and EE */ isync blr +#endif /* CONFIG_6xx */