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

[oweals/u-boot.git] / include / config_defaults.h

diff --git a/include/config_defaults.h b/include/config_defaults.h
index abdf3beb0c139fdcf6b25dcaf6047e7022031b56..4ed09683b650a08468600dfc3dae3659dd22e100 100644 (file)
--- a/include/config_defaults.h
+++ b/include/config_defaults.h
@@ -12,10 +12,8 @@
 /* Support bootm-ing different OSes */
 #define CONFIG_BOOTM_LINUX 1
 #define CONFIG_BOOTM_NETBSD 1
-#define CONFIG_BOOTM_OSE 1
+#define CONFIG_BOOTM_PLAN9 1
 #define CONFIG_BOOTM_RTEMS 1
-
-#define CONFIG_GZIP 1
-#define CONFIG_ZLIB 1
+#define CONFIG_BOOTM_VXWORKS 1
 
 #endif