configs: Re-sync with cmd/Kconfig

[people/ms/u-boot.git] / include / configs / microblaze-generic.h

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 27668f2a891ca81ab2b4a228dff2fbb9a542588d..801d674610003a4f40feaa1bcd197c7db353ab68 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -47,18 +47,6 @@
 #endif
 #define CONFIG_BOARD_LATE_INIT
 
-/* interrupt controller */
-#ifdef XILINX_INTC_BASEADDR
-# define CONFIG_SYS_INTC_0_ADDR                XILINX_INTC_BASEADDR
-# define CONFIG_SYS_INTC_0_NUM         XILINX_INTC_NUM_INTR_INPUTS
-#endif
-
-/* timer */
-#if defined(XILINX_TIMER_BASEADDR) && defined(XILINX_TIMER_IRQ)
-#  define CONFIG_SYS_TIMER_0_ADDR      XILINX_TIMER_BASEADDR
-#  define CONFIG_SYS_TIMER_0_IRQ       XILINX_TIMER_IRQ
-#endif
-
 /* watchdog */
 #if defined(XILINX_WATCHDOG_BASEADDR) && defined(XILINX_WATCHDOG_IRQ)
 # define CONFIG_WATCHDOG_BASEADDR      XILINX_WATCHDOG_BASEADDR
@@ -184,14 +172,11 @@
 /*
  * Command line configuration.
  */
-#define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MFSL
 
 #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE)
-# define CONFIG_CMD_CACHE
 #else
-# undef CONFIG_CMD_CACHE
 #endif
 
 #if defined(FLASH)
@@ -205,7 +190,6 @@
 
 #else
 #if defined(SPIFLASH)
-# define CONFIG_CMD_SF
 
 # if !defined(RAMENV)
 #  define CONFIG_CMD_SAVES
@@ -287,7 +271,6 @@
 
 #if defined(CONFIG_XILINX_AXIEMAC)
 # define CONFIG_MII            1
-# define CONFIG_CMD_MII                1
 # define CONFIG_PHY_GIGE       1
 # define CONFIG_SYS_FAULT_ECHO_LINK_DOWN       1
 # define CONFIG_PHY_ATHEROS    1
@@ -302,7 +285,6 @@
 # define CONFIG_PHY_VITESSE    1
 #else
 # undef CONFIG_MII
-# undef CONFIG_CMD_MII
 #endif
 
 /* SPL part */