From 24a514c44557601de52df3c8bc0ee789bef8714c Mon Sep 17 00:00:00 2001 From: Ben Gardiner Date: Wed, 20 Apr 2011 16:25:06 -0400 Subject: [PATCH 01/11] da850evm: fix NAND WSTROBE and TA timings The current NAND timings, introduced in commit a3f88293ddd13facd734769c1664d35ab4ed681f da850evm: setup the NAND flash timings , incorrectly set WSTROBE and TA to 0. A more recent inspection of the values set by the Linux kernel indicates that these should be set to 1. Set the WSTROBE and TA field of the EMIFA cycle-count timings configuration to 1 to match the values set by linux. Signed-off-by: Ben Gardiner CC: Stefano Babic CC: Sandeep Paulraj CC: Scott Wood Signed-off-by: Sandeep Paulraj --- board/davinci/da8xxevm/da850evm.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index b088c9c3e..73eaa48b0 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -179,12 +179,12 @@ int board_init(void) * Linux kernel @ 25MHz EMIFA */ writel((DAVINCI_ABCR_WSETUP(0) | - DAVINCI_ABCR_WSTROBE(0) | + DAVINCI_ABCR_WSTROBE(1) | DAVINCI_ABCR_WHOLD(0) | DAVINCI_ABCR_RSETUP(0) | DAVINCI_ABCR_RSTROBE(1) | DAVINCI_ABCR_RHOLD(0) | - DAVINCI_ABCR_TA(0) | + DAVINCI_ABCR_TA(1) | DAVINCI_ABCR_ASIZE_8BIT), &davinci_emif_regs->ab2cr); /* CS3 */ #endif From b73850f7644db4f4c68f6efda43928a5be5a8534 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sun, 10 Apr 2011 08:17:50 +0000 Subject: [PATCH 02/11] MX31: mx31pdk: Add watchdog support Signed-off-by: Fabio Estevam --- board/freescale/mx31pdk/mx31pdk.c | 16 ++++++++++++++++ include/configs/mx31pdk.h | 3 +++ 2 files changed, 19 insertions(+) diff --git a/board/freescale/mx31pdk/mx31pdk.c b/board/freescale/mx31pdk/mx31pdk.c index 826fb4a86..08addd29e 100644 --- a/board/freescale/mx31pdk/mx31pdk.c +++ b/board/freescale/mx31pdk/mx31pdk.c @@ -28,9 +28,17 @@ #include #include #include +#include DECLARE_GLOBAL_DATA_PTR; +#ifdef CONFIG_HW_WATCHDOG +void hw_watchdog_reset(void) +{ + mxc_hw_watchdog_reset(); +} +#endif + int dram_init(void) { /* dram_init must store complete ramsize in gd->ram_size */ @@ -68,6 +76,14 @@ int board_init(void) return 0; } +int board_late_init(void) +{ +#ifdef CONFIG_HW_WATCHDOG + mxc_hw_watchdog_enable(); +#endif + return 0; +} + int checkboard(void) { printf("Board: MX31PDK\n"); diff --git a/include/configs/mx31pdk.h b/include/configs/mx31pdk.h index d4c6d1610..f5d3ee79a 100644 --- a/include/configs/mx31pdk.h +++ b/include/configs/mx31pdk.h @@ -61,6 +61,7 @@ #define CONFIG_MXC_UART 1 #define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_HW_WATCHDOG #define CONFIG_HARD_SPI 1 #define CONFIG_MXC_SPI 1 @@ -98,6 +99,8 @@ */ #undef CONFIG_CMD_IMLS +#define BOARD_LATE_INIT + #define CONFIG_BOOTDELAY 3 #define CONFIG_EXTRA_ENV_SETTINGS \ From e53bcd947daaf6d6c05c545ddb734cb89fc40772 Mon Sep 17 00:00:00 2001 From: Fabio Estevam Date: Sat, 9 Apr 2011 10:43:24 +0000 Subject: [PATCH 03/11] gpio: imx: Fix return value on error Signed-off-by: Fabio Estevam --- drivers/gpio/mxc_gpio.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/drivers/gpio/mxc_gpio.c b/drivers/gpio/mxc_gpio.c index 103786209..6efbb02c1 100644 --- a/drivers/gpio/mxc_gpio.c +++ b/drivers/gpio/mxc_gpio.c @@ -24,6 +24,7 @@ #include #include #include +#include /* GPIO port description */ static unsigned long gpio_ports[] = { @@ -47,7 +48,7 @@ int mxc_gpio_direction(unsigned int gpio, enum mxc_gpio_direction direction) u32 l; if (port >= ARRAY_SIZE(gpio_ports)) - return 1; + return -EINVAL; gpio &= 0x1f; @@ -95,7 +96,7 @@ int mxc_gpio_get(unsigned int gpio) u32 l; if (port >= ARRAY_SIZE(gpio_ports)) - return -1; + return -EINVAL; gpio &= 0x1f; From d109b11e54739212632e3f5309c62a7d5cd49773 Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Tue, 26 Apr 2011 07:40:19 +0200 Subject: [PATCH 04/11] MX31: removed warning due to missing prototype Drop warning caused by missing prototype for mxc_hw_watchdog_reset(). Signed-off-by: Stefano Babic --- arch/arm/include/asm/arch-mx31/clock.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/include/asm/arch-mx31/clock.h b/arch/arm/include/asm/arch-mx31/clock.h index 8dc6e82bc..1ff917ed2 100644 --- a/arch/arm/include/asm/arch-mx31/clock.h +++ b/arch/arm/include/asm/arch-mx31/clock.h @@ -31,5 +31,6 @@ extern void mx31_set_pad(enum iomux_pins pin, u32 config); void mx31_uart1_hw_init(void); void mx31_spi2_hw_init(void); +void mxc_hw_watchdog_enable(void); #endif /* __ASM_ARCH_CLOCK_H */ From 2f22045be5590e3034b0d55cac9fd050f7837a17 Mon Sep 17 00:00:00 2001 From: Stefano Babic Date: Fri, 29 Apr 2011 08:56:27 +0200 Subject: [PATCH 05/11] MX31: change return value of get_cpu_rev Drop warnings in get_cpu_rev and changes the return value (a u32 instead of char * is returned) of the function to be coherent with other processors. Signed-off-by: Stefano Babic CC: Detlev Zundel CC: Fabio Estevam --- arch/arm/cpu/arm1136/mx31/generic.c | 31 +++++++++++++---------- arch/arm/include/asm/arch-mx31/imx-regs.h | 2 +- 2 files changed, 19 insertions(+), 14 deletions(-) diff --git a/arch/arm/cpu/arm1136/mx31/generic.c b/arch/arm/cpu/arm1136/mx31/generic.c index 18572b9d3..fccd2cdaa 100644 --- a/arch/arm/cpu/arm1136/mx31/generic.c +++ b/arch/arm/cpu/arm1136/mx31/generic.c @@ -107,18 +107,18 @@ void mx31_set_pad(enum iomux_pins pin, u32 config) } struct mx3_cpu_type mx31_cpu_type[] = { - { .srev = 0x00, .v = "1.0" }, - { .srev = 0x10, .v = "1.1" }, - { .srev = 0x11, .v = "1.1" }, - { .srev = 0x12, .v = "1.15" }, - { .srev = 0x13, .v = "1.15" }, - { .srev = 0x14, .v = "1.2" }, - { .srev = 0x15, .v = "1.2" }, - { .srev = 0x28, .v = "2.0" }, - { .srev = 0x29, .v = "2.0" }, + { .srev = 0x00, .v = 0x10 }, + { .srev = 0x10, .v = 0x11 }, + { .srev = 0x11, .v = 0x11 }, + { .srev = 0x12, .v = 0x1F }, + { .srev = 0x13, .v = 0x1F }, + { .srev = 0x14, .v = 0x12 }, + { .srev = 0x15, .v = 0x12 }, + { .srev = 0x28, .v = 0x20 }, + { .srev = 0x29, .v = 0x20 }, }; -char *get_cpu_rev(void) +u32 get_cpu_rev(void) { u32 i, srev; @@ -129,7 +129,8 @@ char *get_cpu_rev(void) for (i = 0; i < ARRAY_SIZE(mx31_cpu_type); i++) if (srev == mx31_cpu_type[i].srev) return mx31_cpu_type[i].v; - return "unknown"; + + return srev | 0x8000; } char *get_reset_cause(void) @@ -161,8 +162,12 @@ char *get_reset_cause(void) #if defined(CONFIG_DISPLAY_CPUINFO) int print_cpuinfo (void) { - printf("CPU: Freescale i.MX31 rev %s at %d MHz.", - get_cpu_rev(), mx31_get_mcu_main_clk() / 1000000); + u32 srev = get_cpu_rev(); + + printf("CPU: Freescale i.MX31 rev %d.%d%s at %d MHz.", + (srev & 0xF0) >> 4, (srev & 0x0F), + ((srev & 0x8000) ? " unknown" : ""), + mx31_get_mcu_main_clk() / 1000000); printf("Reset cause: %s\n", get_reset_cause()); return 0; } diff --git a/arch/arm/include/asm/arch-mx31/imx-regs.h b/arch/arm/include/asm/arch-mx31/imx-regs.h index c830a0374..306f96613 100644 --- a/arch/arm/include/asm/arch-mx31/imx-regs.h +++ b/arch/arm/include/asm/arch-mx31/imx-regs.h @@ -105,7 +105,7 @@ struct iim_regs { struct mx3_cpu_type { u8 srev; - char *v; + u32 v; }; #define IOMUX_PADNUM_MASK 0x1ff From 29d53d19f3d0ed6505f52b459e3a092b93f641b5 Mon Sep 17 00:00:00 2001 From: Simon Guinot Date: Tue, 3 May 2011 21:17:34 +0530 Subject: [PATCH 06/11] Kirkwood: allow to override CONFIG_SYS_TCLK This patch allow to override CONFIG_SYS_TCLK from board configuration files. This is needed for the Network Space v2 which use a non standard core clock frequency (166MHz instead of 200MHz for a 6281 SoC). As a possible enhancement for 6281 and 6282 devices, TCLK could be dynamically detected by checking the Sample at Reset register bit 21. Additionally this patch fix a typo. Signed-off-by: Simon Guinot Acked-by: Prafulla Wadaskar --- arch/arm/include/asm/arch-kirkwood/kw88f6281.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h index 80723eac5..22d10f1de 100644 --- a/arch/arm/include/asm/arch-kirkwood/kw88f6281.h +++ b/arch/arm/include/asm/arch-kirkwood/kw88f6281.h @@ -27,11 +27,13 @@ #ifndef _ASM_ARCH_KW88F6281_H #define _ASM_ARCH_KW88F6281_H -/* SOC specific definations */ +/* SOC specific definitions */ #define KW88F6281_REGS_PHYS_BASE 0xf1000000 #define KW_REGS_PHY_BASE KW88F6281_REGS_PHYS_BASE -/* TCLK Core Clock defination*/ -#define CONFIG_SYS_TCLK 200000000 /* 200MHz */ +/* TCLK Core Clock definition */ +#ifndef CONFIG_SYS_TCLK +#define CONFIG_SYS_TCLK 200000000 /* 200MHz */ +#endif #endif /* _ASM_ARCH_KW88F6281_H */ From 2f795ac74eceea36199f07b385d2c85f61396a04 Mon Sep 17 00:00:00 2001 From: Simon Guinot Date: Tue, 3 May 2011 21:17:34 +0530 Subject: [PATCH 07/11] mv-common.h: fix DRAM banks configuration The asm/arch/config.h header define CONFIG_NR_DRAM_BANKS_MAX, which is needed to configure DRAM banks. This patch move the asm/arch/config.h header inclusion above the DRAM banks configuration. Additionally this patch fix a typo. Signed-off-by: Simon Guinot --- include/configs/mv-common.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index a8937dde2..0a3925795 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -113,6 +113,9 @@ #define CONFIG_SYS_RESET_ADDRESS 0xffff0000 /* Rst Vector Adr */ #define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +/* ====> Include platform Common Definitions */ +#include + /* * DRAM Banks configuration, Custom config can be done in .h */ @@ -124,10 +127,7 @@ #endif #endif /* CONFIG_NR_DRAM_BANKS */ -/* ====> Include platform Common Definations */ -#include - -/* ====> Include driver Common Definations */ +/* ====> Include driver Common Definitions */ /* * Common NAND configuration */ From f846604ff57487e0d6e5ddebf8c4c4c02bd5e077 Mon Sep 17 00:00:00 2001 From: Clint Adams <[clint@debian.org]> Date: Fri, 6 May 2011 22:06:47 +0530 Subject: [PATCH 08/11] Rename openrd_base files to openrd Signed-off-by: Clint Adams Cc: Albert ARIBAUD Cc: Prafulla Wadaskar Cc: Julian Pidancet --- board/Marvell/{openrd_base => openrd}/Makefile | 2 +- board/Marvell/{openrd_base => openrd}/kwbimage.cfg | 0 board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} | 2 +- board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} | 0 boards.cfg | 2 +- include/configs/{openrd_base.h => openrd.h} | 4 ++-- 6 files changed, 5 insertions(+), 5 deletions(-) rename board/Marvell/{openrd_base => openrd}/Makefile (98%) rename board/Marvell/{openrd_base => openrd}/kwbimage.cfg (100%) rename board/Marvell/{openrd_base/openrd_base.c => openrd/openrd.c} (99%) rename board/Marvell/{openrd_base/openrd_base.h => openrd/openrd.h} (100%) rename include/configs/{openrd_base.h => openrd.h} (98%) diff --git a/board/Marvell/openrd_base/Makefile b/board/Marvell/openrd/Makefile similarity index 98% rename from board/Marvell/openrd_base/Makefile rename to board/Marvell/openrd/Makefile index d6d0ed337..19020e435 100644 --- a/board/Marvell/openrd_base/Makefile +++ b/board/Marvell/openrd/Makefile @@ -31,7 +31,7 @@ include $(TOPDIR)/config.mk LIB = $(obj)lib$(BOARD).o -COBJS := openrd_base.o +COBJS := openrd.o SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) OBJS := $(addprefix $(obj),$(COBJS)) diff --git a/board/Marvell/openrd_base/kwbimage.cfg b/board/Marvell/openrd/kwbimage.cfg similarity index 100% rename from board/Marvell/openrd_base/kwbimage.cfg rename to board/Marvell/openrd/kwbimage.cfg diff --git a/board/Marvell/openrd_base/openrd_base.c b/board/Marvell/openrd/openrd.c similarity index 99% rename from board/Marvell/openrd_base/openrd_base.c rename to board/Marvell/openrd/openrd.c index 10109c132..e53fa16a2 100644 --- a/board/Marvell/openrd_base/openrd_base.c +++ b/board/Marvell/openrd/openrd.c @@ -31,7 +31,7 @@ #include #include #include -#include "openrd_base.h" +#include "openrd.h" DECLARE_GLOBAL_DATA_PTR; diff --git a/board/Marvell/openrd_base/openrd_base.h b/board/Marvell/openrd/openrd.h similarity index 100% rename from board/Marvell/openrd_base/openrd_base.h rename to board/Marvell/openrd/openrd.h diff --git a/boards.cfg b/boards.cfg index f0d3440c6..6bcda28ce 100644 --- a/boards.cfg +++ b/boards.cfg @@ -108,7 +108,7 @@ suen8 arm arm926ejs km_arm keymile mgcoge2un arm arm926ejs km_arm keymile kirkwood guruplug arm arm926ejs - Marvell kirkwood mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood -openrd_base arm arm926ejs - Marvell kirkwood +openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE rd6281a arm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood diff --git a/include/configs/openrd_base.h b/include/configs/openrd.h similarity index 98% rename from include/configs/openrd_base.h rename to include/configs/openrd.h index cfdd09cda..13dc34c2a 100644 --- a/include/configs/openrd_base.h +++ b/include/configs/openrd.h @@ -27,8 +27,8 @@ * MA 02110-1301 USA */ -#ifndef _CONFIG_OPENRD_BASE_H -#define _CONFIG_OPENRD_BASE_H +#ifndef _CONFIG_OPENRD_H +#define _CONFIG_OPENRD_H /* * Version number information From 21861f2d39ac8cab88dd3cfa1285aa4f69023b10 Mon Sep 17 00:00:00 2001 From: Clint Adams <[clint@debian.org]> Date: Fri, 6 May 2011 22:06:47 +0530 Subject: [PATCH 09/11] Add definitions for OpenRD-Client and OpenRD-Ultimate Signed-off-by: Clint Adams Cc: Albert ARIBAUD Cc: Prafulla Wadaskar Cc: Julian Pidancet --- MAKEALL | 2 ++ board/Marvell/openrd/openrd.c | 6 ++++++ boards.cfg | 2 ++ include/configs/openrd.h | 14 +++++++++++++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/MAKEALL b/MAKEALL index c3df6575e..d59237404 100755 --- a/MAKEALL +++ b/MAKEALL @@ -361,6 +361,8 @@ LIST_ARM9=" \ omap5912osk \ omap730p2 \ openrd_base \ + openrd_client \ + openrd_ultimate \ rd6281a \ sbc2410x \ scb9328 \ diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index e53fa16a2..14ca88e5b 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -110,7 +110,13 @@ int board_init(void) /* * arch number of board */ +#if defined(CONFIG_BOARD_IS_OPENRD_BASE) gd->bd->bi_arch_number = MACH_TYPE_OPENRD_BASE; +#elif defined(CONFIG_BOARD_IS_OPENRD_CLIENT) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_CLIENT; +#elif defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE) + gd->bd->bi_arch_number = MACH_TYPE_OPENRD_ULTIMATE; +#endif /* adress of boot parameters */ gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; diff --git a/boards.cfg b/boards.cfg index 6bcda28ce..4f48d196a 100644 --- a/boards.cfg +++ b/boards.cfg @@ -109,6 +109,8 @@ mgcoge2un arm arm926ejs km_arm keymile guruplug arm arm926ejs - Marvell kirkwood mv88f6281gtw_ge arm arm926ejs - Marvell kirkwood openrd_base arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_BASE +openrd_client arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_CLIENT +openrd_ultimate arm arm926ejs openrd Marvell kirkwood openrd:BOARD_IS_OPENRD_ULTIMATE rd6281a arm arm926ejs - Marvell kirkwood sheevaplug arm arm926ejs - Marvell kirkwood dockstar arm arm926ejs - Seagate kirkwood diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 13dc34c2a..72997498b 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -33,7 +33,19 @@ /* * Version number information */ -#define CONFIG_IDENT_STRING "\nOpenRD_base" +#ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_IDENT_STRING "\nOpenRD-Ultimate" +#else +# ifdef CONFIG_BOARD_IS_OPENRD_CLIENT +# define CONFIG_IDENT_STRING "\nOpenRD-Client" +# else +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_IDENT_STRING "\nOpenRD-Base" +# else +# error Unknown OpenRD board specified +# endif +# endif +#endif /* * High Level Configuration Options (easy to change) From 1615db3c1c8e0b359c15453423f8beb8c4821415 Mon Sep 17 00:00:00 2001 From: Clint Adams <[clint@debian.org]> Date: Fri, 6 May 2011 22:06:47 +0530 Subject: [PATCH 10/11] Initialize second PHY on OpenRD-Client and OpenRD-Ultimate Though the OpenRD-Base only has one gigabit Ethernet port, both the OpenRD-Client and OpenRD-Ultimate each have two. On the Ultimate, the PHY addresses are consecutive, but on the Client they are not. (based on <62a0952ce368acc725063a00a5ec680a639d6c27.1301040318.git.julian.pidancet@citrix.com> ) Signed-off-by: Clint Adams Cc: Albert ARIBAUD Cc: Prafulla Wadaskar Cc: Julian Pidancet --- board/Marvell/openrd/openrd.c | 25 +++++++++++++++++++++---- include/configs/openrd.h | 14 ++++++++++++-- 2 files changed, 33 insertions(+), 6 deletions(-) diff --git a/board/Marvell/openrd/openrd.c b/board/Marvell/openrd/openrd.c index 14ca88e5b..87939decf 100644 --- a/board/Marvell/openrd/openrd.c +++ b/board/Marvell/openrd/openrd.c @@ -124,12 +124,11 @@ int board_init(void) } #ifdef CONFIG_RESET_PHY_R -/* Configure and enable MV88E1116 PHY */ -void reset_phy(void) +/* Configure and enable MV88E1116/88E1121 PHY */ +void mv_phy_init(char *name) { u16 reg; u16 devadr; - char *name = "egiga0"; if (miiphy_set_current_dev(name)) return; @@ -154,6 +153,24 @@ void reset_phy(void) /* reset the phy */ miiphy_reset(name, devadr); - printf("88E1116 Initialized on %s\n", name); + printf(PHY_NO" Initialized on %s\n", name); +} + +void reset_phy(void) +{ + mv_phy_init("egiga0"); + +#ifdef CONFIG_BOARD_IS_OPENRD_CLIENT + /* Kirkwood ethernet driver is written with the assumption that in case + * of multiple PHYs, their addresses are consecutive. But unfortunately + * in case of OpenRD-Client, PHY addresses are not consecutive.*/ + miiphy_write("egiga1", 0xEE, 0xEE, 24); +#endif + +#if defined(CONFIG_BOARD_IS_OPENRD_CLIENT) || \ + defined(CONFIG_BOARD_IS_OPENRD_ULTIMATE) + /* configure and initialize both PHY's */ + mv_phy_init("egiga1"); +#endif } #endif /* CONFIG_RESET_PHY_R */ diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 72997498b..8d860678d 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -117,8 +117,18 @@ * Ethernet Driver configuration */ #ifdef CONFIG_CMD_NET -#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ -#define CONFIG_PHY_BASE_ADR 0x8 +# ifdef CONFIG_BOARD_IS_OPENRD_BASE +# define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +# else +# define CONFIG_MVGBE_PORTS {1, 1} /* enable both ports */ +# endif +# ifdef CONFIG_BOARD_IS_OPENRD_ULTIMATE +# define CONFIG_PHY_BASE_ADR 0x0 +# define PHY_NO "88E1121" +# else +# define CONFIG_PHY_BASE_ADR 0x8 +# define PHY_NO "88E1116" +# endif #endif /* CONFIG_CMD_NET */ /* From 2e73808ee97d75400881d1fe144b062f427cfcb9 Mon Sep 17 00:00:00 2001 From: Clint Adams <[clint@debian.org]> Date: Fri, 6 May 2011 22:06:47 +0530 Subject: [PATCH 11/11] Enable multiple fs options for Marvell SoC family on OpenRD boards Signed-off-by: Clint Adams Cc: Albert ARIBAUD Cc: Prafulla Wadaskar Cc: Julian Pidancet --- include/configs/openrd.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/configs/openrd.h b/include/configs/openrd.h index 8d860678d..3256cb36e 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -60,6 +60,7 @@ * Commands configuration */ #define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_SYS_MVFS #include #define CONFIG_CMD_AUTOSCRIPT #define CONFIG_CMD_DHCP