Merge commit 'jwb/jwb-next'

diff --combined arch/powerpc/Kconfig
index 462c86a4eefbc42d4149542d216843875f827795,3216a3a983964062c39adca66bb49a82941a290c..aaf99892d1b3492c2848542878395cf224aafe6e
--- 1/arch/powerpc/Kconfig
--- 2/arch/powerpc/Kconfig
+++ b/arch/powerpc/Kconfig
@@@ -110,7 -110,6 +110,7 @@@ config PP
        select HAVE_KPROBES
        select HAVE_KRETPROBES
        select HAVE_LMB
 +      select HAVE_DMA_ATTRS
  
  config EARLY_PRINTK
        bool
@@@ -459,6 -458,19 +459,19 @@@ config CMDLIN
          some command-line options at build time by entering them here.  In
          most cases you will need to specify the root device here.
  
+ config EXTRA_TARGETS
+       string "Additional default image types"
+       help
+         List additional targets to be built by the bootwrapper here (separated
+         by spaces).  This is useful for targets that depend of device tree
+         files in the .dts directory.
+ 
+         Targets in this list will be build as part of the default build
+         target, or when the user does a 'make zImage' or a
+         'make zImage.initrd'.
+ 
+         If unsure, leave blank
+ 
  if !44x || BROKEN
  config ARCH_WANTS_FREEZER_CONTROL
        def_bool y

diff --combined arch/powerpc/boot/Makefile
index 0055edbc774c80d5e139ff3cdfad1d4f9f314700,88d30dbed7b758e75a0ff1a003e241f14d48e12d..19f83c8f219dcc7ba0fac3d88166b687e143f86b
--- 1/arch/powerpc/boot/Makefile
--- 2/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@@ -68,7 -68,7 +68,7 @@@ src-plat := of.c cuboot-52xx.c cuboot-8
                fixed-head.S ep88xc.c ep405.c cuboot-c2k.c \
                cuboot-katmai.c cuboot-rainier.c redboot-8xx.c ep8248e.c \
                cuboot-warp.c cuboot-85xx-cpm2.c cuboot-yosemite.c simpleboot.c \
-               virtex405-head.S redboot-83xx.c cuboot-sam440ep.c
+               virtex405-head.S virtex.c redboot-83xx.c cuboot-sam440ep.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
  src-boot := $(addprefix $(obj)/, $(src-boot))
@@@ -276,11 -276,13 +276,14 @@@ ifeq ($(CONFIG_PPC32),y
  image-$(CONFIG_PPC_PMAC)      += zImage.coff zImage.miboot
  endif
  
+ # Allow extra targets to be added to the defconfig
+ image-y       += $(subst ",,$(CONFIG_EXTRA_TARGETS))
+ 
  initrd-  := $(patsubst zImage%, zImage.initrd%, $(image-n) $(image-))
  initrd-y := $(patsubst zImage%, zImage.initrd%, \
                $(patsubst dtbImage%, dtbImage.initrd%, \
 -              $(patsubst treeImage%, treeImage.initrd%, $(image-y))))
 +              $(patsubst simpleImage%, simpleImage.initrd%, \
 +              $(patsubst treeImage%, treeImage.initrd%, $(image-y)))))
  initrd-y := $(filter-out $(image-y), $(initrd-y))
  targets       += $(image-y) $(initrd-y)