diff mbox

[U-Boot,v3,2/2] ARM: highbank: enable networking and pxe

Message ID 1323983750-3399-2-git-send-email-robherring2@gmail.com
State Accepted
Commit 9a420986cccc9bd2c37affd931d627b3c3e72952
Headers show

Commit Message

Rob Herring Dec. 15, 2011, 9:15 p.m. UTC 
From: Rob Herring <rob.herring@calxeda.com>

This enables the XGMAC ethernet driver and networking related config
options.

Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
Signed-off-by: Rob Herring <rob.herring@calxeda.com>

---
v3:
- make board_eth_init return number of devices initialized

v2:
-drop CONFIG_NET_MULTI
-drop leftover 'verify' env setting

 board/highbank/highbank.c  |   12 ++++++++++++
 include/configs/highbank.h |   18 ++++++++++++++++--
 2 files changed, 28 insertions(+), 2 deletions(-)

Comments

Wolfgang Denk Jan. 5, 2012, 4:32 p.m. UTC | #1 
Dear Rob Herring,

In message <1323983750-3399-2-git-send-email-robherring2@gmail.com> you wrote:
> From: Rob Herring <rob.herring@calxeda.com>
> 
> This enables the XGMAC ethernet driver and networking related config
> options.
> 
> Signed-off-by: Jason Hobbs <jason.hobbs@calxeda.com>
> Signed-off-by: Rob Herring <rob.herring@calxeda.com>
> 
> ---
> v3:
> - make board_eth_init return number of devices initialized
> 
> v2:
> -drop CONFIG_NET_MULTI
> -drop leftover 'verify' env setting
> 
>  board/highbank/highbank.c  |   12 ++++++++++++
>  include/configs/highbank.h |   18 ++++++++++++++++--
>  2 files changed, 28 insertions(+), 2 deletions(-)

Applied, thanks.

Best regards,

Wolfgang Denk
diff mbox

Patch

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 8db8a2b..b0aa182 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -33,6 +33,18 @@  int board_init(void)
 	return 0;
 }
 
+/* We know all the init functions have been run now */
+int board_eth_init(bd_t *bis)
+{
+	int rc = 0;
+
+#ifdef CONFIG_CALXEDA_XGMAC
+	rc += calxedaxgmac_initialize(0, 0xfff50000);
+	rc += calxedaxgmac_initialize(1, 0xfff51000);
+#endif
+	return rc;
+}
+
 int misc_init_r(void)
 {
 	ahci_init(0xffe08000);
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 9c85788..5604733 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -51,19 +51,27 @@ 
 
 #define CONFIG_DOS_PARTITION
 
+#define CONFIG_CALXEDA_XGMAC
+
+/* PXE support */
+#define CONFIG_BOOTP_PXE
+#define CONFIG_BOOTP_PXE_CLIENTARCH	0x100
+#define CONFIG_BOOTP_VCI_STRING		"U-boot.armv7.highbank"
+
 /*
  * Command line configuration.
  */
 #include <config_cmd_default.h>
-#undef CONFIG_CMD_NET
-#undef CONFIG_CMD_NFS
 
 #define CONFIG_CMD_BDI
+#define CONFIG_CMD_DHCP
 #define CONFIG_CMD_ELF
 #define CONFIG_CMD_MEMORY
 #define CONFIG_CMD_LOADS
 #define CONFIG_CMD_SCSI
 #define CONFIG_CMD_EXT2
+#define CONFIG_CMD_PXE
+#define CONFIG_MENU
 
 #define CONFIG_BOOTDELAY		2
 /*
@@ -82,6 +90,12 @@ 
 
 #define CONFIG_SYS_LOAD_ADDR		0x800000
 
+#define CONFIG_EXTRA_ENV_SETTINGS	\
+		"fdtaddr_r=0x600000\0" \
+		"pxefile_addr_r=0x700000\0" \
+		"kernel_addr_r=0x800000\0" \
+		"ramdisk_addr_r=0x01000000\0" \
+
 /*-----------------------------------------------------------------------
  * Stack sizes
  *