From: Albert H. <he...@us...> - 2009-12-09 18:45:02
|
Update of /cvsroot/gc-linux/linux/arch/powerpc/boot In directory sfp-cvsdas-2.v30.ch3.sourceforge.com:/tmp/cvs-serv22540/arch/powerpc/boot Modified Files: Makefile wrapper Log Message: Merge v2.6.32. Index: Makefile =================================================================== RCS file: /cvsroot/gc-linux/linux/arch/powerpc/boot/Makefile,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** Makefile 9 Dec 2009 18:40:09 -0000 1.15 --- Makefile 9 Dec 2009 18:44:54 -0000 1.16 *************** *** 67,71 **** 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 cuboot-hotfoot.c treeboot-ebony.c prpmc2800.c \ --- 67,71 ---- 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 treeboot-ebony.c prpmc2800.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 --- 77,82 ---- 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.c wii.c src-boot := $(src-wlib) $(src-plat) empty.c *************** *** 255,258 **** --- 256,261 ---- 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.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** wrapper 9 Dec 2009 18:40:09 -0000 1.7 --- wrapper 9 Dec 2009 18:44:54 -0000 1.8 *************** *** 231,234 **** --- 231,237 ---- platformo=$object/cuboot-85xx.o ;; + wii|gamecube) + link_address='0x600000' + ;; esac |