-----Original Message----- From: u-boot-bounces@lists.denx.de [mailto:u-boot-bounces@lists.denx.de] On Behalf Of Albert Aribaud Sent: Sunday, July 11, 2010 1:32 PM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 4/5] mv_egiga: add support for orion5x egiga controller
Add definitions and initialization in orion5x for mv_egiga. Add orion5x in mv_egiga SoC includes.
Signed-off-by: Albert Aribaud albert.aribaud@free.fr
arch/arm/cpu/arm926ejs/orion5x/cpu.c | 8 ++++++++ arch/arm/include/asm/arch-orion5x/orion5x.h | 5 +++++ drivers/net/mv_egiga.c | 2 ++ 3 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c b/arch/arm/cpu/arm926ejs/orion5x/cpu.c index 03c6d06..fc9455e 100644 --- a/arch/arm/cpu/arm926ejs/orion5x/cpu.c +++ b/arch/arm/cpu/arm926ejs/orion5x/cpu.c @@ -268,3 +268,11 @@ int arch_misc_init(void) return 0; } #endif /* CONFIG_ARCH_MISC_INIT */
+#ifdef CONFIG_MV_EGIGA +int cpu_eth_init(bd_t *bis) +{
- mv_egiga_initialize(bis);
- return 0;
+} +#endif diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h index 4008c84..6783b74 100644 --- a/arch/arm/include/asm/arch-orion5x/orion5x.h +++ b/arch/arm/include/asm/arch-orion5x/orion5x.h @@ -56,6 +56,11 @@ #define ORION5X_USB20_PORT1_BASE (ORION5X_REGISTER(0xA0000)) #define ORION5X_EGIGA_BASE (ORION5X_REGISTER(0x72000))
+/* Oron5x has one Marvell egiga controller */
You need to move a macro MAX_KWGBE_DEVS from kirkwood_egiga.h to here, and also in kirkwood.h
+#if defined (CONFIG_MV_EGIGA)
Ifdef not needed, pls remove
+#define MV_EGIGA0_BASE ORION5X_EGIGA_BASE +#endif
Regards.. Prafulla . .