Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 909aeca6 authored by Grant C. Likely's avatar Grant C. Likely Committed by Paul Mackerras
Browse files

[PATCH] powerpc: Add support for Xilinx ML403 reference design 



Includes fix for Xilinx silicon errata 213

Signed-off-by: default avatarGrant C. Likely <grant.likely@secretlab.ca>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent b58b5aa5

arch/ppc/boot/simple/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -192,6 +192,7 @@ boot-$(CONFIG_8xx) += embed_config.o 
boot-$(CONFIG_8260)		+= embed_config.o

boot-$(CONFIG_EP405)		+= embed_config.o

boot-$(CONFIG_XILINX_ML300)	+= embed_config.o

boot-$(CONFIG_XILINX_ML403)	+= embed_config.o

boot-$(CONFIG_BSEIP)		+= iic.o

boot-$(CONFIG_MBX)		+= iic.o pci.o qspan_pci.o

boot-$(CONFIG_MV64X60)		+= misc-mv64x60.o

arch/ppc/boot/simple/embed_config.c

+2 −2
Original line number Diff line number Diff line
@@ -745,7 +745,7 @@ embed_config(bd_t **bdp) 
}

#endif /* WILLOW */



#ifdef CONFIG_XILINX_ML300

#if defined(CONFIG_XILINX_ML300) || defined(CONFIG_XILINX_ML403)

void

embed_config(bd_t ** bdp)

{
@@ -782,7 +782,7 @@ embed_config(bd_t ** bdp) 
	timebase_period_ns = 1000000000 / bd->bi_tbfreq;

	/* see bi_tbfreq definition in arch/ppc/platforms/4xx/xilinx_ml300.h */

}

#endif /* CONFIG_XILINX_ML300 */

#endif /* CONFIG_XILINX_ML300 || CONFIG_XILINX_ML403 */



#ifdef CONFIG_IBM_OPENBIOS

/* This could possibly work for all treeboot roms.

arch/ppc/boot/simple/head.S

+7 −0
Original line number Diff line number Diff line
@@ -65,6 +65,13 @@ start_: 
			 */

#endif



#if defined(CONFIG_XILINX_VIRTEX_4_FX)

	/* PPC errata 213: only for Virtex-4 FX */

	mfccr0  0

	oris    0,0,0x50000000@h

	mtccr0  0

#endif



	mflr	r3	/* Save our actual starting address. */



	/* The following functions we call must not modify r3 or r4.....

arch/ppc/platforms/4xx/Kconfig

+11 −2
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ config XILINX_ML300 
	help

	  This option enables support for the Xilinx ML300 evaluation board.



config XILINX_ML403

	bool "Xilinx-ML403"

	help

	  This option enables support for the Xilinx ML403 evaluation board.

endchoice



choice
@@ -208,9 +212,14 @@ config XILINX_VIRTEX_II_PRO 
	depends on XILINX_ML300

	default y



config XILINX_VIRTEX_4_FX

	bool

	depends on XILINX_ML403

	default y



config XILINX_VIRTEX

	bool

	depends on XILINX_VIRTEX_II_PRO

	depends on XILINX_VIRTEX_II_PRO || XILINX_VIRTEX_4_FX

	default y



config STB03xxx
@@ -220,7 +229,7 @@ config STB03xxx 


config EMBEDDEDBOOT

	bool

	depends on EP405 || XILINX_ML300

	depends on EP405 || XILINX_ML300 || XILINX_ML403

	default y



config IBM_OPENBIOS

arch/ppc/platforms/4xx/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ obj-$(CONFIG_REDWOOD_6) += redwood6.o 
obj-$(CONFIG_SYCAMORE)		+= sycamore.o

obj-$(CONFIG_WALNUT)		+= walnut.o

obj-$(CONFIG_XILINX_ML300)	+= xilinx_ml300.o

obj-$(CONFIG_XILINX_ML403)	+= xilinx_ml403.o



obj-$(CONFIG_405GP)		+= ibm405gp.o

obj-$(CONFIG_REDWOOD_5)		+= ibmstb4.o
@@ -27,3 +28,4 @@ obj-$(CONFIG_440SPE) += ppc440spe.o 
obj-$(CONFIG_405EP)		+= ibm405ep.o

obj-$(CONFIG_405GPR)		+= ibm405gpr.o

obj-$(CONFIG_XILINX_VIRTEX)	+= virtex.o