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

[Rob Herring]

From: Rob Herring <rob.herring at calxeda.com>

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

Signed-off-by: Jason Hobbs <jason.hobbs at calxeda.com>
Signed-off-by: Rob Herring <rob.herring at calxeda.com>
---
 board/highbank/highbank.c  |   14 ++++++++++++++
 include/configs/highbank.h |   19 +++++++++++++++++--
 2 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c
index 8db8a2b..1802c67 100644
--- a/board/highbank/highbank.c
+++ b/board/highbank/highbank.c
@@ -33,8 +33,22 @@ 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)
 {
+	setenv("verify", "n");
+
 	ahci_init(0xffe08000);
 	scsi_scan(1);
 	return 0;
diff --git a/include/configs/highbank.h b/include/configs/highbank.h
index 9c85788..01c128b 100644
--- a/include/configs/highbank.h
+++ b/include/configs/highbank.h
@@ -51,19 +51,28 @@
 
 #define CONFIG_DOS_PARTITION
 
+#define CONFIG_NET_MULTI
+#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 +91,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
  *
-- 
1.7.5.4