Merge branch 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git…

…/paulus/powerpc * 'merge' of git://git.kernel.org/pub/scm/linux/kernel/git/paulus/powerpc: [POWERPC] Update some defconfigs [POWERPC] Hide resources on Axon PCIE root complex nodes [POWERPC] Fix cell IOMMU code to cope with empty dma-ranges and non-PCI devices [POWERPC] Fix build failure for tqm8540 and sbc85xx defconfigs [POWERPC] Fix PMU + soft interrupt disable bug [POWERPC] user_regset PTRACE_SETREGS regression fix
git-mirror · Mar 20, 2008 · 635440c · 635440c
2 parents de7c6d1 + 93ce4e2
commit 635440c
Show file tree

Hide file tree

Showing 16 changed files with 835 additions and 534 deletions.
diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
@@ -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_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 --git a/arch/powerpc/boot/wrapper b/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