diff options
author | Rob Herring <rob.herring@calxeda.com> | 2011-11-18 16:21:01 -0600 |
---|---|---|
committer | John Rigby <john.rigby@linaro.org> | 2012-02-07 17:03:50 -0800 |
commit | 6d2e3030e12610890e40d4d54f7898e5b98e2d68 (patch) | |
tree | 8af0773af6f9668a5ba0c794f268d69c7197d23b | |
parent | 03b15d27d7269ff1a0f8df59b78186e4f95ab0d3 (diff) |
ARM: highbank: enable networking and pxe
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>
-rw-r--r-- | board/highbank/highbank.c | 12 | ||||
-rw-r--r-- | include/configs/highbank.h | 18 |
2 files changed, 28 insertions, 2 deletions
diff --git a/board/highbank/highbank.c b/board/highbank/highbank.c index 8db8a2bb2..0fa363d6c 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 9c8578835..560473303 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 * |