Merge branch 'drm-forlinus' of git://git.kernel.org/pub/scm/linux/kernel/git/airlied...

[pandora-kernel.git] / arch / ppc / boot / simple / Makefile

diff --git a/arch/ppc/boot/simple/Makefile b/arch/ppc/boot/simple/Makefile
index ff0904e..9533f8d 100644 (file)
--- a/arch/ppc/boot/simple/Makefile
+++ b/arch/ppc/boot/simple/Makefile
@@ -67,6 +67,12 @@ zimageinitrd-$(CONFIG_BAMBOO)                := zImage.initrd-TREE
   entrypoint-$(CONFIG_BAMBOO)          := 0x01000000
      extra.o-$(CONFIG_BAMBOO)          := pibs.o
 
+      zimage-$(CONFIG_BUBINGA)         := zImage-TREE
+zimageinitrd-$(CONFIG_BUBINGA)         := zImage.initrd-TREE
+         end-$(CONFIG_BUBINGA)         := bubinga
+  entrypoint-$(CONFIG_BUBINGA)         := 0x01000000
+     extra.o-$(CONFIG_BUBINGA)         := openbios.o
+
       zimage-$(CONFIG_EBONY)           := zImage-TREE
 zimageinitrd-$(CONFIG_EBONY)           := zImage.initrd-TREE
          end-$(CONFIG_EBONY)           := ebony
@@ -91,6 +97,18 @@ zimageinitrd-$(CONFIG_OCOTEA)                := zImage.initrd-TREE
   entrypoint-$(CONFIG_OCOTEA)          := 0x01000000
      extra.o-$(CONFIG_OCOTEA)          := pibs.o
 
+      zimage-$(CONFIG_SYCAMORE)                := zImage-TREE
+zimageinitrd-$(CONFIG_SYCAMORE)                := zImage.initrd-TREE
+         end-$(CONFIG_SYCAMORE)                := sycamore
+  entrypoint-$(CONFIG_SYCAMORE)                := 0x01000000
+     extra.o-$(CONFIG_SYCAMORE)                := openbios.o
+
+      zimage-$(CONFIG_WALNUT)          := zImage-TREE
+zimageinitrd-$(CONFIG_WALNUT)          := zImage.initrd-TREE
+         end-$(CONFIG_WALNUT)          := walnut
+  entrypoint-$(CONFIG_WALNUT)          := 0x01000000
+     extra.o-$(CONFIG_WALNUT)          := openbios.o
+
      extra.o-$(CONFIG_EV64260)         := misc-ev64260.o
          end-$(CONFIG_EV64260)         := ev64260
    cacheflag-$(CONFIG_EV64260)         := -include $(clear_L2_L3)
@@ -168,9 +186,12 @@ OBJCOPY_ARGS                       := -O elf32-powerpc
 
 # head.o and relocate.o must be at the start.
 boot-y                         := head.o relocate.o $(extra.o-y) $(misc-y)
-boot-$(CONFIG_40x)             += embed_config.o
+boot-$(CONFIG_REDWOOD_5)       += embed_config.o
+boot-$(CONFIG_REDWOOD_6)       += embed_config.o
 boot-$(CONFIG_8xx)             += embed_config.o
 boot-$(CONFIG_8260)            += embed_config.o
+boot-$(CONFIG_EP405)           += embed_config.o
+boot-$(CONFIG_XILINX_ML300)    += embed_config.o
 boot-$(CONFIG_BSEIP)           += iic.o
 boot-$(CONFIG_MBX)             += iic.o pci.o qspan_pci.o
 boot-$(CONFIG_MV64X60)         += misc-mv64x60.o
@@ -243,11 +264,11 @@ $(images)/zImage.initrd-STRIPELF: $(obj)/zvmlinux.initrd
                skip=64 bs=1k
 
 $(images)/zImage-TREE: $(obj)/zvmlinux $(MKTREE)
-       $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(ENTRYPOINT)
+       $(MKTREE) $(obj)/zvmlinux $(images)/zImage.$(end-y) $(entrypoint-y)
 
 $(images)/zImage.initrd-TREE: $(obj)/zvmlinux.initrd $(MKTREE)
        $(MKTREE) $(obj)/zvmlinux.initrd $(images)/zImage.initrd.$(end-y) \
-               $(ENTRYPOINT)
+               $(entrypoint-y)
 
 $(images)/zImage-PPLUS: $(obj)/zvmlinux $(MKPREP) $(MKBUGBOOT)
        $(MKPREP) -pbp $(obj)/zvmlinux $(images)/zImage.$(end-y)