[Gc-linux-cvs] linux/arch/powerpc/boot Makefile,1.7,1.8

[Albert H. <he...@us...>]

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot
In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv6933/arch/powerpc/boot

Modified Files:
	Makefile 
Log Message:
Merge v2.6.29-rc6.

NOTE: Some of the Kconfig options and Makefile entries for the drivers
marked as "broken" will disappear with this commit.



Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** Makefile	1 Feb 2009 18:29:34 -0000	1.7
--- Makefile	2 Mar 2009 19:26:37 -0000	1.8
***************
*** 64,67 ****
--- 64,68 ----
  src-plat := of.c cuboot-52xx.c cuboot-824x.c cuboot-83xx.c cuboot-85xx.c holly.c \
  		cuboot-ebony.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 \
***************
*** 194,197 ****
--- 195,199 ----
  image-$(CONFIG_PPC_PS3)			+= dtbImage.ps3
  image-$(CONFIG_PPC_CELLEB)		+= zImage.pseries
+ image-$(CONFIG_PPC_CELL_QPACE)		+= zImage.pseries
  image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
  image-$(CONFIG_PPC_EFIKA)		+= zImage.chrp
***************
*** 207,211 ****
  # Theses are default targets to build images which embed device tree blobs.
  # They are only required on boards which do not have FDT support in firmware.
! # Boards with newish u-boot firmare can use the uImage target above
  #
  
--- 209,213 ----
  # Theses are default targets to build images which embed device tree blobs.
  # They are only required on boards which do not have FDT support in firmware.
! # Boards with newish u-boot firmware can use the uImage target above
  #
  
***************
*** 357,361 ****
  
  install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
! 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $<
  
  # anything not in $(targets)
--- 359,363 ----
  
  install: $(CONFIGURE) $(addprefix $(obj)/, $(image-y))
! 	sh -x $(srctree)/$(src)/install.sh "$(KERNELRELEASE)" vmlinux System.map "$(INSTALL_PATH)" $^
  
  # anything not in $(targets)