X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=include%2Fconfigs%2Fr5200.h;h=05929390010ff4b4261d6adb3d06f60d81f8651c;hb=2fd90ce575b02d189cbf443c85309bcd001aa393;hp=70497045906f3a3bad8949dacb96ce7f4bd44c9a;hpb=eaa1fa16c4a235ff59f3a2c19904ce41468101d1;p=u-boot

diff --git a/include/configs/r5200.h b/include/configs/r5200.h
index 7049704590..0592939001 100644
--- a/include/configs/r5200.h
+++ b/include/configs/r5200.h
@@ -66,20 +66,28 @@
 #define CFG_ENV_IS_IN_FLASH	1
 #endif
 
-#define CONFIG_COMMANDS	 ((CONFIG_CMD_DFL | CFG_CMD_PING | CFG_CMD_NET ) & ~(CFG_CMD_LOADS | CFG_CMD_LOADB))
 
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
-#include <cmd_confdefs.h>
+/*
+ * Command line configuration.
+ */
+#include <config_cmd_default.h>
+
+#define CONFIG_CMD_PING
+#define CONFIG_CMD_NET
+
+#undef CONFIG_CMD_LOADS
+#undef CONFIG_CMD_LOADB
+
 
 /* Note: We only copy one sectors worth of application code from location
- * 10200000 for speed purposes.  Increase the size if necessary */ 
+ * 10200000 for speed purposes.  Increase the size if necessary */
 #define CONFIG_BOOTCOMMAND	"cp.b 10200000 0 20000; go 400"
 #define	CONFIG_BOOTDELAY	1
 
 #define CFG_PROMPT		"u-boot> "
 #define CFG_LONGHELP				/* undef to save memory		*/
 
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
+#if defined(CONFIG_CMD_KGDB)
 #define CFG_CBSIZE		1024		/* Console I/O Buffer Size	*/
 #else
 #define CFG_CBSIZE		256		/* Console I/O Buffer Size	*/