[Gc-linux-cvs] linux/arch/powerpc/boot Makefile, 1.12, 1.13 wrapper, 1.4, 1.5

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

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

Modified Files:
	Makefile wrapper 
Log Message:
Merge gc-linux-v2.6.31.


Index: Makefile
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	25 Oct 2009 18:53:45 -0000	1.12
--- Makefile	25 Oct 2009 18:59:27 -0000	1.13
***************
*** 66,70 ****
  		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
  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 \
--- 66,70 ----
  		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 treeboot-ebony.c prpmc2800.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
  
--- 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 gamecube.c wii.c
  src-boot := $(src-wlib) $(src-plat) empty.c
  
***************
*** 253,256 ****
--- 253,258 ----
  image-$(CONFIG_MPC7448HPC2)		+= cuImage.mpc7448hpc2
  image-$(CONFIG_PPC_C2K)			+= cuImage.c2k
+ image-$(CONFIG_GAMECUBE)		+= dtbImage.gamecube
+ image-$(CONFIG_WII)			+= dtbImage.wii
  
  # Board port in arch/powerpc/platform/amigaone/Kconfig

Index: wrapper
===================================================================
RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/wrapper,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** wrapper	25 Oct 2009 18:56:55 -0000	1.4
--- wrapper	25 Oct 2009 18:59:27 -0000	1.5
***************
*** 230,233 ****
--- 230,236 ----
      platformo=$object/cuboot-85xx.o
      ;;
+ wii|gamecube)
+     link_address='0x500000'
+     ;;
  esac