8xx: Analogue & Micro Adder875 board support.
PATCH v2 1/3 8xx: Analogue & Micro Adder875 board support.
---
Patch series resent according to feedback.
arch/powerpc/Kconfig | 3 + arch/powerpc/boot/.gitignore | 1 + arch/powerpc/boot/Makefile | 6 +- arch/powerpc/boot/dts/adder875-redboot.dts | 165 +++++ arch/powerpc/boot/dts/adder875-uboot.dts | 175 +++++ arch/powerpc/boot/redboot-8xx.c | 58 ++ arch/powerpc/boot/redboot.h | 56 ++ arch/powerpc/boot/wrapper | 2 +- arch/powerpc/configs/adder875-redboot_defconfig | 798 +++++++++++++++++++++++ arch/powerpc/configs/adder875-uboot_defconfig | 798 +++++++++++++++++++++++ arch/powerpc/platforms/8xx/Kconfig | 9 + arch/powerpc/platforms/8xx/Makefile | 1 + arch/powerpc/platforms/8xx/adder875.c | 123 ++++ 13 files changed, 2193 insertions(+), 2 deletions(-) create mode 100644 arch/powerpc/boot/dts/adder875-redboot.dts create mode 100644 arch/powerpc/boot/dts/adder875-uboot.dts create mode 100644 arch/powerpc/boot/redboot-8xx.c create mode 100644 arch/powerpc/boot/redboot.h create mode 100644 arch/powerpc/configs/adder875-redboot_defconfig create mode 100644 arch/powerpc/configs/adder875-uboot_defconfig create mode 100644 arch/powerpc/platforms/8xx/adder875.c
arch/powerpc/Kconfig +3 -0
@@ -140,6 +140,9 @@ config DEFAULT_UIMAGE Used to allow a board to specify it wants a uImage built by default default n +config REDBOOT + bool + config PPC64_SWSUSP bool depends on PPC64 && (BROKEN || (PPC_PMAC64 && EXPERIMENTAL))
arch/powerpc/boot/.gitignore +1 -0
@@ -30,6 +30,7 @@ zImage.*lds zImage.miboot zImage.pmac zImage.pseries +zImage.redboot* zImage.sandpoint zImage.vmode zconf.h
arch/powerpc/boot/Makefile +5 -1
@@ -58,7 +58,7 @@ src-plat := of.c cuboot-52xx.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 \ - fixed-head.S ep88xc.c cuboot-hpc2.c + fixed-head.S ep88xc.c cuboot-hpc2.c redboot-8xx.c src-boot := $(src-wlib) $(src-plat) empty.c src-boot := $(addprefix $(obj)/, $(src-boot))
@@ -165,6 +165,10 @@ image-$(CONFIG_SEQUOIA) += cuImage.sequoia image-$(CONFIG_WALNUT) += treeImage.walnut endif +ifneq ($(CONFIG_REDBOOT),"") +image-$(CONFIG_PPC_8xx) += zImage.redboot-8xx +endif + # For 32-bit powermacs, build the COFF and miboot images # as well as the ELF images. ifeq ($(CONFIG_PPC32),y)
arch/powerpc/boot/dts/adder875-redboot.dts new file +165 -0
165 lines not on this page · raw message
arch/powerpc/boot/dts/adder875-uboot.dts new file +175 -0
175 lines not on this page · raw message
arch/powerpc/boot/redboot-8xx.c new file +58 -0
58 lines not on this page · raw message
arch/powerpc/boot/redboot.h new file +56 -0
56 lines not on this page · raw message
arch/powerpc/boot/wrapper +1 -1
@@ -168,7 +168,7 @@ ps3) ksection=.kernel:vmlinux.bin isection=.kernel:initrd ;; -ep88xc) +ep88xc|redboot*) platformo="$object/fixed-head.o $object/$platform.o" binary=y ;;
arch/powerpc/configs/adder875-redboot_defconfig new file +798 -0
798 lines not on this page · raw message
arch/powerpc/configs/adder875-uboot_defconfig new file +798 -0
798 lines not on this page · raw message
arch/powerpc/platforms/8xx/Kconfig +9 -0
@@ -43,6 +43,15 @@ config PPC_EP88XC This board is also resold by Freescale as the QUICCStart MPC885 Evaluation System and/or the CWH-PPC-885XN-VE. +config PPC_ADDER875 + bool "Analogue & Micro Adder 875" + select CPM1 + select PPC_CPM_NEW_BINDING + select REDBOOT + help + This enables support for the Analogue & Micro Adder 875 + board. + endchoice menu "Freescale Ethernet driver platform-specific options"
arch/powerpc/platforms/8xx/Makefile +1 -0
@@ -5,3 +5,4 @@ obj-$(CONFIG_PPC_8xx) += m8xx_setup.o obj-$(CONFIG_MPC885ADS) += mpc885ads_setup.o obj-$(CONFIG_MPC86XADS) += mpc86xads_setup.o obj-$(CONFIG_PPC_EP88XC) += ep88xc.o +obj-$(CONFIG_PPC_ADDER875) += adder875.o
arch/powerpc/platforms/8xx/adder875.c new file +123 -0
123 lines not on this page · raw message
Signature · 1 line
1.5.3.7
Quoted 1 line · Scott Wood
Signed-off-by Scott Wood <[email protected]>
[snip]
Quoted 5 lines
arch/powerpc/boot/dts/adder875-redboot.dts new file +0
-0
[snip]
arch/powerpc/boot/dts/adder875-uboot.dts
Quoted 5 lines
arch/powerpc/boot/dts/adder875-uboot.dts new file +0
-0
Having two different device trees for the different firmwares is pretty yucky, and could be a pain in the bum for synchronization of fixes. Can't you have a common tree, and just poke the places that are differently configured by the two firmwares from the bootwrapper.
A helper function that adjusts soc, localbus, pci and whatever else is necessary based on the immrbase could be useful for other fsl platforms, too.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 9 lines · David Gibson
Quoted 1 line · Scott Wood
Signed-off-by Scott Wood <[email protected]>[snip]
Quoted 5 lines
arch/powerpc/boot/dts/adder875-redboot.dts new file +0
-0[snip]
Quoted 9 lines
arch/powerpc/boot/dts/adder875-uboot.dts
Quoted 5 lines
arch/powerpc/boot/dts/adder875-uboot.dts new file +0
-0Having two different device trees for the different firmwares is pretty yucky, and could be a pain in the bum for synchronization of fixes.
Yes, that's why we need some sort of macro/template facility in dtc. :-)
Quoted 2 lines
Can't you have a common tree, and just poke the places that are differently configured by the two firmwares from the bootwrapper.
Enh. That can get icky as well, and the bootwrapper isn't necessarily even used for u-boot, and I'd rather not require it be used just for this.
-Scott
Quoted 20 lines · Scott Wood
Quoted 9 lines · David Gibson
Quoted 1 line · Scott Wood
Signed-off-by Scott Wood <[email protected]>[snip]
Quoted 5 lines
arch/powerpc/boot/dts/adder875-redboot.dts new file +0
-0[snip]
Quoted 9 lines
arch/powerpc/boot/dts/adder875-uboot.dts
Quoted 5 lines
arch/powerpc/boot/dts/adder875-uboot.dts new file +0
-0Having two different device trees for the different firmwares is pretty yucky, and could be a pain in the bum for synchronization of fixes.
Quoted 7 lines
Yes, that's why we need some sort of macro/template facility in dtc. :-)
Quoted 2 lines
Can't you have a common tree, and just poke the places that are differently configured by the two firmwares from the bootwrapper.
Enh. That can get icky as well, and the bootwrapper isn't necessarily even used for u-boot, and I'd rather not require it be used just for this.
So make the template in the u-boot form, and poke it as necessary from the redboot wrapper.
Signature · 4 lines
David Gibson | I'll have my music baroque, and my code david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_ | _way_ _around_! http://www.ozlabs.org/~dgibson
Quoted 5 lines · David Gibson
Quoted 1 line · Scott Wood
Enh. That can get icky as well, and the bootwrapper isn't necessarily even used for u-boot, and I'd rather not require it be used just for this.
So make the template in the u-boot form, and poke it as necessary from the redboot wrapper.
I'd rather not, given that I have limited access to a board with redboot to test on, and that it's just a cosmetic change. Separate device trees are fine for now, and hopefully will motivate work on dtc templates.
-Scott