vserver 1.9.3

[linux-2.6.git] / arch / ppc / boot / simple / Makefile

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index 91e2cc4..895b557 100644 (file)
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -64,6 +64,7 @@ zimageinitrd-$(CONFIG_EBONY)          := zImage.initrd-TREE
 zimageinitrd-$(CONFIG_OCOTEA)          := zImage.initrd-TREE
          end-$(CONFIG_OCOTEA)          := ocotea
   entrypoint-$(CONFIG_OCOTEA)          := 0x01000000
+     extra.o-$(CONFIG_OCOTEA)          := pibs.o
 
      extra.o-$(CONFIG_EV64260)         := direct.o misc-ev64260.o
          end-$(CONFIG_EV64260)         := ev64260
@@ -73,7 +74,7 @@ zimageinitrd-$(CONFIG_OCOTEA)         := zImage.initrd-TREE
 zimageinitrd-$(CONFIG_GEMINI)          := zImage.initrd-STRIPELF
          end-$(CONFIG_GEMINI)          := gemini
 
-     extra.o-$(CONFIG_K2)              := legacy.o
+     extra.o-$(CONFIG_K2)              := prepmap.o
          end-$(CONFIG_K2)              := k2
    cacheflag-$(CONFIG_K2)              := -include $(clear_L2_L3)
 
@@ -89,7 +90,7 @@ zimageinitrd-$(motorola)              := zImage.initrd-PPLUS
          end-$(motorola)               := pplus
 
 # Overrides previous assingment
-     extra.o-$(CONFIG_PPLUS)           := legacy.o
+     extra.o-$(CONFIG_PPLUS)           := prepmap.o
      extra.o-$(CONFIG_LOPEC)           := mpc10x_memory.o
 
       zimage-$(pcore)                  := zImage-STRIPELF
@@ -100,7 +101,7 @@ zimageinitrd-$(pcore)                       := zImage.initrd-STRIPELF
 
       zimage-$(CONFIG_PPC_PREP)                := zImage-PPLUS
 zimageinitrd-$(CONFIG_PPC_PREP)                := zImage.initrd-PPLUS
-     extra.o-$(CONFIG_PPC_PREP)                := legacy.o
+     extra.o-$(CONFIG_PPC_PREP)                := prepmap.o
         misc-$(CONFIG_PPC_PREP)                += misc-prep.o mpc10x_memory.o
          end-$(CONFIG_PPC_PREP)                := prep
 
@@ -113,6 +114,12 @@ zimageinitrd-$(CONFIG_SPRUCE)              := zImage.initrd-TREE
   entrypoint-$(CONFIG_SPRUCE)          := 0x00800000
         misc-$(CONFIG_SPRUCE)          += misc-spruce.o
 
+      zimage-$(CONFIG_LITE5200)                := zImage-STRIPELF
+zimageinitrd-$(CONFIG_LITE5200)                := zImage.initrd-STRIPELF
+         end-$(CONFIG_LITE5200)                := lite5200
+   cacheflag-$(CONFIG_LITE5200)                := -include $(clear_L2_L3)
+
+
 # SMP images should have a '.smp' suffix.
          end-$(CONFIG_SMP)             := $(end-y).smp
 
@@ -125,7 +132,7 @@ EXTRA_AFLAGS := $(extra-aflags-y)
 AFLAGS_head.o                          += $(cacheflag-y)
 
 # Linker args.  This specifies where the image will be run at.
-LD_ARGS                                := -T $(boot)/ld.script \
+LD_ARGS                                        := -T $(srctree)/$(boot)/ld.script \
                                   -Ttext $(CONFIG_BOOT_LOAD) -Bstatic
 OBJCOPY_ARGS                   := -O elf32-powerpc
 
@@ -139,11 +146,12 @@ boot-$(CONFIG_MBX)                += iic.o pci.o qspan_pci.o
 boot-$(CONFIG_RPXCLASSIC)      += iic.o pci.o qspan_pci.o
 boot-$(CONFIG_RPXLITE)         += iic.o
 # Different boards need different serial implementations.
-ifeq ($(CONFIG_SERIAL_CONSOLE),y)
+ifeq ($(CONFIG_SERIAL_CPM_CONSOLE),y)
 boot-$(CONFIG_8xx)             += m8xx_tty.o
 boot-$(CONFIG_8260)            += m8260_tty.o
-boot-$(CONFIG_GT64260_CONSOLE) += gt64260_tty.o
 endif
+boot-$(CONFIG_SERIAL_MPC52xx_CONSOLE) += mpc52xx_tty.o
+boot-$(CONFIG_GT64260_CONSOLE) += gt64260_tty.o
 
 LIBS                           := $(common)/lib.a $(bootlib)/lib.a
 ifeq ($(CONFIG_PPC_PREP),y)
@@ -159,8 +167,8 @@ MKTREE                              := $(utils)/mktree
 
 targets := dummy.o
 
-$(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \
-               $(obj)/dummy.o
+$(obj)/zvmlinux: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
+               $(images)/vmlinux.gz $(obj)/dummy.o
        $(OBJCOPY) $(OBJCOPY_ARGS) \
                --add-section=.image=$(images)/vmlinux.gz \
                --set-section-flags=.image=contents,alloc,load,readonly,data \
@@ -169,7 +177,7 @@ $(obj)/zvmlinux: $(OBJS) $(LIBS) $(boot)/ld.script $(images)/vmlinux.gz \
        $(OBJCOPY) $(OBJCOPY_ARGS) $@ $@ -R .comment -R .stab \
                -R .stabstr -R .ramdisk -R .sysmap
 
-$(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(boot)/ld.script \
+$(obj)/zvmlinux.initrd: $(OBJS) $(LIBS) $(srctree)/$(boot)/ld.script \
                $(images)/vmlinux.gz $(obj)/dummy.o
        $(OBJCOPY) $(OBJCOPY_ARGS) \
                --add-section=.ramdisk=$(images)/ramdisk.image.gz \
@@ -210,10 +218,10 @@ $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
        $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
                $(ENTRYPOINT)
 
-$(images)/zImage-PPLUS: $(obj)/zvmlinux $(utils)/mkprep $(MKBUGBOOT)
+$(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
        $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)
        $(MKBUGBOOT) $(obj)/zvmlinux $(images)/zImage.bugboot
 
-$(images)/zImage.initrd-PPLUS: $(obj)/zvmlinux.initrd $(utils)/mkprep $(MKBUGBOOT)
+$(images)/zImage.initrd-PPLUS: $(obj)/zvmlinux.initrd $(MKPREP) $(MKBUGBOOT)
        $(MKPREP) -pbp $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y)
        $(MKBUGBOOT) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.bugboot