Skip to contentSkip to conversation

Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.

PATCH New Aldo Brett Cedillo Martinez 3 participants 4 messages Aug 16, 2010 – Sep 6, 2012

lore
Share & tools
lore

Aldo Brett Cedillo Martinez

author
#0 lore raw

PATCH 1/1 Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.

Configures GPMC, adds macros to enable net commands, and adds proper initialization to board_eth_init function.

I have a similar patch to enable ethernet in zoom3 after initial support patch.

Signed-off-by Aldo Brett Cedillo Martinez <[email protected]>
---
 board/logicpd/zoom2/zoom2.c   |   21 +++++++++++++++++++++
 include/configs/omap3_zoom2.h |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
board/logicpd/zoom2/zoom2.c +21 -0
index e9f6625..54d3e9f 100644
@@ -60,6 +60,16 @@ static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {
 	0x1D0904C4, 0
 };
 
+/* Ethernet GPMC configuration */
+static u32 gpmc_eth[GPMC_MAX_REG] = {
+	NET_GPMC_CONFIG1,
+	NET_GPMC_CONFIG2,
+	NET_GPMC_CONFIG3,
+	NET_GPMC_CONFIG4,
+	NET_GPMC_CONFIG5,
+	NET_GPMC_CONFIG6, 0
+};
+
 /* Used to track the revision of the board */
 static zoom2_revision revision = ZOOM2_REVISION_UNKNOWN;
 

@@ -130,6 +140,12 @@ int board_init (void)
 	enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[3],
 			SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M);
 
+#ifdef CONFIG_CMD_NET
+	gpmc_config = gpmc_eth;
+	enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[7],
+			CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
+#endif	/* (CONFIG_CMD_NET) */
+
 	/* board id for Linux */
 	gd->bd->bi_arch_number = MACH_TYPE_OMAP_ZOOM2;
 	/* boot param addr */

@@ -186,6 +202,11 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_LAN91C96
 	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 #endif
+
+#ifdef CONFIG_SMC911X
+	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+
 	return rc;
 }
 #endif
include/configs/omap3_zoom2.h +9 -1
index eef95fe..c66d571 100644
@@ -154,7 +154,7 @@
 #undef CONFIG_CMD_FPGA			/* FPGA configuration Support	*/
 #undef CONFIG_CMD_IMI			/* iminfo			*/
 #undef CONFIG_CMD_IMLS			/* List all found images	*/
-#undef CONFIG_CMD_NET			/* bootp, tftpboot, rarpboot	*/
+#define CONFIG_CMD_NET			/* bootp, tftpboot, rarpboot	*/
 #undef CONFIG_CMD_NFS			/* NFS support			*/
 
 #define CONFIG_SYS_NO_FLASH

@@ -165,6 +165,14 @@
 #define CONFIG_SYS_I2C_BUS_SELECT	1
 #define CONFIG_DRIVER_OMAP34XX_I2C	1
 
+/* Ethernet */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_32_BIT
+#define CONFIG_SMC911X_BASE		0x2C000000
+#endif /* (CONFIG_CMD_NET) */
+
 /*
  * TWL4030
  */
Signature · 1 line
1.6.3.3
#1 lore raw

PATCH 1/1 Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.

Dear Aldo Brett Cedillo Martinez,

Quoted 2 lines

Configures GPMC, adds macros to enable net commands, and adds proper initialization to board_eth_init function.

Tom, are you OK with applying this patch ?

Quoted 60 lines

I have a similar patch to enable ethernet in zoom3 after initial support patch.

Signed-off-by Aldo Brett Cedillo Martinez <[email protected]>
---
 board/logicpd/zoom2/zoom2.c   |   21 +++++++++++++++++++++
 include/configs/omap3_zoom2.h |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
board/logicpd/zoom2/zoom2.c +21 -0
index e9f6625..54d3e9f 100644
@@ -60,6 +60,16 @@ static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {
 	0x1D0904C4, 0
 };
 
+/* Ethernet GPMC configuration */
+static u32 gpmc_eth[GPMC_MAX_REG] = {
+	NET_GPMC_CONFIG1,
+	NET_GPMC_CONFIG2,
+	NET_GPMC_CONFIG3,
+	NET_GPMC_CONFIG4,
+	NET_GPMC_CONFIG5,
+	NET_GPMC_CONFIG6, 0
+};
+
 /* Used to track the revision of the board */
 static zoom2_revision revision = ZOOM2_REVISION_UNKNOWN;
 

@@ -130,6 +140,12 @@ int board_init (void)
 	enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[3],
 			SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M);
 
+#ifdef CONFIG_CMD_NET
+	gpmc_config = gpmc_eth;
+	enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[7],
+			CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
+#endif	/* (CONFIG_CMD_NET) */
+
 	/* board id for Linux */
 	gd->bd->bi_arch_number = MACH_TYPE_OMAP_ZOOM2;
 	/* boot param addr */

@@ -186,6 +202,11 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_LAN91C96
 	rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 #endif
+
+#ifdef CONFIG_SMC911X
+	rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+
 	return rc;
 }
 #endif
include/configs/omap3_zoom2.h +0 -0
index eef95fe..c66d571 100644

include/configs/omap3_zoom2.h line 154

Quoted 1 line
include/configs/omap3_zoom2.h +0 -0
@@ -154,7 +154,7 @@
 #undef CONFIG_CMD_FPGA			/* FPGA configuration Support

*/

include/configs/omap3_zoom2.h line 155

Quoted 1 line
include/configs/omap3_zoom2.h +0 -0
 #undef CONFIG_CMD_IMI			/* iminfo

*/

include/configs/omap3_zoom2.h line 156

Quoted 1 line
include/configs/omap3_zoom2.h +0 -0
 #undef CONFIG_CMD_IMLS			/* List all found images

*/

include/configs/omap3_zoom2.h line 157

Quoted 1 line
include/configs/omap3_zoom2.h +0 -1
-#undef CONFIG_CMD_NET			/* bootp, tftpboot, rarpboot

*/

include/configs/omap3_zoom2.h line 157

Quoted 1 line
include/configs/omap3_zoom2.h +1 -0
+#define CONFIG_CMD_NET			/* bootp, tftpboot, rarpboot

*/

include/configs/omap3_zoom2.h line 158

Quoted 1 line
include/configs/omap3_zoom2.h +0 -0
 #undef CONFIG_CMD_NFS			/* NFS support

*/

Quoted 7 lines
include/configs/omap3_zoom2.h +1 -0
 #define CONFIG_SYS_NO_FLASH

@@ -165,6 +165,14 @@
 #define CONFIG_SYS_I2C_BUS_SELECT	1
 #define CONFIG_DRIVER_OMAP34XX_I2C	1
 
+/* Ethernet */

include/configs/omap3_zoom2.h line 178

Quoted 10 lines
include/configs/omap3_zoom2.h +7 -0
+#ifdef CONFIG_CMD_NET
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_32_BIT
+#define CONFIG_SMC911X_BASE		0x2C000000
+#endif /* (CONFIG_CMD_NET) */
+
 /*
  * TWL4030
  */

Best regards,
Marek Vasut

#2 lore raw

PATCH 1/1 Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.

Quoted 6 lines · Marek Vasut

Dear Aldo Brett Cedillo Martinez,

Quoted 2 lines

Configures GPMC, adds macros to enable net commands, and adds proper initialization to board_eth_init function.

Tom, are you OK with applying this patch ?

To be clear, lets ask Tom Rix, currently listed maintainer (this is
http://patchwork.ozlabs.org/patch/71816/)

Quoted 96 lines
Quoted 60 lines

I have a similar patch to enable ethernet in zoom3 after initial support patch.

Signed-off-by Aldo Brett Cedillo Martinez <[email protected]>

---
?board/logicpd/zoom2/zoom2.c ? | ? 21 +++++++++++++++++++++ ?include/configs/omap3_zoom2.h | ? 10 +++++++++- ?2 files changed, 30 insertions(+), 1 deletions(-)

board/logicpd/zoom2/zoom2.c +0 -0
index e9f6625..54d3e9f 100644
@@ -60,6 +60,16 @@ static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {

? ? ? 0x1D0904C4, 0
?};

board/logicpd/zoom2/zoom2.c +10 -0
+/* Ethernet GPMC configuration */
+static u32 gpmc_eth[GPMC_MAX_REG] = {
+ ? ? NET_GPMC_CONFIG1,
+ ? ? NET_GPMC_CONFIG2,
+ ? ? NET_GPMC_CONFIG3,
+ ? ? NET_GPMC_CONFIG4,
+ ? ? NET_GPMC_CONFIG5,
+ ? ? NET_GPMC_CONFIG6, 0
+};
+

?/* Used to track the revision of the board */ ?static zoom2_revision revision = ZOOM2_REVISION_UNKNOWN;

board/logicpd/zoom2/zoom2.c +6 -0
@@ -130,6 +140,12 @@ int board_init (void)
 ? ? ? enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[3],
 ? ? ? ? ? ? ? ? ? ? ? SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M);
 
+#ifdef CONFIG_CMD_NET
+ ? ? gpmc_config = gpmc_eth;
+ ? ? enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[7],
+ ? ? ? ? ? ? ? ? ? ? CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
+#endif ? ? ? /* (CONFIG_CMD_NET) */
+

? ? ? /* board id for Linux */
? ? ? gd->bd->bi_arch_number = MACH_TYPE_OMAP_ZOOM2; ? ? ? /* boot param addr */

board/logicpd/zoom2/zoom2.c +0 -0
@@ -186,6 +202,11 @@ int board_eth_init(bd_t *bis)

?#ifdef CONFIG_LAN91C96
? ? ? rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE); ?#endif

board/logicpd/zoom2/zoom2.c +5 -0
+
+#ifdef CONFIG_SMC911X
+ ? ? rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+

? ? ? return rc;
?}
?#endif

include/configs/omap3_zoom2.h +0 -0
index eef95fe..c66d571 100644
@@ -154,7 +154,7 @@
Quoted 1 line

?#undef CONFIG_CMD_FPGA ? ? ? ? ? ? ? ? ? ? ? /* FPGA configuration Support

*/

Quoted 1 line

?#undef CONFIG_CMD_IMI ? ? ? ? ? ? ? ? ? ? ? ?/* iminfo

*/

Quoted 1 line

?#undef CONFIG_CMD_IMLS ? ? ? ? ? ? ? ? ? ? ? /* List all found images

*/

Quoted 1 line

-#undef CONFIG_CMD_NET ? ? ? ? ? ? ? ? ? ? ? ?/* bootp, tftpboot, rarpboot

*/

Quoted 1 line

+#define CONFIG_CMD_NET ? ? ? ? ? ? ? ? ? ? ? /* bootp, tftpboot, rarpboot

*/

Quoted 1 line

?#undef CONFIG_CMD_NFS ? ? ? ? ? ? ? ? ? ? ? ?/* NFS support

*/

Quoted 14 lines

?#define CONFIG_SYS_NO_FLASH

include/configs/omap3_zoom2.h +0 -0
@@ -165,6 +165,14 @@

?#define CONFIG_SYS_I2C_BUS_SELECT ? ?1
?#define CONFIG_DRIVER_OMAP34XX_I2C ? 1

include/configs/omap3_zoom2.h +8 -0
+/* Ethernet */
+#ifdef CONFIG_CMD_NET
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_32_BIT
+#define CONFIG_SMC911X_BASE ? ? ? ? ?0x2C000000
+#endif /* (CONFIG_CMD_NET) */
+
Quoted 3 lines

?/*
? * TWL4030
? */

Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Signature · 1 line
Tom
#3 lore raw

PATCH 1/1 Zoom2: Ethernet: Enabling LAN9221 chip and CMD_NET.

Dear Tom Rini,

Quoted 10 lines · Marek Vasut
Quoted 6 lines

Dear Aldo Brett Cedillo Martinez,

Quoted 2 lines

Configures GPMC, adds macros to enable net commands, and adds proper initialization to board_eth_init function.

Tom, are you OK with applying this patch ?

To be clear, lets ask Tom Rix, currently listed maintainer (this is
http://patchwork.ozlabs.org/patch/71816/)

I'll pick it and push via staging if it's ok with you. I want to have this out of my mane ;-)

Quoted 110 lines
Quoted 110 lines
Quoted 61 lines

I have a similar patch to enable ethernet in zoom3 after initial support patch.

Signed-off-by Aldo Brett Cedillo Martinez <[email protected]>
---
 board/logicpd/zoom2/zoom2.c   |   21 +++++++++++++++++++++
 include/configs/omap3_zoom2.h |   10 +++++++++-
 2 files changed, 30 insertions(+), 1 deletions(-)
board/logicpd/zoom2/zoom2.c +21 -0
index e9f6625..54d3e9f 100644
@@ -60,6 +60,16 @@ static u32 gpmc_serial_TL16CP754C[GPMC_MAX_REG] = {
      0x1D0904C4, 0
 };
 
+/* Ethernet GPMC configuration */
+static u32 gpmc_eth[GPMC_MAX_REG] = {
+     NET_GPMC_CONFIG1,
+     NET_GPMC_CONFIG2,
+     NET_GPMC_CONFIG3,
+     NET_GPMC_CONFIG4,
+     NET_GPMC_CONFIG5,
+     NET_GPMC_CONFIG6, 0
+};
+
 /* Used to track the revision of the board */
 static zoom2_revision revision = ZOOM2_REVISION_UNKNOWN;
 

@@ -130,6 +140,12 @@ int board_init (void)
      enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[3],
                      SERIAL_TL16CP754C_BASE, GPMC_SIZE_16M);
 
+#ifdef CONFIG_CMD_NET
+     gpmc_config = gpmc_eth;
+     enable_gpmc_cs_config(gpmc_config, &gpmc_cfg->cs[7],
+                     CONFIG_SMC911X_BASE, GPMC_SIZE_16M);
+#endif       /* (CONFIG_CMD_NET) */
+
      /* board id for Linux */
      gd->bd->bi_arch_number = MACH_TYPE_OMAP_ZOOM2;
      /* boot param addr */

@@ -186,6 +202,11 @@ int board_eth_init(bd_t *bis)
 #ifdef CONFIG_LAN91C96
      rc = lan91c96_initialize(0, CONFIG_LAN91C96_BASE);
 #endif
+
+#ifdef CONFIG_SMC911X
+     rc = smc911x_initialize(0, CONFIG_SMC911X_BASE);
+#endif
+
      return rc;
 }
 #endif
(quoted diff) +0 -0

b/include/configs/omap3_zoom2.h index eef95fe..c66d571 100644

include/configs/omap3_zoom2.h +0 -0
@@ -154,7 +154,7 @@
 #undef CONFIG_CMD_FPGA                       /* FPGA configuration
Quoted 1 line

Support

*/

Quoted 1 line

#undef CONFIG_CMD_IMI /* iminfo

*/

Quoted 1 line

#undef CONFIG_CMD_IMLS /* List all found images

*/

Quoted 2 lines

-#undef CONFIG_CMD_NET /* bootp, tftpboot,
rarpboot

*/

Quoted 2 lines

+#define CONFIG_CMD_NET /* bootp, tftpboot,
rarpboot

*/

Quoted 1 line

#undef CONFIG_CMD_NFS /* NFS support

*/

Quoted 6 lines

#define CONFIG_SYS_NO_FLASH

include/configs/omap3_zoom2.h +1 -0
@@ -165,6 +165,14 @@
 #define CONFIG_SYS_I2C_BUS_SELECT    1
 #define CONFIG_DRIVER_OMAP34XX_I2C   1
 
+/* Ethernet */

include/configs/omap3_zoom2.h line 178

Quoted 10 lines
include/configs/omap3_zoom2.h +7 -0
+#ifdef CONFIG_CMD_NET
+#define CONFIG_NET_MULTI
+#define CONFIG_SMC911X
+#define CONFIG_SMC911X_32_BIT
+#define CONFIG_SMC911X_BASE          0x2C000000
+#endif /* (CONFIG_CMD_NET) */
+
 /*
  * TWL4030
  */

Best regards,
Marek Vasut
_______________________________________________
U-Boot mailing list
U-Boot at lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot