+ bootwrapper-add-entries-for-tqm8540-and-sbc85xx.patch added to -mm tree

+ bootwrapper-add-entries-for-tqm8540-and-sbc85xx.patch added to -mm tree

[akpm]

The patch titled
     powerpc: bootwrapper: add entries for tqm8540 and sbc85xx
has been added to the -mm tree.  Its filename is
     bootwrapper-add-entries-for-tqm8540-and-sbc85xx.patch

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/SubmitChecklist when testing your code ***

See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this

The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/

------------------------------------------------------
Subject: powerpc: bootwrapper: add entries for tqm8540 and sbc85xx
From: Paul Gortmaker <paul.gortmaker@windriver.com>

The wrapper script didn't have entries for the TQM8540 board and the SBC8548
or SBC8560 boards.  I've assumed that the TQM8540 console is 8250 based and
not CPM based by looking at its defconfig.  There was also a trailing * on the
TQM8555 entry that I removed too.

Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
Signed-off-by: Grant Likely <grant.likely@secretlab.ca>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/powerpc/boot/Makefile |    4 ++--
 arch/powerpc/boot/wrapper  |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff -puN arch/powerpc/boot/Makefile~bootwrapper-add-entries-for-tqm8540-and-sbc85xx arch/powerpc/boot/Makefile
--- a/arch/powerpc/boot/Makefile~bootwrapper-add-entries-for-tqm8540-and-sbc85xx
+++ a/arch/powerpc/boot/Makefile
@@ -253,8 +253,8 @@ image-$(CONFIG_TQM8540)			+= cuImage.tqm
 image-$(CONFIG_TQM8541)			+= cuImage.tqm8541
 image-$(CONFIG_TQM8555)			+= cuImage.tqm8555
 image-$(CONFIG_TQM8560)			+= cuImage.tqm8560
-image-$(CONFIG_SBC8548)			+= cuImage.tqm8548
-image-$(CONFIG_SBC8560)			+= cuImage.tqm8560
+image-$(CONFIG_SBC8548)			+= cuImage.sbc8548
+image-$(CONFIG_SBC8560)			+= cuImage.sbc8560
 
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER)		+= cuImage.storcenter
diff -puN arch/powerpc/boot/wrapper~bootwrapper-add-entries-for-tqm8540-and-sbc85xx arch/powerpc/boot/wrapper
--- a/arch/powerpc/boot/wrapper~bootwrapper-add-entries-for-tqm8540-and-sbc85xx
+++ a/arch/powerpc/boot/wrapper
@@ -174,10 +174,10 @@ cuboot*)
     *-mpc83*)
         platformo=$object/cuboot-83xx.o
         ;;
-    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555*)
+    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
         platformo=$object/cuboot-85xx-cpm2.o
         ;;
-    *-mpc85*)
+    *-mpc85*|*-tqm8540|*-sbc85*)
         platformo=$object/cuboot-85xx.o
         ;;
     esac
_

Patches currently in -mm which might be from paul.gortmaker@windriver.com are

bootwrapper-add-entries-for-tqm8540-and-sbc85xx.patch