Patched in Tegra support.

1 files changed, 31 insertions, 53 deletions

diff --git a/arch/powerpc/boot/Makefile b/arch/powerpc/boot/Makefile
index 6a15c968d21..c26200b40a4 100644
--- a/arch/powerpc/boot/Makefile
+++ b/arch/powerpc/boot/Makefile
@@ -45,7 +45,6 @@ $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
 $(obj)/cuboot-acadia.o: BOOTCFLAGS += -mcpu=405
 $(obj)/treeboot-walnut.o: BOOTCFLAGS += -mcpu=405
 $(obj)/treeboot-iss4xx.o: BOOTCFLAGS += -mcpu=405
-$(obj)/treeboot-currituck.o: BOOTCFLAGS += -mcpu=405
 $(obj)/virtex405-head.o: BOOTAFLAGS += -mcpu=405
 
 
@@ -59,55 +58,34 @@ $(addprefix $(obj)/,$(zlib) cuboot-c2k.o gunzip_util.o main.o prpmc2800.o): \
 libfdt       := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c
 libfdtheader := fdt.h libfdt.h libfdt_internal.h
 
-$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o epapr.o): \
+$(addprefix $(obj)/,$(libfdt) libfdt-wrapper.o simpleboot.o): \
         $(addprefix $(obj)/,$(libfdtheader))
 
-src-wlib-y := string.S crt0.S crtsavres.S stdio.c main.c \
+src-wlib := string.S crt0.S crtsavres.S stdio.c main.c \
                 $(libfdt) libfdt-wrapper.c \
                 ns16550.c serial.c simple_alloc.c div64.S util.S \
-                gunzip_util.c elf_util.c $(zlib) devtree.c stdlib.c \
-                oflib.c ofconsole.c cuboot.c mpsc.c cpm-serial.c \
-                uartlite.c mpc52xx-psc.c
-src-wlib-$(CONFIG_40x) += 4xx.c planetcore.c
-src-wlib-$(CONFIG_44x) += 4xx.c ebony.c bamboo.c
-src-wlib-$(CONFIG_8xx) += mpc8xx.c planetcore.c
-src-wlib-$(CONFIG_PPC_82xx) += pq2.c fsl-soc.c planetcore.c
-src-wlib-$(CONFIG_EMBEDDED6xx) += mv64x60.c mv64x60_i2c.c ugecon.c
-
-src-plat-y := of.c
-src-plat-$(CONFIG_40x) += fixed-head.S ep405.c cuboot-hotfoot.c \
-                                treeboot-walnut.c cuboot-acadia.c \
-                                cuboot-kilauea.c simpleboot.c \
-                                virtex405-head.S virtex.c
-src-plat-$(CONFIG_44x) += treeboot-ebony.c cuboot-ebony.c treeboot-bamboo.c \
-                                cuboot-bamboo.c cuboot-sam440ep.c \
-                                cuboot-sequoia.c cuboot-rainier.c \
-                                cuboot-taishan.c cuboot-katmai.c \
-                                cuboot-warp.c cuboot-yosemite.c \
-                                treeboot-iss4xx.c treeboot-currituck.c \
-                                simpleboot.c fixed-head.S virtex.c
-src-plat-$(CONFIG_8xx) += cuboot-8xx.c fixed-head.S ep88xc.c redboot-8xx.c
-src-plat-$(CONFIG_PPC_MPC52xx) += cuboot-52xx.c
-src-plat-$(CONFIG_PPC_82xx) += cuboot-pq2.c fixed-head.S ep8248e.c cuboot-824x.c
-src-plat-$(CONFIG_PPC_83xx) += cuboot-83xx.c fixed-head.S redboot-83xx.c
-src-plat-$(CONFIG_FSL_SOC_BOOKE) += cuboot-85xx.c cuboot-85xx-cpm2.c
-src-plat-$(CONFIG_EMBEDDED6xx) += cuboot-pq2.c cuboot-mpc7448hpc2.c \
-                                        cuboot-c2k.c gamecube-head.S \
-                                        gamecube.c wii-head.S wii.c holly.c \
-                                        prpmc2800.c
-src-plat-$(CONFIG_AMIGAONE) += cuboot-amigaone.c
-src-plat-$(CONFIG_PPC_PS3) += ps3-head.S ps3-hvcall.S ps3.c
-src-plat-$(CONFIG_EPAPR_BOOT) += epapr.c
-
-src-wlib := $(sort $(src-wlib-y))
-src-plat := $(sort $(src-plat-y))
+                gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \
+                4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
+                cpm-serial.c stdlib.c mpc52xx-psc.c planetcore.c uartlite.c \
+                fsl-soc.c mpc8xx.c pq2.c ugecon.c
+src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
+                cuboot-ebony.c cuboot-hotfoot.c epapr.c treeboot-ebony.c \
+                prpmc2800.c \
+                ps3-head.S ps3-hvcall.S ps3.c treeboot-bamboo.c cuboot-8xx.c \
+                cuboot-pq2.c cuboot-sequoia.c treeboot-walnut.c \
+                cuboot-bamboo.c cuboot-mpc7448hpc2.c cuboot-taishan.c \
+                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 virtex.c redboot-83xx.c cuboot-sam440ep.c \
+                cuboot-acadia.c cuboot-amigaone.c cuboot-kilauea.c \
+                gamecube-head.S gamecube.c wii-head.S wii.c treeboot-iss4xx.c
 src-boot := $(src-wlib) $(src-plat) empty.c
 
 src-boot := $(addprefix $(obj)/, $(src-boot))
 obj-boot := $(addsuffix .o, $(basename $(src-boot)))
 obj-wlib := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-wlib))))
 obj-plat := $(addsuffix .o, $(basename $(addprefix $(obj)/, $(src-plat))))
-obj-plat: $(libfdt)
 
 quiet_cmd_copy_zlib = COPY    $@
       cmd_copy_zlib = sed "s@__used@@;s@<linux/\([^>]*\).*@\"\1\"@" $< > $@
@@ -193,7 +171,6 @@ quiet_cmd_wrap	= WRAP    $@
                 $(if $3, -s $3)$(if $4, -d $4)$(if $5, -i $5) vmlinux
 
 image-$(CONFIG_PPC_PSERIES)             += zImage.pseries
-image-$(CONFIG_PPC_POWERNV)             += zImage.pseries
 image-$(CONFIG_PPC_MAPLE)               += zImage.maple
 image-$(CONFIG_PPC_IBM_CELL_BLADE)      += zImage.pseries
 image-$(CONFIG_PPC_PS3)                 += dtbImage.ps3
@@ -204,6 +181,7 @@ image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
 image-$(CONFIG_PPC_PMAC)                += zImage.pmac
 image-$(CONFIG_PPC_HOLLY)               += dtbImage.holly
 image-$(CONFIG_PPC_PRPMC2800)           += dtbImage.prpmc2800
+image-$(CONFIG_PPC_ISERIES)             += zImage.iseries
 image-$(CONFIG_DEFAULT_UIMAGE)          += uImage
 image-$(CONFIG_EPAPR_BOOT)              += zImage.epapr
 
@@ -220,7 +198,6 @@ image-$(CONFIG_EP405)			+= dtbImage.ep405
 image-$(CONFIG_HOTFOOT)                 += cuImage.hotfoot
 image-$(CONFIG_WALNUT)                  += treeImage.walnut
 image-$(CONFIG_ACADIA)                  += cuImage.acadia
-image-$(CONFIG_OBS600)                  += uImage.obs600
 
 # Board ports in arch/powerpc/platform/44x/Kconfig
 image-$(CONFIG_EBONY)                   += treeImage.ebony cuImage.ebony
@@ -234,7 +211,6 @@ image-$(CONFIG_WARP)			+= cuImage.warp
 image-$(CONFIG_YOSEMITE)                += cuImage.yosemite
 image-$(CONFIG_ISS4xx)                  += treeImage.iss4xx \
                                            treeImage.iss4xx-mpic
-image-$(CONFIG_CURRITUCK)                       += treeImage.currituck
 
 # Board ports in arch/powerpc/platform/8xx/Kconfig
 image-$(CONFIG_MPC86XADS)               += cuImage.mpc866ads
@@ -266,7 +242,7 @@ image-$(CONFIG_ASP834x)			+= dtbImage.asp834x-redboot
 image-$(CONFIG_MPC8540_ADS)             += cuImage.mpc8540ads
 image-$(CONFIG_MPC8560_ADS)             += cuImage.mpc8560ads
 image-$(CONFIG_MPC85xx_CDS)             += cuImage.mpc8541cds \
-                                           cuImage.mpc8548cds_32b \
+                                           cuImage.mpc8548cds \
                                            cuImage.mpc8555cds
 image-$(CONFIG_MPC85xx_MDS)             += cuImage.mpc8568mds
 image-$(CONFIG_MPC85xx_DS)              += cuImage.mpc8544ds \
@@ -277,6 +253,7 @@ image-$(CONFIG_TQM8548)			+= cuImage.tqm8548
 image-$(CONFIG_TQM8555)                 += cuImage.tqm8555
 image-$(CONFIG_TQM8560)                 += cuImage.tqm8560
 image-$(CONFIG_SBC8548)                 += cuImage.sbc8548
+image-$(CONFIG_SBC8560)                 += cuImage.sbc8560
 image-$(CONFIG_KSI8560)                 += cuImage.ksi8560
 
 # Board ports in arch/powerpc/platform/embedded6xx/Kconfig
@@ -329,15 +306,15 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits) $(obj)/%.dtb
 $(obj)/vmlinux.strip: vmlinux
         $(STRIP) -s -R .comment $< -o $@
 
+# The iseries hypervisor won't take an ET_DYN executable, so this
+# changes the type (byte 17) in the file to ET_EXEC (2).
+$(obj)/zImage.iseries: vmlinux
+        $(STRIP) -s -R .comment $< -o $@
+        printf "\x02" | dd of=$@ conv=notrunc bs=1 seek=17
+
 $(obj)/uImage: vmlinux $(wrapperbits)
         $(call if_changed,wrap,uboot)
 
-$(obj)/uImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-        $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
-
-$(obj)/uImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
-        $(call if_changed,wrap,uboot-$*,,$(obj)/$*.dtb)
-
 $(obj)/cuImage.initrd.%: vmlinux $(obj)/%.dtb $(wrapperbits)
         $(call if_changed,wrap,cuboot-$*,,$(obj)/$*.dtb,$(obj)/ramdisk.image.gz)
 
@@ -357,8 +334,8 @@ $(obj)/treeImage.%: vmlinux $(obj)/%.dtb $(wrapperbits)
         $(call if_changed,wrap,treeboot-$*,,$(obj)/$*.dtb)
 
 # Rule to build device tree blobs
-$(obj)/%.dtb: $(src)/dts/%.dts FORCE
-        $(call if_changed_dep,dtc)
+$(obj)/%.dtb: $(src)/dts/%.dts
+        $(call cmd,dtc)
 
 # If there isn't a platform selected then just strip the vmlinux.
 ifeq (,$(image-y))
@@ -376,7 +353,7 @@ install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
 # anything not in $(targets)
 clean-files += $(image-) $(initrd-) cuImage.* dtbImage.* treeImage.* \
         zImage zImage.initrd zImage.chrp zImage.coff zImage.holly \
-        zImage.miboot zImage.pmac zImage.pseries \
+        zImage.iseries zImage.miboot zImage.pmac zImage.pseries \
         zImage.maple simpleImage.* otheros.bld *.dtb
 
 # clean up files cached by wrapper
@@ -431,3 +408,4 @@ $(wrapper-installed): $(DESTDIR)$(WRAPPER_BINDIR) $(srctree)/$(obj)/wrapper | $(
         $(call cmd,install_wrapper)
 
 $(obj)/bootwrapper_install: $(all-installed)
+