microblaze: Do not use device tree cfg as default

The generic configuration for Microblaze was using device tree
to configure u-boot such that it required a device tree by
the user. This is an experimental feature still and not ready
for production such that it makes it harder for users.

This is not to be confused with the ability to load a device
tree and pass it to Linux as that ability still exists.

Signed-off-by: John Linn <john.linn@xilinx.com>
Signed-off-by: Michal Simek <monstr@monstr.eu>

diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h
index 2d28a9adeba488fce44ac2f4c000f051618acd09..2a5e6207eed33c930a4cf2b17aaee68b665e75c6 100644 (file)
--- a/include/configs/microblaze-generic.h
+++ b/include/configs/microblaze-generic.h
@@ -31,11 +31,6 @@
 #define        CONFIG_MICROBLAZE       1
 #define        MICROBLAZE_V5           1
 
-/* Open Firmware DTS */
-#define CONFIG_OF_CONTROL      1
-#define CONFIG_OF_EMBED                1
-#define CONFIG_DEFAULT_DEVICE_TREE microblaze
-
 /* linear and spi flash memory */
 #ifdef XILINX_FLASH_START
 #define        FLASH