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

[platform/kernel/u-boot.git] / include / configs / slimbootloader.h

diff --git a/include/configs/slimbootloader.h b/include/configs/slimbootloader.h
index e0011ed..20b99a1 100644 (file)
--- a/include/configs/slimbootloader.h
+++ b/include/configs/slimbootloader.h
@@ -8,30 +8,17 @@
 
 #include <configs/x86-common.h>
 
-/*
- * By default, CONFIG_SYS_NS16550_PORT_MAPPED is enabled for port io serial.
- * To use mmio base serial, enable CONFIG_SYS_NS16550_MEM32 and disable
- * CONFIG_SYS_NS16550_PORT_MAPPED until ns16550 driver supports serial port
- * configuration in run-time.
- *
- * #define CONFIG_SYS_NS16550_MEM32
- * #undef CONFIG_SYS_NS16550_PORT_MAPPED
- */
-#ifdef CONFIG_SYS_NS16550_MEM32
-#undef CONFIG_SYS_NS16550_PORT_MAPPED
-#endif
-
-#define CONFIG_STD_DEVICES_SETTINGS            \
+#define CFG_STD_DEVICES_SETTINGS               \
        "stdin=serial,i8042-kbd,usbkbd\0"       \
        "stdout=serial\0"                       \
        "stderr=serial\0"
 
 /*
- * Override CONFIG_EXTRA_ENV_SETTINGS in x86-common.h
+ * Override CFG_EXTRA_ENV_SETTINGS in x86-common.h
  */
-#undef CONFIG_EXTRA_ENV_SETTINGS
-#define CONFIG_EXTRA_ENV_SETTINGS              \
-       CONFIG_STD_DEVICES_SETTINGS             \
+#undef CFG_EXTRA_ENV_SETTINGS
+#define CFG_EXTRA_ENV_SETTINGS         \
+       CFG_STD_DEVICES_SETTINGS                \
        "netdev=eth0\0"                         \
        "consoledev=ttyS0\0"                    \
        "ramdiskaddr=0x4000000\0"               \
@@ -48,15 +35,5 @@
 /*
  * Override CONFIG_BOOTCOMMAND in x86-common.h
  */
-#undef CONFIG_BOOTCOMMAND
-#define CONFIG_BOOTCOMMAND                                             \
-       "if test ${bootdev} = \"usb\"; then ${bootdev} start; fi; "     \
-       "if test ${bootdev} = \"scsi\"; then ${bootdev} scan; fi; "     \
-       "${bootdev} info; "                                             \
-       "${bootfsload} ${bootdev} ${bootdevnum}:${bootdevpart} "        \
-       "${loadaddr} ${bootfile}; "                                     \
-       "${bootfsload} ${bootdev} ${bootdevnum}:${bootdevpart} "        \
-       "${ramdiskaddr} ${ramdiskfile}; "                               \
-       "zboot ${loadaddr} 0 ${ramdiskaddr} ${filesize}"
 
 #endif /* __SLIMBOOTLOADER_CONFIG_H__ */