Re: [U-Boot] [PATCH V3 5/5] edminiv2: add ethernet support
-Original Message-
From: u-boot-boun...@lists.denx.de
[mailto:u-boot-boun...@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 5/5] edminiv2: add ethernet support
Add edminiv2 board support for mv_egiga.
Add edminiv2 config to enable mv_egiga.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
board/LaCie/edminiv2/edminiv2.c | 36
++
board/LaCie/edminiv2/edminiv2.h | 41
+++
include/configs/edminiv2.h | 23 -
3 files changed, 94 insertions(+), 6 deletions(-)
create mode 100644 board/LaCie/edminiv2/edminiv2.h
diff --git a/board/LaCie/edminiv2/edminiv2.c
b/board/LaCie/edminiv2/edminiv2.c
index 54c0ffe..d46ee4a 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -27,6 +27,7 @@
#include common.h
#include miiphy.h
#include asm/arch/orion5x.h
+#include edminiv2.h
DECLARE_GLOBAL_DATA_PTR;
@@ -90,3 +91,38 @@ int board_init(void)
return 0;
}
+
+#if defined (CONFIG_CMD_NET) defined (CONFIG_RESET_PHY_R)
+/* Configure and enable MV88E1116 PHY */
+void reset_phy(void)
+{
+ u16 reg;
+ u16 devadr;
+ char *name = egiga0;
+
+ if (miiphy_set_current_dev(name))
+ return;
+
+ /* command to read PHY dev address */
+ if (miiphy_read(name, 0xEE, 0xEE, (u16 *) devadr)) {
+ printf(Err..%s could not read PHY dev address\n,
+ __FUNCTION__);
+ return;
+ }
+
+ /*
+ * Enable RGMII delay on Tx and Rx for CPU port
+ * Ref: sec 4.7.2 of chip datasheet
+ */
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
+ miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
+ miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+
+ /* reset the phy */
+ miiphy_reset(name, devadr);
+
+ printf(88E1116 Initialized on %s\n, name);
+}
+#endif /* CONFIG_RESET_PHY_R */
diff --git a/board/LaCie/edminiv2/edminiv2.h
b/board/LaCie/edminiv2/edminiv2.h
new file mode 100644
index 000..88e62b2
--- /dev/null
+++ b/board/LaCie/edminiv2/edminiv2.h
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2009
+ * Net Insight www.netinsight.net
+ * Written-by: Simon Kagstrom simon.kagst...@netinsight.net
+ *
+ * Based on sheevaplug.h:
+ * (C) Copyright 2009
+ * Marvell Semiconductor www.marvell.com
+ * Written-by: Prafulla Wadaskar prafu...@marvell.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __EDMINIV2_BASE_H
+#define __EDMINIV2_BASE_H
+
+/* PHY related */
+#define MV88E1116_LED_FCTRL_REG 10
+#define MV88E1116_CPRSP_CR3_REG 21
+#define MV88E1116_MAC_CTRL_REG 21
+#define MV88E1116_PGADR_REG 22
+#define MV88E1116_RGMII_TXTM_CTRL(1 4)
+#define MV88E1116_RGMII_RXTM_CTRL(1 5)
+
+#endif /* __EDMINIV2_BASE_H */
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index c3d95a0..458e313 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -110,6 +110,15 @@
#define CONFIG_SYS_FLASH_SECTSZ \
{16384, 8192, 8192, 32768, \
65536, 65536, 65536, 65536, 65536, 65536, 65536}
+/*
+ * Ethernet
+ */
Pls remove additional space char here
+
+#define CONFIG_MV_EGIGA /* Enable Marvell egiga
Controller Driver */
+#define CONFIG_MV_EGIGA_PORTS{1,0} /* enable port 0 only */
+#define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION /* don't
randomize MAC */
+#define CONFIG_PHY_BASE_ADR 0x8
+#define CONFIG_RESET_PHY_R /* use reset_phy() to init
mv8831116 PHY */
Shift above definition below (inside #ifdef CONFIG_CMD_NET), that makes more
sense
/* auto boot */
#define CONFIG_BOOTDELAY 3 /* default enable autoboot */
@@ -131,12 +140,14 @@
* Commands configuration - using default command set for now
*/
#include
Re: [U-Boot] [PATCH V3 4/5] mv_egiga: add support for orion5x egiga controller
-Original Message-
From: u-boot-boun...@lists.denx.de
[mailto:u-boot-boun...@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.arib...@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(0xA))
#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 . .
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 5/5] edminiv2: add ethernet support
Hi Prafulla, Le 12/07/2010 08:00, Prafulla Wadaskar a écrit : +/* + * Ethernet + */ Pls remove additional space char here Done. +#define CONFIG_MV_EGIGA /* Enable Marvell egiga [...] +#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */ Shift above definition below (inside #ifdef CONFIG_CMD_NET), that makes more sense Done--actually replaced Ethernet with Network in block comment as the whole block is not only about Eth. Thanks for the feedback. Any remaining comments on patches 1-4? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
On 7/11/2010 10:45 PM, Prafulla Wadaskar wrote:
-Original Message-
From: u-boot-boun...@lists.denx.de
[mailto:u-boot-boun...@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 2/5] mv_egiga: support SoCs other
than kirkwood
Rename all references to kirkwood in mv_egiga symbols
throughout the whole codebase.
Signed-off-by: Albert Aribaudalbert.arib...@free.fr
---
arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +-
arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 +
drivers/net/Makefile |2 +-
drivers/net/mv_egiga.c| 322
+-
drivers/net/mv_egiga.h| 466
include/configs/guruplug.h|4 +-
include/configs/km_arm.h |4 +-
include/configs/mv88f6281gtw_ge.h |4 +-
include/configs/openrd_base.h |4 +-
include/configs/rd6281a.h |4 +-
include/configs/sheevaplug.h |4 +-
include/netdev.h |2 +-
12 files changed, 418 insertions(+), 407 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index 6fc3902..786ffc6 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_MV_EGIGA
int cpu_eth_init(bd_t *bis)
{
-kirkwood_egiga_initialize(bis);
+mv_egiga_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 2470efb..9200605 100644
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
@@ -60,6 +60,11 @@
#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
+#if defined (CONFIG_MV_EGIGA)
I think you don't need ifdef here
+#define MV_EGIGA0_BASE KW_EGIGA0_BASE
+#define MV_EGIGA1_BASE KW_EGIGA1_BASE
+#endif
+
#if defined (CONFIG_KW88F6281)
#includeasm/arch/kw88f6281.h
#elif defined (CONFIG_KW88F6192)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 1599c26..04f8de0 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -52,7 +52,7 @@ COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
COBJS-$(CONFIG_MPC512x_FEC) += mpc512x_fec.o
-COBJS-$(CONFIG_KIRKWOOD_EGIGA) += mv_egiga.o
+COBJS-$(CONFIG_MV_EGIGA) += mv_egiga.o
COBJS-$(CONFIG_NATSEMI) += natsemi.o
COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o ne2000_base.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o ne2000_base.o
diff --git a/drivers/net/mv_egiga.c b/drivers/net/mv_egiga.c
index b7ecc9d..4fecf1e 100644
--- a/drivers/net/mv_egiga.c
+++ b/drivers/net/mv_egiga.c
@@ -35,13 +35,17 @@
#includeasm/errno.h
#includeasm/types.h
#includeasm/byteorder.h
+
+#if defined (CONFIG_KIRKWOOD)
#includeasm/arch/kirkwood.h
+#endif
+
#include mv_egiga.h
DECLARE_GLOBAL_DATA_PTR;
-#define KIRKWOOD_PHY_ADR_REQUEST 0xee
-#define KWGBE_SMI_REG (((struct kwgbe_registers
*)KW_EGIGA0_BASE)-smi)
+#define MV_PHY_ADR_REQUEST 0xee
+#define MV_EGIGA_SMI_REG (((struct mv_egiga_registers
*)MV_EGIGA0_BASE)-smi)
/*
* smi_reg_read - miiphy_read callback function.
@@ -51,16 +55,16 @@ DECLARE_GLOBAL_DATA_PTR;
static int smi_reg_read(char *devname, u8 phy_adr, u8
reg_ofs, u16 * data)
{
struct eth_device *dev = eth_get_dev_by_name(devname);
-struct kwgbe_device *dkwgbe = to_dkwgbe(dev);
-struct kwgbe_registers *regs = dkwgbe-regs;
+struct mv_egiga_device *dmvegiga = to_mv_egiga(dev);
+struct mv_egiga_registers *regs = dmvegiga-regs;
I suggest to keep name as mvgbe here instead of mv_egiga, 3 additional chars,
increases overall code size
huh? The name is consistent with the rest of his work, and *if* the
code really increases in size, I can't imagine that 3 chars really
matters...
u32 smi_reg;
u32 timeout;
/* Phyadr read request */
-if (phy_adr == KIRKWOOD_PHY_ADR_REQUEST
-reg_ofs == KIRKWOOD_PHY_ADR_REQUEST) {
+if (phy_adr == MV_PHY_ADR_REQUEST
+reg_ofs == MV_PHY_ADR_REQUEST) {
/* */
-*data = (u16) (KWGBEREG_RD(regs-phyadr) PHYADR_MASK);
+*data = (u16) (MV_EGIGA_REG_RD(regs-phyadr)
Same here, pls use MVGBEREG instead of MV_EGIGA_REG, 4 extra chars
Same comment as above. Clarity is king.
Pls just replace kw/KW by mv/MV to avoide indentation issues
I
Re: [U-Boot] [PATCH V3 5/5] edminiv2: add ethernet support
Hi Albert, On 7/11/2010 11:14 PM, Albert ARIBAUD wrote: Hi Prafulla, Le 12/07/2010 08:00, Prafulla Wadaskar a écrit : +/* + * Ethernet + */ Pls remove additional space char here Done. +#define CONFIG_MV_EGIGA/* Enable Marvell egiga [...] +#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */ Shift above definition below (inside #ifdef CONFIG_CMD_NET), that makes more sense Done--actually replaced Ethernet with Network in block comment as the whole block is not only about Eth. Thanks for the feedback. Any remaining comments on patches 1-4? Amicalement, That should be it. Please post updates as needed. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 4/4] edminiv2: add cmd_ide support
-Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud Sent: Friday, July 09, 2010 12:11 AM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 4/4] edminiv2: add cmd_ide support This patch uses mv_sata_ide and cmd_ide to enable the use of the integrated SATAHC controller port 1. Signed-off-by: Albert Aribaud albert.arib...@free.fr --- board/LaCie/edminiv2/edminiv2.c |5 include/configs/edminiv2.h | 47 +- 2 files changed, 50 insertions(+), 2 deletions(-) diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c index 54c0ffe..6336429 100644 --- a/board/LaCie/edminiv2/edminiv2.c +++ b/board/LaCie/edminiv2/edminiv2.c @@ -88,5 +88,10 @@ int board_init(void) /* boot parameter start at 256th byte of RAM base */ gd-bd-bi_boot_params = gd-bd-bi_dram[0].start + 0x100; + /* Enable SATA ports if SATA IDE was configured */ +#if defined(CONFIG_MV_SATA_IDE) + mv_sata_ide_initialize_port(orion5x_port1_sata_registers); +#endif + return 0; } diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index c3d95a0..1a61437 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -52,6 +52,12 @@ #define CONFIG_SYS_HZ1000 /* + * __io is necessary for cmd_ide to compile + */ + +#define __io + +/* * Board-specific values for Orion5x MPP low level init: * - MPPs 12 to 15 are SATA LEDs (mode 5) * - Others are GPIO/unused (mode 3 for MPP0, mode 5 for @@ -60,7 +66,7 @@ #define ORION5X_MPP0_7 0x0003 #define ORION5X_MPP8_15 0x -#define ORION5X_MPP16_23 0x +#define ORION5X_MPP16_23 0x /* * Board-specific values for Orion5x GPIO low level init: @@ -74,7 +80,6 @@ */ #define ORION5X_GPIO_OUT_ENABLE 0x03fc -#define ORION5X_GPIO_OUT_VALUE 0x03fc Why did you removed this? Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] i2c: fix SDA contention in read_byte()
Thomas Chou schrieb:
Reinhard Meyer wrote:
Its even simpler, provided the hardware can do open collector. Here
was my solution for AVR32AP7000:
Then we could add a config for open drain similar to that of linux driver.
# ifndef I2C_SDA
# ifdef CONFIG_SOFT_I2C_GPIO_SDA_IS_OPEN_DRAIN
# define I2C_SDA(bit) gpio_set_value(CONFIG_SOFT_I2C_GPIO_SDA, bit)
# else
# define I2C_SDA(bit) \
if (bit) {\
gpio_direction_input(CONFIG_SOFT_I2C_GPIO_SDA);\
} else {\
gpio_direction_output(CONFIG_SOFT_I2C_GPIO_SDA, 0);\
}
# endif
# endif
Why would we need that? Since the defines reside in the board/project specific
include/configs/*.h file, it is well known if the hardware has open drain or
not.
BTW, will you be interested in using common gpio framework for avr32
family?
No, AVR32AP7000 is dead for me. Working on AT91SAM9xxx now, which already uses
gpio framework...
Reinhard
attachment: reinhard_meyer.vcf___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] net: Add option to disable fiber on M88E1111 PHY for PPC4xx
Hi Stefen,
On 6/29/2010 12:23 AM, Stefan Roese wrote:
By defining CONFIG_M88E_DISABLE_FIBER boards can configure the
M88E PYH to disable fiber. This is needed for an upcoming PPC460GT
based board, which has fiber/copper auto-selection enabled by default.
This doesn't seem to work. So we disable fiber in the PHY register.
Signed-off-by: Stefan Roeses...@denx.de
Cc: Ben Warrenbiggerbadder...@gmail.com
---
v2: - Fixed spelling: fibre - fiber
drivers/net/4xx_enet.c |5 +
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/drivers/net/4xx_enet.c b/drivers/net/4xx_enet.c
index 2fac641..144b851 100644
--- a/drivers/net/4xx_enet.c
+++ b/drivers/net/4xx_enet.c
@@ -1095,6 +1095,11 @@ static int ppc_4xx_eth_init (struct eth_device *dev,
bd_t * bis)
miiphy_write (dev-name, reg, 0x18, 0x4101);
miiphy_write (dev-name, reg, 0x09, 0x0e00);
miiphy_write (dev-name, reg, 0x04, 0x01e1);
+#if defined(CONFIG_M88E_DISABLE_FIBER)
+ miiphy_read(dev-name, reg, 0x1b,reg_short);
+ reg_short |= 0x8000;
+ miiphy_write(dev-name, reg, 0x1b, reg_short);
+#endif
#endif
#if defined(CONFIG_M88E1112_PHY)
if (bis-bi_phymode[devnum] == BI_PHYMODE_SGMII) {
Applied to net repo.
thanks,
Ben
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] net: dm9000x: re-add casts to I/O pointers to fix gcc warnings
Hi Mike, On 7/4/2010 11:29 PM, Mike Frysinger wrote: The DM9000 in/out helper functions were casting the register address when it was accessing things directly (pre commit a45dde2293c816138e53c). But when it was changed to using the in/out helpers, those casts were dropped because those functions don't take pointers. Even more recently, those functions were then changed to use the read/write helpers, but the casts were not re-added. This is necessary because the read/write helpers do take pointers. Otherwise we get a lot of warnings like: dm9000x.c: In function 'dm9000_inblk_8bit': dm9000x.c:172: warning: passing argument 1 of 'readb' makes pointer from integer without a cast Signed-off-by: Mike Frysingervap...@gentoo.org --- drivers/net/dm9000x.c | 12 ++-- 1 files changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/net/dm9000x.c b/drivers/net/dm9000x.c index 137e41f..709f67a 100644 --- a/drivers/net/dm9000x.c +++ b/drivers/net/dm9000x.c @@ -117,12 +117,12 @@ static void DM9000_iow(int reg, u8 value); /* DM9000 network board routine */ -#define DM9000_outb(d,r) writeb(d, r) -#define DM9000_outw(d,r) writew(d, r) -#define DM9000_outl(d,r) writel(d, r) -#define DM9000_inb(r) readb(r) -#define DM9000_inw(r) readw(r) -#define DM9000_inl(r) readl(r) +#define DM9000_outb(d,r) writeb(d, (volatile u8 *)(r)) +#define DM9000_outw(d,r) writew(d, (volatile u16 *)(r)) +#define DM9000_outl(d,r) writel(d, (volatile u32 *)(r)) +#define DM9000_inb(r) readb((volatile u8 *)(r)) +#define DM9000_inw(r) readw((volatile u16 *)(r)) +#define DM9000_inl(r) readl((volatile u32 *)(r)) #ifdef CONFIG_DM9000_DEBUG static void Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Allocating memory in u-boot application
hi, I am working on PPC440EP base custom board. I managed to port u-boot successfully. The requirement is, there should be no OS running on-board and run an application in u-boot. I have successfully ported and example application also. The part of my requirement is to read data as large as 10MB from NVRAM and load it to PC. I am not able to allocate more than 64kB to a buffer. When i allocate even 1MB, my application hangs when i try to access the buffer. I have 64MB DDR-RAM interface to PPC440EP. The size of my application is 300kB and i don't think u-boot uses large memory. How can I malloc big size to a buffer in this case. Please help me fix this issue, thanks in advance. Regards, Prathika R ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 14/35] Blackfin: bfin_mac: convert to portmux framework
Hi Mike, On 7/5/2010 2:30 AM, Mike Frysinger wrote: Rather than bang MMRs directly, use the new portmux framework to handle the details. While we're doing this, let boards declare the exact list of pins they need in case there is one or two they don't actually have hooked up. Signed-off-by: Mike Frysingervap...@gentoo.org --- drivers/net/bfin_mac.c | 47 +++ 1 files changed, 11 insertions(+), 36 deletions(-) Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 24/35] Blackfin: bf518f-ezbrd: handle different PHYs dynamically
Hi Mike, On 7/5/2010 2:30 AM, Mike Frysinger wrote: The original BF518F-EZBRD's have a Micrel KSZ8893 DSA on them, but newer ones only have a National PHY (which lack a RX Error interrupt line). So in the board eth init code, dynamically detect what is hooked up to the MAC and handle each accordingly. Signed-off-by: Mike Frysingervap...@gentoo.org --- board/bf518f-ezbrd/bf518f-ezbrd.c | 23 +-- include/configs/bf518f-ezbrd.h| 20 2 files changed, 33 insertions(+), 10 deletions(-) Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 3/4] orion5x: add support for cmd_ide.c
-Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud Sent: Friday, July 09, 2010 12:11 AM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 3/4] orion5x: add support for cmd_ide.c This patch allows cmd_ide.c to use the Marvell SATAHC controller integrated in the Orion5x SoC, thus enabling access to SATA disks for Orion5x-based boards such as the ED Mini V2. Signed-off-by: Albert Aribaud albert.arib...@free.fr --- arch/arm/include/asm/arch-orion5x/orion5x.h | 11 +++ common/cmd_ide.c|4 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h index 4008c84..585083a 100644 --- a/arch/arm/include/asm/arch-orion5x/orion5x.h +++ b/arch/arm/include/asm/arch-orion5x/orion5x.h @@ -55,6 +55,17 @@ #define ORION5X_USB20_PORT0_BASE (ORION5X_REGISTER(0x5)) #define ORION5X_USB20_PORT1_BASE (ORION5X_REGISTER(0xA)) #define ORION5X_EGIGA_BASE (ORION5X_REGISTER(0x72000)) +#define ORION5X_SATA_BASE (ORION5X_REGISTER(0x8)) +#define ORION5X_SATA_PORT0_OFFSET0x2000 +#define ORION5X_SATA_PORT1_OFFSET0x4000 + +/* SATA Interface Register port 0 and 1 */ +#define orion5x_port0_sata_registers \ + ((struct mv_sata_interface_registers *) \ + (ORION5X_SATA_BASE+ORION5X_SATA_PORT0_OFFSET+0x300)) +#define orion5x_port1_sata_registers \ + ((struct mv_sata_interface_registers *) \ + (ORION5X_SATA_BASE+ORION5X_SATA_PORT1_OFFSET+0x300)) Pls remove this and use _BASE macro in c code #define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 9292a5b..7f98ebb 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -45,6 +45,10 @@ #include mpc5xxx.h #endif +#ifdef CONFIG_ORION5X +#include asm/arch/orion5x.h +#endif + Why do you need this include? Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
-Original Message- From: Ben Warren [mailto:biggerbadder...@gmail.com] Sent: Monday, July 12, 2010 11:54 AM To: Prafulla Wadaskar Cc: Albert Aribaud; u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood On 7/11/2010 10:45 PM, Prafulla Wadaskar wrote: -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@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 2/5] mv_egiga: support SoCs other than kirkwood ...snip... struct eth_device *dev = eth_get_dev_by_name(devname); - struct kwgbe_device *dkwgbe = to_dkwgbe(dev); - struct kwgbe_registers *regs = dkwgbe-regs; + struct mv_egiga_device *dmvegiga = to_mv_egiga(dev); + struct mv_egiga_registers *regs = dmvegiga-regs; I suggest to keep name as mvgbe here instead of mv_egiga, 3 additional chars, increases overall code size huh? The name is consistent with the rest of his work, and *if* the code really increases in size, I can't imagine that 3 chars really matters... That's true. But if we can do it why to avoid it? again it helps to keep same indentation (keeping them below 80char size) Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/4] drivers/block: add mv_sata_ide driver
-Original Message-
From: u-boot-boun...@lists.denx.de
[mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud
Sent: Friday, July 09, 2010 12:11 AM
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH V3 2/4] drivers/block: add mv_sata_ide driver
This driver only provides initialization code; actual driving
is done by cmd_ide.c using the ATA compatibility mode of the
Marvell SATAHC controller.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
drivers/block/Makefile |1 +
drivers/block/mv_sata_ide.c | 61
+++
include/mv_sata_ide.h | 54
++
3 files changed, 116 insertions(+), 0 deletions(-)
create mode 100644 drivers/block/mv_sata_ide.c
create mode 100644 include/mv_sata_ide.h
diff --git a/drivers/block/Makefile b/drivers/block/Makefile
index 3f6ad5c..b47a5e4 100644
--- a/drivers/block/Makefile
+++ b/drivers/block/Makefile
@@ -36,6 +36,7 @@ COBJS-$(CONFIG_SATA_SIL3114) += sata_sil3114.o
COBJS-$(CONFIG_SCSI_AHCI) += ahci.o
COBJS-$(CONFIG_SCSI_SYM53C8XX) += sym53c8xx.o
COBJS-$(CONFIG_SYSTEMACE) += systemace.o
+COBJS-$(CONFIG_MV_SATA_IDE) += mv_sata_ide.o
Pls correct ordering here
COBJS:= $(COBJS-y)
SRCS := $(COBJS:.o=.c)
diff --git a/drivers/block/mv_sata_ide.c b/drivers/block/mv_sata_ide.c
new file mode 100644
index 000..10f8bf6
--- /dev/null
+++ b/drivers/block/mv_sata_ide.c
@@ -0,0 +1,61 @@
+/*
+ * Copyright (C) 2010 Albert ARIBAUD albert.arib...@free.fr
+ *
+ * Written-by: Albert ARIBAUD albert.arib...@free.fr
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#include common.h
+#include asm/io.h
+#include mv_sata_ide.h
+
+/* Mask and values for device DETection and link initialization */
+#define MV_SATA_SCONTROL_DET_MASK0x000F
Overall if you use MVSATA you can make your patch shorter.
+#define MV_SATA_SCONTROL_DET_NONE0x
+#define MV_SATA_SCONTROL_DET_INIT0x0001
+
+/* Mask and values for device Interface Power Management */
+#define MV_SATA_SCONTROL_IMP_MASK0x0F00
+#define MV_SATA_SCONTROL_IMP_NO_LP_ALLOWED 0x0300
+
+#define MV_SATA_SCONTROL_MASK \
+ (MV_SATA_SCONTROL_DET_MASK|MV_SATA_SCONTROL_IMP_MASK)
+
+#define MV_SATA_PORT_INIT \
+ (MV_SATA_SCONTROL_DET_INIT|MV_SATA_SCONTROL_IMP_NO_LP_ALLOWED)
+
+#define MV_SATA_PORT_USE \
+ (MV_SATA_SCONTROL_DET_NONE|MV_SATA_SCONTROL_IMP_NO_LP_ALLOWED)
+
+void mv_sata_ide_initialize_port(
+ struct mv_sata_interface_registers *port)
+{
+ u32 reg;
+
+ reg = readl(port-SControl);
+
+ reg = (reg ~MV_SATA_SCONTROL_MASK) | MV_SATA_PORT_INIT;
+
+ writel(reg, port-SControl);
+
+ reg = (reg ~MV_SATA_SCONTROL_MASK) | MV_SATA_PORT_USE;
+
+ writel(reg, port-SControl);
+}
diff --git a/include/mv_sata_ide.h b/include/mv_sata_ide.h
new file mode 100644
index 000..fdcb137
--- /dev/null
+++ b/include/mv_sata_ide.h
@@ -0,0 +1,54 @@
+/*
+ * Copyright (C) 2010 Albert ARIBAUD albert.arib...@free.fr
+ *
+ * Written-by: Albert ARIBAUD albert.arib...@free.fr
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef _MV_SATA_IDE_H
+#define _MV_SATA_IDE_H
+
+#ifndef __ASSEMBLY__
+
+/* SATA insterface registers */
+struct mv_sata_interface_registers
+{
+ volatile u32
Re: [U-Boot] [PATCH 24/35] Blackfin: bf518f-ezbrd: handle different PHYs dynamically
On 7/11/2010 11:53 PM, Ben Warren wrote: Hi Mike, On 7/5/2010 2:30 AM, Mike Frysinger wrote: The original BF518F-EZBRD's have a Micrel KSZ8893 DSA on them, but newer ones only have a National PHY (which lack a RX Error interrupt line). So in the board eth init code, dynamically detect what is hooked up to the MAC and handle each accordingly. Signed-off-by: Mike Frysingervap...@gentoo.org --- board/bf518f-ezbrd/bf518f-ezbrd.c | 23 +-- include/configs/bf518f-ezbrd.h| 20 2 files changed, 33 insertions(+), 10 deletions(-) Applied to net repo. thanks, Ben On second thought, it probably makes more sense to keep this as part of your patchset. I shouldn't have pulled it in the first place since it's really board code. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] net, tsec: add micrel ksz804 phy
Hi Heiko, On 7/5/2010 3:23 AM, Heiko Schocher wrote: net, tsec: add micrel ksz804 phy Signed-off-by: Heiko Schocherh...@denx.de --- drivers/net/tsec.c | 22 ++ 1 files changed, 22 insertions(+), 0 deletions(-) Applied to net repo, after cleaning up patch title. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 14/35] Blackfin: bfin_mac: convert to portmux framework
Hi Mike, On 7/11/2010 11:52 PM, Ben Warren wrote: Hi Mike, On 7/5/2010 2:30 AM, Mike Frysinger wrote: Rather than bang MMRs directly, use the new portmux framework to handle the details. While we're doing this, let boards declare the exact list of pins they need in case there is one or two they don't actually have hooked up. Signed-off-by: Mike Frysingervap...@gentoo.org --- drivers/net/bfin_mac.c | 47 +++ 1 files changed, 11 insertions(+), 36 deletions(-) Applied to net repo. thanks, Ben Instead, please keep together with all the others, and add this: Acked-by: Ben Warrenbiggerbadder...@gmail.com regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V2] kirkwood_egiga: bugfix: add DMA sequence points
Hi Albert, On 7/10/2010 6:41 AM, Albert Aribaud wrote: Insert isb() sequence points to ensure DMA descriptors are filled in and set up before actual DMA occurs. Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- PATCHSET HISTORY V1: initial submit V2: fixed badly placed isb() drivers/net/kirkwood_egiga.c |9 - 1 files changed, 8 insertions(+), 1 deletions(-) Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v5 06/18] SPEAr : Network driver support added
Hi Vipin, On 6/28/2010 10:23 PM, Vipin KUMAR wrote: From: Vipin KUMARvipin.ku...@st.com Designware network driver support added. This is a Synopsys ethernet controller Signed-off-by: Vipin Kumarvipin.ku...@st.com --- Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] kirkwood_egiga: updates: fix DRAM mapping and typo
Hi Albert, On 7/5/2010 11:15 AM, Albert Aribaud wrote: DRAM window mapping uses kirkwood-provided functions instead of global gd as do other drivers--fix this. Also, fix a typo in a comment Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- drivers/net/kirkwood_egiga.c | 10 ++ 1 files changed, 6 insertions(+), 4 deletions(-) Applied to net repo. thanks, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Pull request - net
Wolfgang, The following changes since commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934: Wolfgang Denk (1): Make sure that argv[] argument pointers are not modified. are available in the git repository at: git://git.denx.de/u-boot-net.git master Albert Aribaud (2): kirkwood_egiga: bugfix: add DMA sequence points kirkwood_egiga: updates: fix DRAM mapping and typo Ben Warren (1): Write MAC address automatically on MACB-based boards Eric Bénard (2): at91_emac: Write MAC address automatically cpuat91: unbreak ethernet Heiko Schocher (1): tsec: add micrel ksz804 phy Hoan Hoang (3): AX88180: fix media typos AX88180: add support for the Marvell 88E1118 phy AX88180: make OUTW handle 32bit/16bit defines too Juergen Kilb (1): smc91xx_eeprom: Correct chip detection check. Mike Frysinger (7): net: dm9000x: re-add casts to I/O pointers to fix gcc warnings AX88180: add missing init prototype AX88180: improve phy searching AX88180: switch to common mii.h header net: warn about spaces in device names uli526x: drop newlines from device name AX88180: use standard I/O accessors Stefan Roese (1): net: Add option to disable fiber on M88E PHY for PPC4xx Timur Tabi (1): tsec: fix the return value for tsec_eth_init() Vipin KUMAR (1): SPEAr : Network driver support added board/afeb9260/afeb9260.c |7 - board/atmel/at91cap9adk/at91cap9adk.c |7 - board/atmel/at91sam9260ek/at91sam9260ek.c |7 - board/atmel/at91sam9263ek/at91sam9263ek.c |7 - board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |7 - board/calao/sbc35_a9g20/sbc35_a9g20.c |7 - board/eukrea/cpu9260/cpu9260.c |7 - board/ronetix/pm9263/pm9263.c |7 - doc/README.designware_eth | 25 + drivers/net/4xx_enet.c |5 + drivers/net/Makefile|1 + drivers/net/at91_emac.c | 60 ++- drivers/net/ax88180.c | 137 --- drivers/net/ax88180.h | 104 ++--- drivers/net/designware.c| 531 +++ drivers/net/designware.h| 264 +++ drivers/net/dm9000x.c | 12 +- drivers/net/kirkwood_egiga.c| 19 +- drivers/net/macb.c | 23 +- drivers/net/tsec.c | 37 ++- drivers/net/uli526x.c |2 +- examples/standalone/smc911x_eeprom.c|2 +- include/configs/cpuat91.h |9 +- include/netdev.h|2 + net/eth.c |3 + 25 files changed, 1075 insertions(+), 217 deletions(-) create mode 100644 doc/README.designware_eth create mode 100644 drivers/net/designware.c create mode 100644 drivers/net/designware.h regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 3/4] orion5x: add support for cmd_ide.c
Le 12/07/2010 08:46, Prafulla Wadaskar a écrit : -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@lists.denx.de] On Behalf Of Albert Aribaud Sent: Friday, July 09, 2010 12:11 AM To: u-boot@lists.denx.de Subject: [U-Boot] [PATCH V3 3/4] orion5x: add support for cmd_ide.c This patch allows cmd_ide.c to use the Marvell SATAHC controller integrated in the Orion5x SoC, thus enabling access to SATA disks for Orion5x-based boards such as the ED Mini V2. Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- arch/arm/include/asm/arch-orion5x/orion5x.h | 11 +++ common/cmd_ide.c|4 2 files changed, 15 insertions(+), 0 deletions(-) diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h b/arch/arm/include/asm/arch-orion5x/orion5x.h index 4008c84..585083a 100644 --- a/arch/arm/include/asm/arch-orion5x/orion5x.h +++ b/arch/arm/include/asm/arch-orion5x/orion5x.h @@ -55,6 +55,17 @@ #define ORION5X_USB20_PORT0_BASE (ORION5X_REGISTER(0x5)) #define ORION5X_USB20_PORT1_BASE (ORION5X_REGISTER(0xA)) #define ORION5X_EGIGA_BASE (ORION5X_REGISTER(0x72000)) +#define ORION5X_SATA_BASE (ORION5X_REGISTER(0x8)) +#define ORION5X_SATA_PORT0_OFFSET 0x2000 +#define ORION5X_SATA_PORT1_OFFSET 0x4000 + +/* SATA Interface Register port 0 and 1 */ +#define orion5x_port0_sata_registers \ + ((struct mv_sata_interface_registers *) \ + (ORION5X_SATA_BASE+ORION5X_SATA_PORT0_OFFSET+0x300)) +#define orion5x_port1_sata_registers \ + ((struct mv_sata_interface_registers *) \ + (ORION5X_SATA_BASE+ORION5X_SATA_PORT1_OFFSET+0x300)) Pls remove this and use _BASE macro in c code Not sure I understand this comment. Can you elaborate? #define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024) diff --git a/common/cmd_ide.c b/common/cmd_ide.c index 9292a5b..7f98ebb 100644 --- a/common/cmd_ide.c +++ b/common/cmd_ide.c @@ -45,6 +45,10 @@ #includempc5xxx.h #endif +#ifdef CONFIG_ORION5X +#includeasm/arch/orion5x.h +#endif + Why do you need this include? Because just like for other SoC / boards which are #included right before, CMD_IDE requires defining some constants that specify where the SATA register block resides in RAM, and in the orion5x case, these constants will be based on orion5x symbols. This is not strictly speaking required until CMD_IDE is actually used, i.e. until edmini declares support for CMD_IDE in next patch, but the change logically belongs to orion5x support rather than edminiv2 support. Regards.. Prafulla . . Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 4/4] edminiv2: add cmd_ide support
Le 12/07/2010 08:46, Prafulla Wadaskar a écrit : #define ORION5X_GPIO_OUT_ENABLE0x03fc -#define ORION5X_GPIO_OUT_VALUE 0x03fc Why did you removed this? This is unused code, actually, which I fixed on-the-fly but has no relationship with IDE support. I will postpone its removal to a separate bugfix patch. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Le 12/07/2010 08:53, Prafulla Wadaskar a écrit : - struct kwgbe_device *dkwgbe = to_dkwgbe(dev); - struct kwgbe_registers *regs = dkwgbe-regs; + struct mv_egiga_device *dmvegiga = to_mv_egiga(dev); + struct mv_egiga_registers *regs = dmvegiga-regs; I suggest to keep name as mvgbe here instead of mv_egiga, 3 additional chars, increases overall code size huh? The name is consistent with the rest of his work, and *if* the code really increases in size, I can't imagine that 3 chars really matters... That's true. But if we can do it why to avoid it? again it helps to keep same indentation (keeping them below 80char size) I don't think I changed indentation here, and the issue is about line lengths, right? Initially I chose mv egiga because the file names used egiga while the code used gbe, and I wanted clarity, so I decided to keep only one of egiga and gbe. Now which one I should keep is not really important to me, and a Google search for marvell egiga vs marvell gbe indicates gbe appears much more frequently, so someone looking into this will probably know GbE more than egiga. I suggest that: - I switch the file names from mv_egiga to mvgbe (to be consistent with Prafulla's comment on mv_sata becoming mvsata), and - I replace mv_egiga/MV_EGIGA symbols with mvgbe/MVGBE. That will retain (as much) clarity and uniformity (as egiga does), which is what I think Ben is looking for, and it'll keep name length at a minimum, which should satisfy Prafulla. Ben, Prafulla (and others as well, of course), do you agree? Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Le 12/07/2010 07:49, Prafulla Wadaskar a écrit : -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@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 2/5] mv_egiga: support SoCs other than kirkwood Rename all references to kirkwood in mv_egiga symbols throughout the whole codebase. Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- Pls break this patch as- arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 + Kirkwood SOC specific drivers/net/Makefile |2 +- drivers/net/mv_egiga.c| 322 +- drivers/net/mv_egiga.h| 466 include/netdev.h |2 +- Net: driver specific for net repo include/configs/guruplug.h|4 +- include/configs/km_arm.h |4 +- include/configs/mv88f6281gtw_ge.h |4 +- include/configs/openrd_base.h |4 +- include/configs/rd6281a.h |4 +- include/configs/sheevaplug.h |4 +- Board updates In the same order, so that it is easier to pick them separately by net and Marvell repos. Regards.. Prafulla . . If I split this patch, it will not build correctly any more. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] kirkwood_egiga: CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION
This configuration option allows SoCs without random
generation capability to fill in local MACs with a fixed
rather than random value
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
drivers/net/kirkwood_egiga.c | 10 +-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/kirkwood_egiga.c
index dca9f11..7aabcef 100644
--- a/drivers/net/kirkwood_egiga.c
+++ b/drivers/net/kirkwood_egiga.c
@@ -699,13 +699,21 @@ int kirkwood_egiga_initialize(bd_t * bis)
}
while (!eth_getenv_enetaddr(s, dev-enetaddr)) {
- /* Generate Random Private MAC addr if not set */
+ /* Generate Private MAC addr if not set */
dev-enetaddr[0] = 0x02;
dev-enetaddr[1] = 0x50;
dev-enetaddr[2] = 0x43;
+#if defined (CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION)
+ /* Generate fixed lower MAC half using devnum */
+ dev-enetaddr[3] = 0;
+ dev-enetaddr[4] = 0;
+ dev-enetaddr[5] = devnum;
+#else
+ /* Generate random lower MAC half */
dev-enetaddr[3] = get_random_hex();
dev-enetaddr[4] = get_random_hex();
dev-enetaddr[5] = get_random_hex();
+#endif
eth_setenv_enetaddr(s, dev-enetaddr);
}
--
1.6.4.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] Support for SD/MMC for davinci boards ?
Hi Sandeep, Any plan to merge SD/MMC support patches [1] for davinci boards? I dont see these patches in u-boot-ti. git tree [2], Please correct me if I am wrong or I have missed any discussions on these patches. [1] http://lists.denx.de/pipermail/u-boot/2010-May/071434.html [2] git://git.denx.de/u-boot-ti.git -- Regards, Rupesh Gujare ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Support for SD/MMC for davinci boards ?
Hi Sandeep, Any plan to merge SD/MMC support patches [1] for davinci boards? I dont see these patches in u-boot-ti. git tree [2], Please correct me if I am wrong or I have missed any discussions on these patches. [1] http://lists.denx.de/pipermail/u-boot/2010-May/071434.html [2] git://git.denx.de/u-boot-ti.githttp://git.denx.de/u-boot-ti.git Rupesh, I am not supposed to add these to u-boot-ti. These should go through u-boot-mmc. There again since its been quite a while since this patch was sent to the list, i'll add this to u-boot-ti. Thanks, Sandeep ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Hi Albert, On Mon, Jul 12, 2010 at 1:53 AM, Albert ARIBAUD albert.arib...@free.frwrote: Le 12/07/2010 08:53, Prafulla Wadaskar a écrit : - struct kwgbe_device *dkwgbe = to_dkwgbe(dev); - struct kwgbe_registers *regs = dkwgbe-regs; + struct mv_egiga_device *dmvegiga = to_mv_egiga(dev); + struct mv_egiga_registers *regs = dmvegiga-regs; I suggest to keep name as mvgbe here instead of mv_egiga, 3 additional chars, increases overall code size huh? The name is consistent with the rest of his work, and *if* the code really increases in size, I can't imagine that 3 chars really matters... That's true. But if we can do it why to avoid it? again it helps to keep same indentation (keeping them below 80char size) I don't think I changed indentation here, and the issue is about line lengths, right? Initially I chose mv egiga because the file names used egiga while the code used gbe, and I wanted clarity, so I decided to keep only one of egiga and gbe. Now which one I should keep is not really important to me, and a Google search for marvell egiga vs marvell gbe indicates gbe appears much more frequently, so someone looking into this will probably know GbE more than egiga. I suggest that: - I switch the file names from mv_egiga to mvgbe (to be consistent with Prafulla's comment on mv_sata becoming mvsata), and - I replace mv_egiga/MV_EGIGA symbols with mvgbe/MVGBE. That will retain (as much) clarity and uniformity (as egiga does), which is what I think Ben is looking for, and it'll keep name length at a minimum, which should satisfy Prafulla. Ben, Prafulla (and others as well, of course), do you agree? OK with me. Amicalement, -- Albert. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Hi Albert, On Mon, Jul 12, 2010 at 1:56 AM, Albert ARIBAUD albert.arib...@free.frwrote: Le 12/07/2010 07:49, Prafulla Wadaskar a écrit : -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@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 2/5] mv_egiga: support SoCs other than kirkwood Rename all references to kirkwood in mv_egiga symbols throughout the whole codebase. Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- Pls break this patch as- arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 + Kirkwood SOC specific drivers/net/Makefile |2 +- drivers/net/mv_egiga.c| 322 +- drivers/net/mv_egiga.h| 466 include/netdev.h |2 +- Net: driver specific for net repo include/configs/guruplug.h|4 +- include/configs/km_arm.h |4 +- include/configs/mv88f6281gtw_ge.h |4 +- include/configs/openrd_base.h |4 +- include/configs/rd6281a.h |4 +- include/configs/sheevaplug.h |4 +- Board updates In the same order, so that it is easier to pick them separately by net and Marvell repos. Regards.. Prafulla . . If I split this patch, it will not build correctly any more. Usually, these should be split up. In this case, the dependencies are significant, so just leave it as-is. If Prafulla ACKs, I'll pull the whole group into the net repo. Amicalement, -- Albert. regards, Ben ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] Support for SD/MMC for davinci boards ?
On Mon, Jul 12, 2010 at 7:12 PM, Paulraj, Sandeep s-paul...@ti.com wrote: Hi Sandeep, Any plan to merge SD/MMC support patches [1] for davinci boards? I dont see these patches in u-boot-ti. git tree [2], Please correct me if I am wrong or I have missed any discussions on these patches. [1] http://lists.denx.de/pipermail/u-boot/2010-May/071434.html [2] git://git.denx.de/u-boot-ti.git Rupesh, I am not supposed to add these to u-boot-ti. These should go through u-boot-mmc. There again since its been quite a while since this patch was sent to the list, i’ll add this to u-boot-ti. Thanks, Sandeep Sandeep, Sorry, I was not aware that these patches should go through u-boot-mmc. and Thanks for adding these patches to u-boot-ti git tree, as it will help community around davinci boards. -- Regards, Rupesh Gujare ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Le 12/07/2010 16:19, Ben Warren a écrit : I suggest that: - I switch the file names from mv_egiga to mvgbe (to be consistent with Prafulla's comment on mv_sata becoming mvsata), and - I replace mv_egiga/MV_EGIGA symbols with mvgbe/MVGBE. That will retain (as much) clarity and uniformity (as egiga does), which is what I think Ben is looking for, and it'll keep name length at a minimum, which should satisfy Prafulla. Ben, Prafulla (and others as well, of course), do you agree? OK with me. Thanks Ben. I assume Prafulla will agree too. I'll regenerate a patch set with all changes requested by Prafulla, keeping the symbol-change in a single patch as discussed elsewhere in this thread. Note that the last patch of the series (edminiv2 support) will only build above the CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION patch that I posted separately. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH 5/5] PXA: PXA3xx NAND Driver
On Sat, Jul 10, 2010 at 12:24:27AM +0200, Marek Vasut wrote: Dne Pá 9. července 2010 22:04:00 Scott Wood napsal(a): On Tue, Jul 06, 2010 at 03:12:49AM +0200, Marek Vasut wrote: From: Compulab uboot n...@none Hmm? Well I was unable to figure out who was the author, though the license of the code is GPL so it should be OK ? I'll try poking around a little bit more, but it's unlikely I'll find some more info. I'd just describe where it came from in the commit message, rather than use a From: line. The code is (partly?) from them, but the patch is from you. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v2] nios2: remove EP1C20, EP1S10, EP1S40 boards
Applied to: git://git.denx.de/u-boot-nios.git next Thanks, --Scott Thomas Chou wrote: The example configuration files of nios2-generic board can generated binary to run on the EP1C20, EP1S10, and EP1S40 boards. So the three boards can be removed. With nios2-generic approach, the fpga parameter header file can be generated from hardware designs using tools. Porting u-boot for nios2 boards is simplified. Vendors can supply their fpga parameter file or patches to add a new nios2-generic board instance. There is no need to include other boards support for nios2 in the u-boot mainline. Signed-off-by: Thomas Chou tho...@wytron.com.tw --- Hi Scott, please rebase your next branch to Wolfgang's next, 06/14. v2: rebased to Makefile simplify MAINTAINERS |3 - MAKEALL |3 - board/altera/ep1c20/Makefile | 55 --- board/altera/ep1c20/config.mk | 31 -- board/altera/ep1c20/ep1c20.c | 52 -- board/altera/ep1s10/Makefile | 55 --- board/altera/ep1s10/config.mk | 31 -- board/altera/ep1s10/ep1s10.c | 52 -- board/altera/ep1s40/Makefile | 55 --- board/altera/ep1s40/config.mk | 31 -- board/altera/ep1s40/ep1s40.c | 47 - boards.cfg|3 - include/configs/EP1C20.h | 214 - include/configs/EP1S10.h | 207 --- include/configs/EP1S40.h | 207 --- 15 files changed, 0 insertions(+), 1046 deletions(-) delete mode 100644 board/altera/ep1c20/Makefile delete mode 100644 board/altera/ep1c20/config.mk delete mode 100644 board/altera/ep1c20/ep1c20.c delete mode 100644 board/altera/ep1s10/Makefile delete mode 100644 board/altera/ep1s10/config.mk delete mode 100644 board/altera/ep1s10/ep1s10.c delete mode 100644 board/altera/ep1s40/Makefile delete mode 100644 board/altera/ep1s40/config.mk delete mode 100644 board/altera/ep1s40/ep1s40.c delete mode 100644 include/configs/EP1C20.h delete mode 100644 include/configs/EP1S10.h delete mode 100644 include/configs/EP1S40.h diff --git a/MAINTAINERS b/MAINTAINERS index 7a13d28..700dd8c 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -852,9 +852,6 @@ Scott McNutt smcn...@psyent.com PCI5441 Nios-II PK1C20 Nios-II - EP1C20 Nios-II - EP1S10 Nios-II - EP1S40 Nios-II nios2-generic Nios-II # diff --git a/MAKEALL b/MAKEALL index 2527352..56db729 100755 --- a/MAKEALL +++ b/MAKEALL @@ -815,9 +815,6 @@ LIST_x86=\ # LIST_nios2= \ - EP1C20 \ - EP1S10 \ - EP1S40 \ PCI5441 \ PK1C20 \ nios2-generic \ diff --git a/board/altera/ep1c20/Makefile b/board/altera/ep1c20/Makefile deleted file mode 100644 index acad2aa..000 --- a/board/altera/ep1c20/Makefile +++ /dev/null @@ -1,55 +0,0 @@ -# -# (C) Copyright 2001-2006 -# Wolfgang Denk, DENX Software Engineering, w...@denx.de. -# -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA -# - -include $(TOPDIR)/config.mk -ifneq ($(OBJTREE),$(SRCTREE)) -$(shell mkdir -p $(obj)../common) -endif - -LIB = $(obj)lib$(BOARD).a - -COMOBJS := ../common/AMDLV065D.o ../common/epled.o - -COBJS:= $(BOARD).o $(COMOBJS) - -SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) -OBJS := $(addprefix $(obj),$(COBJS)) -SOBJS:= $(addprefix $(obj),$(SOBJS)) - -$(LIB): $(obj).depend $(OBJS) - $(AR) $(ARFLAGS) $@ $(OBJS) - -clean: - rm -f $(SOBJS) $(OBJS) - -distclean: clean - rm -f $(LIB) core *.bak $(obj).depend - -# - -# defines $(obj).depend target -include $(SRCTREE)/rules.mk - -sinclude $(obj).depend - -# diff --git a/board/altera/ep1c20/config.mk
Re: [U-Boot] [PATCH v4] NAND: environment offset in OOB (CONFIG_ENV_OFFSET_OOB)
Hi Scott, I was hoping that the env OOB patch [1] would be considered for inclusion into this merge window [2] but I saw that your pull request on friday [3] did not include the patch. There has been no reply by you to version 2-4 of the patch but I believe that I successfully made the modifications requested by you in your review of version 1 of the patch [4]. I am still very much a novice in this list and I apologize if it is rude of me to ask: is there any chance for [PATCH v4] NAND: environment offset in OOB (CONFIG_ENV_OFFSET_OOB) [1] to be included in v2010.09 via the u-boot-nand-flash tree? Are there any concerns with respect to the functionality that this patch provides? Is there anything else that I can provide to help with getting this patch included? Best Regards, Ben Gardiner [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/80832 [2] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/80606 [3] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/81004 [4] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/79195 --- Nanometrics Inc. +1 (613) 592-6776 x239 http://www.nanometrics.ca ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4] NAND: environment offset in OOB (CONFIG_ENV_OFFSET_OOB)
On Mon, 12 Jul 2010 12:17:23 -0400 Ben Gardiner bengardi...@nanometrics.ca wrote: Hi Scott, I was hoping that the env OOB patch [1] would be considered for inclusion into this merge window [2] but I saw that your pull request on friday [3] did not include the patch. There has been no reply by you to version 2-4 of the patch but I believe that I successfully made the modifications requested by you in your review of version 1 of the patch [4]. Sorry, I missed it -- I'll look at it today. -Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [Nios] Pull Request
Dear Wolfgang, The following changes since commit 54841ab50c20d6fa6c9cc3eb826989da3a22d934: Wolfgang Denk (1): Make sure that argv[] argument pointers are not modified. are available in the git repository at: git://git.denx.de/u-boot-nios.git next Thomas Chou (6): nios2: use gc sections to reduce image size nios2: add fdt support nios2: add gpio_request gpio_led: add gpio_request to __led_init nios2: add spi flash support to nios2-generic board nios2: remove EP1C20, EP1S10, EP1S40 boards MAINTAINERS |3 - MAKEALL |3 - arch/nios2/config.mk |3 + arch/nios2/include/asm/gpio.h|6 + arch/nios2/lib/bootm.c | 21 +++ board/altera/ep1c20/Makefile | 55 board/altera/ep1c20/config.mk| 31 - board/altera/ep1c20/ep1c20.c | 52 --- board/altera/ep1s10/Makefile | 55 board/altera/ep1s10/config.mk| 31 - board/altera/ep1s10/ep1s10.c | 52 --- board/altera/ep1s40/Makefile | 55 board/altera/ep1s40/config.mk| 31 - board/altera/ep1s40/ep1s40.c | 47 --- board/altera/nios2-generic/custom_fpga.h | 10 ++ board/altera/nios2-generic/gpio.c|5 + boards.cfg |3 - drivers/misc/gpio_led.c | 12 +- include/configs/EP1C20.h | 214 -- include/configs/EP1S10.h | 207 - include/configs/EP1S40.h | 207 - 21 files changed, 49 insertions(+), 1054 deletions(-) delete mode 100644 board/altera/ep1c20/Makefile delete mode 100644 board/altera/ep1c20/config.mk delete mode 100644 board/altera/ep1c20/ep1c20.c delete mode 100644 board/altera/ep1s10/Makefile delete mode 100644 board/altera/ep1s10/config.mk delete mode 100644 board/altera/ep1s10/ep1s10.c delete mode 100644 board/altera/ep1s40/Makefile delete mode 100644 board/altera/ep1s40/config.mk delete mode 100644 board/altera/ep1s40/ep1s40.c delete mode 100644 include/configs/EP1C20.h delete mode 100644 include/configs/EP1S10.h delete mode 100644 include/configs/EP1S40.h Regards, --Scott ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
Le 12/07/2010 07:45, Prafulla Wadaskar a écrit : --- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h +++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h +#if defined (CONFIG_MV_EGIGA) I think you don't need ifdef here +#define MV_EGIGA0_BASE KW_EGIGA0_BASE +#define MV_EGIGA1_BASE KW_EGIGA1_BASE +#endif Actually the ifdef is intended to make sure these symbols do not get defined uselessly for kirkwood boards that don't have Ethernet support. Granted, their being defined without being used is no big deal. However the whole thing about the egiga driver supporting one or two ports could be streamlined (e.g., one might define KIRKWOOD_EGIGAn_BASE while not enabling port n in CONFIG_KIRKWOOD_EGIGA_PORTS) and integrate the suggestion about the PHYs that occurred some time ago: http://lists.denx.de/pipermail/u-boot/2010-June/073138.html So I'll leave that one to a later patch set. Amicalement, -- Albert. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v3 0/4] mtdparts: add bad-block skipping
Hi Wolfgang, I rebased the mtdparts bad block skipping patches and reposted a v3 series [1] in the hopes that it would be considered for inclusion into v2010.09 . I hope that I have addressed the concerns you raised in your reviews [2] [3]. I said this earlier to Scott Wood: I am very much a novice here so I hope it is not rude of me to ask: is there any chance of having the [PATCH v3 0/4] mtdparts: add bad-block skipping [1] series included in v2010.09? Are there any concerns with respect to the functionality that this patch provides? Is there anything else that I can provide to help with getting this patch included? Best Regards, Ben Gardiner [1] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/80843 [2] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/79418 [3] http://article.gmane.org/gmane.comp.boot-loaders.u-boot/79419 --- Nanometrics Inc. +1 (613) 592-6776 x239 http://www.nanometrics.ca ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 1/4] net: rename: kirkwood_egiga as mvgbe
Rename kirkwood_egiga.* to mvgbe.* and adjust makefile
and #include accordingly.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
drivers/net/Makefile |2 +-
drivers/net/{kirkwood_egiga.c = mvgbe.c} |2 +-
drivers/net/{kirkwood_egiga.h = mvgbe.h} |0
3 files changed, 2 insertions(+), 2 deletions(-)
rename drivers/net/{kirkwood_egiga.c = mvgbe.c} (99%)
rename drivers/net/{kirkwood_egiga.h = mvgbe.h} (100%)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index b75c02f..5d2da59 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -46,13 +46,13 @@ COBJS-$(CONFIG_FSLDMAFEC) += fsl_mcdmafec.o mcfmii.o
COBJS-$(CONFIG_FTMAC100) += ftmac100.o
COBJS-$(CONFIG_GRETH) += greth.o
COBJS-$(CONFIG_INCA_IP_SWITCH) += inca-ip_sw.o
-COBJS-$(CONFIG_KIRKWOOD_EGIGA) += kirkwood_egiga.o
COBJS-$(CONFIG_DRIVER_KS8695ETH) += ks8695eth.o
COBJS-$(CONFIG_LAN91C96) += lan91c96.o
COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
COBJS-$(CONFIG_MPC512x_FEC) += mpc512x_fec.o
+COBJS-$(CONFIG_KIRKWOOD_EGIGA) += mvgbe.o
COBJS-$(CONFIG_NATSEMI) += natsemi.o
COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o ne2000_base.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o ne2000_base.o
diff --git a/drivers/net/kirkwood_egiga.c b/drivers/net/mvgbe.c
similarity index 99%
rename from drivers/net/kirkwood_egiga.c
rename to drivers/net/mvgbe.c
index 7aabcef..1efca1e 100644
--- a/drivers/net/kirkwood_egiga.c
+++ b/drivers/net/mvgbe.c
@@ -36,7 +36,7 @@
#include asm/types.h
#include asm/byteorder.h
#include asm/arch/kirkwood.h
-#include kirkwood_egiga.h
+#include mvgbe.h
DECLARE_GLOBAL_DATA_PTR;
diff --git a/drivers/net/kirkwood_egiga.h b/drivers/net/mvgbe.h
similarity index 100%
rename from drivers/net/kirkwood_egiga.h
rename to drivers/net/mvgbe.h
--
1.6.4.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 0/4] Marvell GbE multiple SoC support
NOTES
1) This patchset will only apply above a previously posted and
Acked-by patch available on the mailing list archives e.g. at:
http://lists.denx.de/pipermail/u-boot/2010-July/073590.html
(kirkwood_egiga: updates: fix DRAM mapping and typo).
2) This patchset will build for edminiv2 but requires a bugfix
patch, also Acked-by and available on archives as well at e.g.
http://lists.denx.de/pipermail/u-boot/2010-July/073789.html
(kirkwood_egiga: bugfix: add DMA sequence points).
3) This patchset will only apply above a previously posted, not
yet Acked-by patch available on the mailing list archives e.g. at:
http://lists.denx.de/pipermail/u-boot/2010-July/073838.html
(kirkwood_egiga: CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION).
PATCHSET HISTORY
V1: First submission.
V2: Reorganization as per Prafulla Wadasakar's suggestion.
Used -C in format-patch to render renames correctly.
Removal of DRAM patch posted standalone.
Removal of unrelated changes.
V3: Removal of DMA bugfix patch posted standalone
Introduced MAC non-randomization config option
Added short description to each patch.
V4: Renaming of mv_egiga to mvgbe throughout.
Removal of MAC non-randomization patch posted standalone.
Removal of unrelated edminiv2 changes.
Move of MAX_MVGBE_DEVS from driver to SoC files.
SHORT STORY
This patchset separates the Marvell Gigabit Ethernet (mvgbe) from
kirkwood, adds orion5x support in mvgbe, and adds mvgbe support
in edminiv2. It has been successfully tested on an OpenRD-Client
after each of the four commits and on an EDMini V2 after the last
commit; it has been run through checkpatch.pl, with 6 false-positive
errors on patch 2 and 1 on patch 4.
LONG STORY
This is a set of four atomic commits.
the first commit renames kirkwood_egiga.[ch] to mvgbe.[ch] in
drivers/net/ (also modifies Makefile) to make sur the renaming
remains visible in git at 100% similarity.
The second commit removes all dependency of mvgbe on kirkwood.
Kirkwood references in all mvgbe symbols are replaced with mvgbe
references throughout the source tree. Some cosmetic changes have
also been made to minimize checkpatch errors (although 6 false-
positives remain).
The third commit adds orion5x support to mvgbe.
The fourth commit adds edminiv2 support for the orion5x GbE controller.
Prior to submission, all commits have been tested on a kirkwood-based
OpenRD-Client for regression avoidance, and the last commit has been
tested on an orion5x-based ED Mini V2 for functionality validation.
Also, all patches were run through checkpatch.pl --no-tree; there are
6 errors emitted for patch 2, and 1 for patch 4, all corresponding to
the same line: in all config files involved, checkpatch.pl erroneously
considers #define CONFIG_MVGBE_PORTS {...} as a macro expanding to
statements whereas it actually expands to an array initializer.
Albert Aribaud (4):
net: rename: kirkwood_egiga as mvgbe
mvgbe: support SoCs other than kirkwood
mvgbe: add support for orion5x GbE controller
edminiv2: add ethernet support
arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +-
arch/arm/cpu/arm926ejs/orion5x/cpu.c |8 +
arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 +
arch/arm/include/asm/arch-orion5x/orion5x.h |4 +
board/LaCie/edminiv2/edminiv2.c | 36 ++
board/LaCie/edminiv2/edminiv2.h | 41 ++
drivers/net/Makefile |2 +-
drivers/net/kirkwood_egiga.h | 505 -
drivers/net/{kirkwood_egiga.c = mvgbe.c} | 350 +
drivers/net/mvgbe.h | 505 +
include/configs/edminiv2.h| 19 +-
include/configs/guruplug.h|4 +-
include/configs/km_arm.h |4 +-
include/configs/mv88f6281gtw_ge.h |4 +-
include/configs/openrd_base.h |4 +-
include/configs/rd6281a.h |4 +-
include/configs/sheevaplug.h |4 +-
include/netdev.h |2 +-
18 files changed, 815 insertions(+), 690 deletions(-)
create mode 100644 board/LaCie/edminiv2/edminiv2.h
delete mode 100644 drivers/net/kirkwood_egiga.h
rename drivers/net/{kirkwood_egiga.c = mvgbe.c} (63%)
create mode 100644 drivers/net/mvgbe.h
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 2/4] mvgbe: support SoCs other than kirkwood
Rename all references to kirkwood in mvgbe symbols
throughout the whole codebase.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +-
arch/arm/include/asm/arch-kirkwood/kirkwood.h |3 +
drivers/net/Makefile |2 +-
drivers/net/mvgbe.c | 346 ++-
drivers/net/mvgbe.h | 474 +
include/configs/guruplug.h|4 +-
include/configs/km_arm.h |4 +-
include/configs/mv88f6281gtw_ge.h |4 +-
include/configs/openrd_base.h |4 +-
include/configs/rd6281a.h |4 +-
include/configs/sheevaplug.h |4 +-
include/netdev.h |2 +-
12 files changed, 439 insertions(+), 416 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
index 6fc3902..c63e864 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 2470efb..5c2586b 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_BASEKW_EGIGA0_BASE
+#define MVGBE1_BASEKW_EGIGA1_BASE
+
#if defined (CONFIG_KW88F6281)
#include asm/arch/kw88f6281.h
#elif defined (CONFIG_KW88F6192)
diff --git a/drivers/net/Makefile b/drivers/net/Makefile
index 5d2da59..789af83 100644
--- a/drivers/net/Makefile
+++ b/drivers/net/Makefile
@@ -52,7 +52,7 @@ COBJS-$(CONFIG_MACB) += macb.o
COBJS-$(CONFIG_MCFFEC) += mcffec.o mcfmii.o
COBJS-$(CONFIG_MPC5xxx_FEC) += mpc5xxx_fec.o
COBJS-$(CONFIG_MPC512x_FEC) += mpc512x_fec.o
-COBJS-$(CONFIG_KIRKWOOD_EGIGA) += mvgbe.o
+COBJS-$(CONFIG_MVGBE) += mvgbe.o
COBJS-$(CONFIG_NATSEMI) += natsemi.o
COBJS-$(CONFIG_DRIVER_NE2000) += ne2000.o ne2000_base.o
COBJS-$(CONFIG_DRIVER_AX88796L) += ax88796.o ne2000_base.o
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index 1efca1e..e44352c 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -35,13 +35,17 @@
#include asm/errno.h
#include asm/types.h
#include asm/byteorder.h
+
+#if defined(CONFIG_KIRKWOOD)
#include asm/arch/kirkwood.h
+#endif
+
#include mvgbe.h
DECLARE_GLOBAL_DATA_PTR;
-#define KIRKWOOD_PHY_ADR_REQUEST 0xee
-#define KWGBE_SMI_REG (((struct kwgbe_registers *)KW_EGIGA0_BASE)-smi)
+#define MV_PHY_ADR_REQUEST 0xee
+#define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)-smi)
/*
* smi_reg_read - miiphy_read callback function.
@@ -51,16 +55,16 @@ DECLARE_GLOBAL_DATA_PTR;
static int smi_reg_read(char *devname, u8 phy_adr, u8 reg_ofs, u16 * data)
{
struct eth_device *dev = eth_get_dev_by_name(devname);
- struct kwgbe_device *dkwgbe = to_dkwgbe(dev);
- struct kwgbe_registers *regs = dkwgbe-regs;
+ struct mvgbe_device *dmvgbe = to_mvgbe(dev);
+ struct mvgbe_registers *regs = dmvgbe-regs;
u32 smi_reg;
u32 timeout;
/* Phyadr read request */
- if (phy_adr == KIRKWOOD_PHY_ADR_REQUEST
- reg_ofs == KIRKWOOD_PHY_ADR_REQUEST) {
+ if (phy_adr == MV_PHY_ADR_REQUEST
+ reg_ofs == MV_PHY_ADR_REQUEST) {
/* */
- *data = (u16) (KWGBEREG_RD(regs-phyadr) PHYADR_MASK);
+ *data = (u16) (MVGBE_REG_RD(regs-phyadr) PHYADR_MASK);
return 0;
}
/* check parameters */
@@ -75,42 +79,43 @@ static int smi_reg_read(char *devname, u8 phy_adr, u8
reg_ofs, u16 * data)
return -EFAULT;
}
- timeout = KWGBE_PHY_SMI_TIMEOUT;
+ timeout = MVGBE_PHY_SMI_TIMEOUT;
/* wait till the SMI is not busy */
do {
/* read smi register */
- smi_reg = KWGBEREG_RD(KWGBE_SMI_REG);
+ smi_reg = MVGBE_REG_RD(MVGBE_SMI_REG);
if (timeout-- == 0) {
printf(Err..(%s) SMI busy timeout\n, __FUNCTION__);
return -EFAULT;
}
- } while (smi_reg KWGBE_PHY_SMI_BUSY_MASK);
+ } while (smi_reg MVGBE_PHY_SMI_BUSY_MASK);
/* fill the phy address and regiser offset and read opcode */
- smi_reg = (phy_adr KWGBE_PHY_SMI_DEV_ADDR_OFFS)
- | (reg_ofs KWGBE_SMI_REG_ADDR_OFFS)
- |
[U-Boot] [PATCH V4 3/4] mvgbe: add support for orion5x GbE controller
Add definitions and initialization in orion5x for mvgbe.
Add orion5x in mvgbe SoC includes.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
arch/arm/cpu/arm926ejs/orion5x/cpu.c |8
arch/arm/include/asm/arch-kirkwood/kirkwood.h |6 --
arch/arm/include/asm/arch-orion5x/orion5x.h |4
drivers/net/mvgbe.c |2 ++
drivers/net/mvgbe.h |2 --
5 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/arch/arm/cpu/arm926ejs/orion5x/cpu.c
b/arch/arm/cpu/arm926ejs/orion5x/cpu.c
index 03c6d06..f3c1e21 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_MVGBE
+int cpu_eth_init(bd_t *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 5c2586b..9edb0be 100644
--- a/arch/arm/include/asm/arch-kirkwood/kirkwood.h
+++ b/arch/arm/include/asm/arch-kirkwood/kirkwood.h
@@ -60,8 +60,10 @@
#define KW_EGIGA0_BASE (KW_REGISTER(0x72000))
#define KW_EGIGA1_BASE (KW_REGISTER(0x76000))
-#define MVGBE0_BASEKW_EGIGA0_BASE
-#define MVGBE1_BASEKW_EGIGA1_BASE
+/* Kirkwood GbE controller has two ports */
+#define MAX_MVGBE_DEVS 2
+#define MVGBE0_BASEKW_EGIGA0_BASE
+#define MVGBE1_BASEKW_EGIGA1_BASE
#if defined (CONFIG_KW88F6281)
#include asm/arch/kw88f6281.h
diff --git a/arch/arm/include/asm/arch-orion5x/orion5x.h
b/arch/arm/include/asm/arch-orion5x/orion5x.h
index 4008c84..d257b66 100644
--- a/arch/arm/include/asm/arch-orion5x/orion5x.h
+++ b/arch/arm/include/asm/arch-orion5x/orion5x.h
@@ -56,6 +56,10 @@
#define ORION5X_USB20_PORT1_BASE (ORION5X_REGISTER(0xA))
#define ORION5X_EGIGA_BASE (ORION5X_REGISTER(0x72000))
+/* Orion5x GbE controller has a single port */
+#define MAX_MVGBE_DEVS 1
+#define MVGBE0_BASEORION5X_EGIGA_BASE
+
#define CONFIG_MAX_RAM_BANK_SIZE (64*1024*1024)
/* include here SoC variants. 5181, 5281, 6183 should go here when
diff --git a/drivers/net/mvgbe.c b/drivers/net/mvgbe.c
index e44352c..cad4023 100644
--- a/drivers/net/mvgbe.c
+++ b/drivers/net/mvgbe.c
@@ -38,6 +38,8 @@
#if defined(CONFIG_KIRKWOOD)
#include asm/arch/kirkwood.h
+#elif defined(CONFIG_ORION5X)
+#include asm/arch/orion5x.h
#endif
#include mvgbe.h
diff --git a/drivers/net/mvgbe.h b/drivers/net/mvgbe.h
index 7db5af4..3de98d0 100644
--- a/drivers/net/mvgbe.h
+++ b/drivers/net/mvgbe.h
@@ -28,8 +28,6 @@
#ifndef __MVGBE_H__
#define __MVGBE_H__
-#define MAX_MVGBE_DEVS 2 /*controller has two ports */
-
/* PHY_BASE_ADR is board specific and can be configured */
#if defined (CONFIG_PHY_BASE_ADR)
#define PHY_BASE_ADR CONFIG_PHY_BASE_ADR
--
1.6.4.4
___
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH V4 4/4] edminiv2: add ethernet support
Add edminiv2 board support for mv_egiga.
Add edminiv2 config to enable mv_egiga.
Signed-off-by: Albert Aribaud albert.arib...@free.fr
---
board/LaCie/edminiv2/edminiv2.c | 36 ++
board/LaCie/edminiv2/edminiv2.h | 41 +++
include/configs/edminiv2.h | 19 ++---
3 files changed, 92 insertions(+), 4 deletions(-)
create mode 100644 board/LaCie/edminiv2/edminiv2.h
diff --git a/board/LaCie/edminiv2/edminiv2.c b/board/LaCie/edminiv2/edminiv2.c
index 54c0ffe..bb388ed 100644
--- a/board/LaCie/edminiv2/edminiv2.c
+++ b/board/LaCie/edminiv2/edminiv2.c
@@ -27,6 +27,7 @@
#include common.h
#include miiphy.h
#include asm/arch/orion5x.h
+#include edminiv2.h
DECLARE_GLOBAL_DATA_PTR;
@@ -90,3 +91,38 @@ int board_init(void)
return 0;
}
+
+#if defined(CONFIG_CMD_NET) defined(CONFIG_RESET_PHY_R)
+/* Configure and enable MV88E1116 PHY */
+void reset_phy(void)
+{
+ u16 reg;
+ u16 devadr;
+ char *name = egiga0;
+
+ if (miiphy_set_current_dev(name))
+ return;
+
+ /* command to read PHY dev address */
+ if (miiphy_read(name, 0xEE, 0xEE, (u16 *) devadr)) {
+ printf(Err..%s could not read PHY dev address\n,
+ __func__);
+ return;
+ }
+
+ /*
+* Enable RGMII delay on Tx and Rx for CPU port
+* Ref: sec 4.7.2 of chip datasheet
+*/
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2);
+ miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL);
+ miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg);
+ miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0);
+
+ /* reset the phy */
+ miiphy_reset(name, devadr);
+
+ printf(88E1116 Initialized on %s\n, name);
+}
+#endif /* CONFIG_RESET_PHY_R */
diff --git a/board/LaCie/edminiv2/edminiv2.h b/board/LaCie/edminiv2/edminiv2.h
new file mode 100644
index 000..88e62b2
--- /dev/null
+++ b/board/LaCie/edminiv2/edminiv2.h
@@ -0,0 +1,41 @@
+/*
+ * (C) Copyright 2009
+ * Net Insight www.netinsight.net
+ * Written-by: Simon Kagstrom simon.kagst...@netinsight.net
+ *
+ * Based on sheevaplug.h:
+ * (C) Copyright 2009
+ * Marvell Semiconductor www.marvell.com
+ * Written-by: Prafulla Wadaskar prafu...@marvell.com
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301 USA
+ */
+
+#ifndef __EDMINIV2_BASE_H
+#define __EDMINIV2_BASE_H
+
+/* PHY related */
+#define MV88E1116_LED_FCTRL_REG10
+#define MV88E1116_CPRSP_CR3_REG21
+#define MV88E1116_MAC_CTRL_REG 21
+#define MV88E1116_PGADR_REG22
+#define MV88E1116_RGMII_TXTM_CTRL (1 4)
+#define MV88E1116_RGMII_RXTM_CTRL (1 5)
+
+#endif /* __EDMINIV2_BASE_H */
diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h
index c3d95a0..055931c 100644
--- a/include/configs/edminiv2.h
+++ b/include/configs/edminiv2.h
@@ -131,12 +131,23 @@
* Commands configuration - using default command set for now
*/
#include config_cmd_default.h
+
/*
- * Disabling some default commands for staggered bring-up
+ * Network
*/
-#undef CONFIG_CMD_BOOTD/* no bootd since no net */
-#undef CONFIG_CMD_NET /* no net since no eth */
-#undef CONFIG_CMD_NFS /* no NFS since no net */
+
+#ifdef CONFIG_CMD_NET
+#define CONFIG_MVGBE /* Enable Marvell GbE Driver */
+#define CONFIG_MVGBE_PORTS {1} /* enable port 0 only */
+#define CONFIG_SKIP_LOCAL_MAC_RANDOMIZATION/* don't randomize MAC */
+#define CONFIG_PHY_BASE_ADR0x8
+#define CONFIG_RESET_PHY_R /* use reset_phy() to init mv8831116 PHY */
+#define CONFIG_NETCONSOLE /* include NetConsole support */
+#define CONFIG_NET_MULTI /* specify more that one ports available */
+#defineCONFIG_MII /* expose smi ove miiphy interface */
+#define CONFIG_SYS_FAULT_ECHO_LINK_DOWN/* detect link using phy */
+#define CONFIG_ENV_OVERWRITE /* ethaddr can be reprogrammed */
+#endif
/*
* Environment variables configurations
--
1.6.4.4
___
[U-Boot] [PATCH] NAND: formatting cleanups from env.oob support
Change if (ok) {
bunch of stuff
} else {
error
}
to
if (error) {
get out
}
proceed with bunch of stuff
Plus a few whitespace cleanups.
Signed-off-by: Scott Wood scottw...@freescale.com
---
Applied to u-boot-nand-flash
common/cmd_nand.c | 54 +++-
common/env_nand.c | 26 +++-
2 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index a4c67c1..84b6272 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -201,7 +201,7 @@ static void do_nand_status(nand_info_t *nand)
unsigned long nand_env_oob_offset;
int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
-int argc, char * const argv[])
+ int argc, char * const argv[])
{
int ret;
uint32_t oob_buf[ENV_OFFSET_SIZE/sizeof(uint32_t)];
@@ -210,10 +210,10 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
if (!strcmp(cmd, get)) {
ret = get_nand_env_oob(nand, nand_env_oob_offset);
- if (!ret)
- printf(0x%08lx\n, nand_env_oob_offset);
- else
+ if (ret)
return 1;
+
+ printf(0x%08lx\n, nand_env_oob_offset);
} else if (!strcmp(cmd, set)) {
ulong addr;
size_t dummy_size;
@@ -222,17 +222,17 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
if (argc 3)
goto usage;
- if (arg_off_size(argc-2, argv + 2, nand, addr,
- dummy_size) 0) {
+ if (arg_off_size(argc - 2, argv + 2, nand, addr,
+dummy_size) 0) {
printf(Offset or partition name expected\n);
return 1;
}
if (nand-oobavail ENV_OFFSET_SIZE) {
- printf(Insufficient available OOB bytes: %d OOB bytes
-available but %d required for env.oob support\n,
- nand-oobavail,
- ENV_OFFSET_SIZE);
+ printf(Insufficient available OOB bytes:\n
+ %d OOB bytes available but %d required for
+ env.oob support\n,
+ nand-oobavail, ENV_OFFSET_SIZE);
return 1;
}
@@ -251,23 +251,23 @@ int do_nand_env_oob(cmd_tbl_t *cmdtp, nand_info_t *nand,
oob_buf[1] = addr / nand-erasesize;
ret = nand-write_oob(nand, ENV_OFFSET_SIZE, ops);
- if (!ret) {
- ret = get_nand_env_oob(nand, nand_env_oob_offset);
- if (ret) {
- printf(Error reading env offset in OOB\n);
- return ret;
- }
-
- if (addr != nand_env_oob_offset) {
- printf(Verification of env offset in OOB
- failed: 0x%08lx expected but got
- 0x%08lx\n, addr, nand_env_oob_offset);
- return 1;
- }
- } else {
+ if (ret) {
printf(Error writing OOB block 0\n);
return ret;
}
+
+ ret = get_nand_env_oob(nand, nand_env_oob_offset);
+ if (ret) {
+ printf(Error reading env offset in OOB\n);
+ return ret;
+ }
+
+ if (addr != nand_env_oob_offset) {
+ printf(Verification of env offset in OOB failed:
+ 0x%08lx expected but got 0x%08lx\n,
+ addr, nand_env_oob_offset);
+ return 1;
+ }
} else {
goto usage;
}
@@ -369,8 +369,10 @@ int do_nand(cmd_tbl_t * cmdtp, int flag, int argc, char *
const argv[])
#ifdef CONFIG_ENV_OFFSET_OOB
/* this command operates only on the first nand device */
- if (strcmp(cmd, env.oob) == 0)
- return do_nand_env_oob(cmdtp, nand_info[0], argc - 1, argv + 1);
+ if (strcmp(cmd, env.oob) == 0) {
+ return do_nand_env_oob(cmdtp, nand_info[0],
+ argc - 1, argv + 1);
+ }
#endif
/* the following commands operate on the current device */
diff --git a/common/env_nand.c b/common/env_nand.c
index 47d9848..a5e1038 100644
--- a/common/env_nand.c
+++ b/common/env_nand.c
@@ -299,23 +299,21 @@ int get_nand_env_oob(nand_info_t *nand, unsigned long
*result)
ops.oobbuf =
Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood
-Original Message- From: Ben Warren [mailto:biggerbadder...@gmail.com] Sent: Monday, July 12, 2010 7:54 PM To: Albert ARIBAUD Cc: Prafulla Wadaskar; u-boot@lists.denx.de Subject: Re: [U-Boot] [PATCH V3 2/5] mv_egiga: support SoCs other than kirkwood Hi Albert, On Mon, Jul 12, 2010 at 1:56 AM, Albert ARIBAUD albert.arib...@free.fr wrote: Le 12/07/2010 07:49, Prafulla Wadaskar a écrit : -Original Message- From: u-boot-boun...@lists.denx.de [mailto:u-boot-boun...@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 2/5] mv_egiga: support SoCs other than kirkwood Rename all references to kirkwood in mv_egiga symbols throughout the whole codebase. Signed-off-by: Albert Aribaudalbert.arib...@free.fr --- Pls break this patch as- arch/arm/cpu/arm926ejs/kirkwood/cpu.c |4 +- arch/arm/include/asm/arch-kirkwood/kirkwood.h |5 + Kirkwood SOC specific drivers/net/Makefile |2 +- drivers/net/mv_egiga.c| 322 +- drivers/net/mv_egiga.h| 466 include/netdev.h |2 +- Net: driver specific for net repo include/configs/guruplug.h|4 +- include/configs/km_arm.h |4 +- include/configs/mv88f6281gtw_ge.h |4 +- include/configs/openrd_base.h |4 +- include/configs/rd6281a.h |4 +- include/configs/sheevaplug.h |4 +- Board updates In the same order, so that it is easier to pick them separately by net and Marvell repos. Regards.. Prafulla . . If I split this patch, it will not build correctly any more. Usually, these should be split up. In this case, the dependencies are significant, so just leave it as-is. If Prafulla ACKs, I'll pull the whole group into the net repo. Ack Hi Ben, its good if you pull entire patch series. Regards.. Prafulla . . ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
