Re: Classic PPC specific ASM (CONFIG_6XX)

[Tom Rini <trini@kernel.crashing.org>]

On Mon, Jan 10, 2005 at 08:03:20AM +1100, Paul Mackerras wrote:
> Jerome Glisse writes:
> 
> > With 2.6.10 i get a compilation error with disable_6xx_mmu
> 
> What kind of machine is this?  Could you send me your .config?
> 
> I suspect that maybe we aren't defining CONFIG_6XX for PPC970
> machines.

Indeed.  It might make most sense to do something like:

Signed-off-by: Tom Rini <trini@kernel.crashing.org>

--- 1.40/arch/ppc/boot/simple/Makefile	2005-01-03 16:49:19 -07:00
+++ edited/arch/ppc/boot/simple/Makefile	2005-01-10 07:51:34 -07:00
@@ -112,11 +112,15 @@
          end-$(pcore)			:= pcore
    cacheflag-$(pcore)			:= -include $(clear_L2_L3)
 
+# PPC_PREP can be set to y on a PPC970 configuration, which isn't a real
+# machine.
+ifeq ($(CONFIG_6xx),y)
       zimage-$(CONFIG_PPC_PREP)		:= zImage-PPLUS
 zimageinitrd-$(CONFIG_PPC_PREP)		:= zImage.initrd-PPLUS
      extra.o-$(CONFIG_PPC_PREP)		:= prepmap.o
         misc-$(CONFIG_PPC_PREP)		+= misc-prep.o mpc10x_memory.o
          end-$(CONFIG_PPC_PREP)		:= prep
+endif
 
          end-$(CONFIG_SANDPOINT)	:= sandpoint
    cacheflag-$(CONFIG_SANDPOINT)	:= -include $(clear_L2_L3)

-- 
Tom Rini
http://gate.crashing.org/~trini/