diff options
| author | Albert Aribaud <albert.aribaud@free.fr> | 2010-07-12 22:24:28 +0200 |
|---|---|---|
| committer | Ben Warren <biggerbadderben@gmail.com> | 2010-07-12 23:40:31 -0700 |
| commit | d44265ad783f1896685db04faec148e32e918cda (patch) | |
| tree | e9548095b0f14eac91a900447c6a3f5a46ca430d /arch/arm | |
| parent | 9b6bcdcb932cf38a2da1b059f661b8ee6b85175f (diff) | |
| download | blackbird-obmc-uboot-d44265ad783f1896685db04faec148e32e918cda.tar.gz blackbird-obmc-uboot-d44265ad783f1896685db04faec148e32e918cda.zip | |
mvgbe: support SoCs other than kirkwood
Rename all references to kirkwood in mvgbe symbols
throughout the whole codebase.
Signed-off-by: Albert Aribaud <albert.aribaud@free.fr>
Acked-by: Prafulla Wadaskar <prafulla@marvell.com>
Signed-off-by: Ben Warren <biggerbadderben@gmail.com>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 4 | ||||
| -rw-r--r-- | arch/arm/include/asm/arch-kirkwood/kirkwood.h | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c index 6fc3902580..c63e8641f2 100644 --- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c +++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c @@ -378,10 +378,10 @@ int arch_misc_init(void) } #endif /* CONFIG_ARCH_MISC_INIT */ -#ifdef CONFIG_KIRKWOOD_EGIGA +#ifdef CONFIG_MVGBE int cpu_eth_init(bd_t *bis) { - kirkwood_egiga_initialize(bis); + mvgbe_initialize(bis); return 0; } #endif diff --git a/arch/arm/include/asm/arch-kirkwood/kirkwood.h b/arch/arm/include/asm/arch-kirkwood/kirkwood.h index 2470efbd8c..5c2586be43 100644 --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h @@ -60,6 +60,9 @@ #define KW_EGIGA0_BASE (KW_REGISTER(0x72000)) #define KW_EGIGA1_BASE (KW_REGISTER(0x76000)) +#define MVGBE0_BASE KW_EGIGA0_BASE +#define MVGBE1_BASE KW_EGIGA1_BASE + #if defined (CONFIG_KW88F6281) #include <asm/arch/kw88f6281.h> #elif defined (CONFIG_KW88F6192) |
