Merge branch 'master' of git://git.denx.de/u-boot-video

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

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index e16965c56c8960c41438e7fd1b2f25e35c857f9e..06f6ed1fc0c2aa3f9d996e153d791a6b72a76fa6 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -39,7 +39,6 @@
 # define CONFIG_SYS_BAUDRATE_TABLE     { CONFIG_BAUDRATE }
 # define CONSOLE_ARG   "console=console=ttyUL0,115200\0"
 #elif XILINX_UART16550_BASEADDR
-# define CONFIG_SYS_NS16550            1
 # define CONFIG_SYS_NS16550_SERIAL
 # if defined(__MICROBLAZEEL__)
 #  define CONFIG_SYS_NS16550_REG_SIZE  -4
@@ -106,7 +105,8 @@
 # define CONFIG_XILINX_TB_WATCHDOG
 #endif
 
-#ifndef CONFIG_OF_CONTROL
+#if !defined(CONFIG_OF_CONTROL) || \
+       (defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_OF_CONTROL))
 /* ddr sdram - main memory */
 # define CONFIG_SYS_SDRAM_BASE XILINX_RAM_START
 # define CONFIG_SYS_SDRAM_SIZE XILINX_RAM_SIZE
@@ -174,9 +174,7 @@
 #ifdef SPIFLASH
 # define CONFIG_SYS_NO_FLASH           1
 # define CONFIG_SYS_SPI_BASE           XILINX_SPI_FLASH_BASEADDR
-# define CONFIG_XILINX_SPI             1
 # define CONFIG_SPI                    1
-# define CONFIG_SPI_FLASH_STMICRO      1
 # define CONFIG_SF_DEFAULT_MODE                SPI_MODE_3
 # define CONFIG_SF_DEFAULT_SPEED       XILINX_SPI_FLASH_MAX_FREQ
 # define CONFIG_SF_DEFAULT_CS          XILINX_SPI_FLASH_CS
@@ -247,7 +245,6 @@
 #define CONFIG_CMD_ASKENV
 #define CONFIG_CMD_IRQ
 #define CONFIG_CMD_MFSL
-#define CONFIG_CMD_GPIO
 
 #if defined(CONFIG_DCACHE) || defined(CONFIG_ICACHE)
 # define CONFIG_CMD_CACHE
@@ -316,8 +313,6 @@
                                "1m(cramfs),-(jffs2)"
 #endif
 
-/* Miscellaneous configurable options */
-#define        CONFIG_SYS_PROMPT       "U-Boot-mONStR> "
 /* size of console buffer */
 #define        CONFIG_SYS_CBSIZE       512
  /* print buffer size */