[Gc-linux-cvs] linux/arch/powerpc/boot Makefile, 1.14, 1.15 wrapper, 1.6, 1.7

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

Update of /cvsroot/gc-linux/linux/arch/powerpc/boot
In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv21229/arch/powerpc/boot

Modified Files:
	Makefile wrapper 
Log Message:
Forward to v2.6.32.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** Makefile	9 Dec 2009 18:18:06 -0000	1.14
--- Makefile	9 Dec 2009 18:40:09 -0000	1.15
***************
*** 40,43 ****
--- 40,44 ----
  $(obj)/4xx.o: BOOTCFLAGS += -mcpu=405
  $(obj)/ebony.o: BOOTCFLAGS += -mcpu=405
+ $(obj)/cuboot-hotfoot.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-taishan.o: BOOTCFLAGS += -mcpu=405
  $(obj)/cuboot-katmai.o: BOOTCFLAGS += -mcpu=405
***************
*** 68,72 ****
  		fsl-soc.c mpc8xx.c pq2.c
  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 \
--- 69,73 ----
  		fsl-soc.c mpc8xx.c pq2.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 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 \
***************
*** 76,80 ****
  		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
  src-boot := $(src-wlib) $(src-plat) empty.c
  
--- 77,81 ----
  		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
  src-boot := $(src-wlib) $(src-plat) empty.c
  
***************
*** 191,194 ****
--- 192,196 ----
  # Board ports in arch/powerpc/platform/40x/Kconfig
  image-$(CONFIG_EP405)			+= dtbImage.ep405
+ image-$(CONFIG_HOTFOOT)			+= cuImage.hotfoot
  image-$(CONFIG_WALNUT)			+= treeImage.walnut
  image-$(CONFIG_ACADIA)			+= cuImage.acadia

Index: wrapper
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** wrapper	9 Dec 2009 18:18:06 -0000	1.6
--- wrapper	9 Dec 2009 18:40:09 -0000	1.7
***************
*** 47,50 ****
--- 47,51 ----
  object=arch/powerpc/boot
  objbin=$object
+ dtc=scripts/dtc/dtc
  
  # directory for working files
***************
*** 125,129 ****
  	dtb="$platform.dtb"
      fi
!     $object/dtc -O dtb -o "$dtb" -b 0 "$dts"
  fi
  
--- 126,130 ----
  	dtb="$platform.dtb"
      fi
!     $dtc -O dtb -o "$dtb" -b 0 "$dts"
  fi