[POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs
authorPaul Gortmaker <paul.gortmaker@windriver.com>
Tue, 18 Mar 2008 05:13:10 +0000 (16:13 +1100)
committerPaul Mackerras <paulus@samba.org>
Wed, 19 Mar 2008 23:15:00 +0000 (10:15 +1100)
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: Paul Mackerras <paulus@samba.org>
arch/powerpc/boot/Makefile
arch/powerpc/boot/wrapper

index 4974d9e56ead1d02176111e5de1e2de6ea3f31b3..1aded8f759d0fc7e164b91a5208e0256ad7ea9cd 100644 (file)
@@ -253,8 +253,8 @@ image-$(CONFIG_TQM8540)                     += cuImage.tqm8540
 image-$(CONFIG_TQM8541)                        += cuImage.tqm8541
 image-$(CONFIG_TQM8555)                        += cuImage.tqm8555
 image-$(CONFIG_TQM8560)                        += cuImage.tqm8560
 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
 
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
 image-$(CONFIG_STORCENTER)             += cuImage.storcenter
index d50e498a072b99cd50af01960655a8edae9af27e..8f8b8494d62f8c6eb4c2a9b17ca16fc22a66f852 100755 (executable)
@@ -174,10 +174,10 @@ cuboot*)
     *-mpc83*)
         platformo=$object/cuboot-83xx.o
         ;;
     *-mpc83*)
         platformo=$object/cuboot-83xx.o
         ;;
-    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555*)
+    *-tqm8541|*-mpc8560*|*-tqm8560|*-tqm8555)
         platformo=$object/cuboot-85xx-cpm2.o
         ;;
         platformo=$object/cuboot-85xx-cpm2.o
         ;;
-    *-mpc85*)
+    *-mpc85*|*-tqm8540|*-sbc85*)
         platformo=$object/cuboot-85xx.o
         ;;
     esac
         platformo=$object/cuboot-85xx.o
         ;;
     esac