summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichal Simek <michal.simek@xilinx.com>2015-12-11 10:27:57 +0100
committerMichal Simek <michal.simek@xilinx.com>2016-01-27 15:55:53 +0100
commit502547e8ba053e3ac1b21ea9cb7d9c429d5eb86c (patch)
tree423d26e8125c2e2cf1727066f3edc1a4b3a7b5d4
parent83b76d9ef718a31f6bff31d4abbcf886d80a45ce (diff)
microblaze: Move eth configuration to Kconfig
Cleanup board specific file. Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r--configs/microblaze-generic_defconfig3
-rw-r--r--include/configs/microblaze-generic.h14
2 files changed, 3 insertions, 14 deletions
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig
index 047ed1765e..ebd88abdcc 100644
--- a/configs/microblaze-generic_defconfig
+++ b/configs/microblaze-generic_defconfig
@@ -8,6 +8,9 @@ CONFIG_SPL=y
CONFIG_SYS_PROMPT="U-Boot-mONStR> "
CONFIG_CMD_GPIO=y
# CONFIG_CMD_SETEXPR is not set
+CONFIG_CMD_TFTPPUT=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
CONFIG_SPL_OF_CONTROL=y
CONFIG_OF_EMBED=y
CONFIG_DM_ETH=y
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 45a981bf48..327f95bb8b 100644
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -40,14 +40,6 @@
/* setting reset address */
/*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/
-/* ethernet */
-#undef CONFIG_SYS_ENET
-#if defined(CONFIG_XILINX_EMACLITE) || defined(CONFIG_XILINX_AXIEMAC)
-# define CONFIG_SYS_ENET
-#endif
-
-#undef ET_DEBUG
-
/* gpio */
#ifdef XILINX_GPIO_BASEADDR
# define CONFIG_XILINX_GPIO
@@ -218,12 +210,6 @@
# undef CONFIG_CMD_CACHE
#endif
-#ifdef CONFIG_SYS_ENET
-# define CONFIG_CMD_PING
-# define CONFIG_CMD_DHCP
-# define CONFIG_CMD_TFTPPUT
-#endif
-
#if defined(CONFIG_SYSTEMACE)
# define CONFIG_CMD_EXT2
# define CONFIG_CMD_FAT