|
|
@@ -61,11 +61,6 @@
|
|
|
#define BOOTFLAG_COLD 0x01 /* Normal Power-On: Boot from FLASH */
|
|
|
#define BOOTFLAG_WARM 0x02 /* Software reboot */
|
|
|
|
|
|
-#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
|
|
|
-#if (CONFIG_COMMANDS & CFG_CMD_KGDB)
|
|
|
-# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* Serial console configuration
|
|
|
*/
|
|
|
@@ -106,12 +101,6 @@
|
|
|
#define CFG_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */
|
|
|
#define CONFIG_NS8382X 1
|
|
|
|
|
|
-#ifdef CONFIG_PCI
|
|
|
-# define ADD_PCI_CMD CFG_CMD_PCI
|
|
|
-#else
|
|
|
-# define ADD_PCI_CMD 0
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* Video console
|
|
|
*/
|
|
|
@@ -126,12 +115,6 @@
|
|
|
# define CONFIG_SPLASH_SCREEN
|
|
|
# define CFG_CONSOLE_IS_IN_ENV
|
|
|
|
|
|
-#ifdef CONFIG_VIDEO
|
|
|
-# define ADD_BMP_CMD CFG_CMD_BMP
|
|
|
-#else
|
|
|
-# define ADD_BMP_CMD 0
|
|
|
-#endif
|
|
|
-
|
|
|
/*
|
|
|
* Partitions
|
|
|
*/
|
|
|
@@ -144,10 +127,7 @@
|
|
|
*/
|
|
|
#ifdef CONFIG_BC3450_USB
|
|
|
# define CONFIG_USB_OHCI
|
|
|
-# define ADD_USB_CMD CFG_CMD_USB
|
|
|
# define CONFIG_USB_STORAGE
|
|
|
-#else /* !CONFIG_BC3450_USB */
|
|
|
-# define ADD_USB_CMD 0
|
|
|
#endif /* CONFIG_BC3450_USB */
|
|
|
|
|
|
/*
|
|
|
@@ -165,59 +145,53 @@
|
|
|
# define CFG_CMD_POST_DIAG 0
|
|
|
#endif /* CONFIG_POST */
|
|
|
|
|
|
+
|
|
|
/*
|
|
|
- * IDE
|
|
|
+ * Command line configuration.
|
|
|
*/
|
|
|
+#include <config_cmd_default.h>
|
|
|
+
|
|
|
+#define CONFIG_CMD_ASKENV
|
|
|
+#define CONFIG_CMD_DATE
|
|
|
+#define CONFIG_CMD_DHCP
|
|
|
+#define CONFIG_CMD_ECHO
|
|
|
+#define CONFIG_CMD_EEPROM
|
|
|
+#define CONFIG_CMD_I2C
|
|
|
+#define CONFIG_CMD_JFFS2
|
|
|
+#define CONFIG_CMD_MII
|
|
|
+#define CONFIG_CMD_NFS
|
|
|
+#define CONFIG_CMD_PING
|
|
|
+#define CONFIG_CMD_POST_DIAG
|
|
|
+#define CONFIG_CMD_REGINFO
|
|
|
+#define CONFIG_CMD_SNTP
|
|
|
+#define CONFIG_CMD_BSP
|
|
|
+
|
|
|
+#ifdef CONFIG_VIDEO
|
|
|
+ #define CONFIG_CMD_BMP
|
|
|
+#endif
|
|
|
+
|
|
|
#ifdef CONFIG_BC3450_IDE
|
|
|
-# define ADD_IDE_CMD CFG_CMD_IDE
|
|
|
-#else
|
|
|
-# define ADD_IDE_CMD 0
|
|
|
-#endif /* CONFIG_BC3450_IDE */
|
|
|
+ #define CONFIG_CMD_IDE
|
|
|
+#endif
|
|
|
|
|
|
-/*
|
|
|
- * Filesystem support
|
|
|
- */
|
|
|
-#if defined (CONFIG_BC3450_IDE) || defined (CONFIG_BC3450_USB)
|
|
|
-#ifdef CONFIG_FAT
|
|
|
-# define ADD_FAT_CMD CFG_CMD_FAT
|
|
|
-#else
|
|
|
-# define ADD_FAT_CMD 0
|
|
|
-#endif /* CONFIG_FAT */
|
|
|
+#if defined(CONFIG_BC3450_IDE) || defined(CONFIG_BC3450_USB)
|
|
|
+ #ifdef CONFIG_FAT
|
|
|
+ #define CONFIG_CMD_FAT
|
|
|
+ #endif
|
|
|
|
|
|
-#ifdef CONFIG_EXT2
|
|
|
-# define ADD_EXT2_CMD CFG_CMD_EXT2
|
|
|
-#else
|
|
|
-# define ADD_EXT2_CMD 0
|
|
|
-#endif /* CONFIG_EXT2 */
|
|
|
-#endif /* CONFIG_BC3450_IDE / _USB */
|
|
|
+ #ifdef CONFIG_EXT2
|
|
|
+ #define CONFIG_CMD_EXT2
|
|
|
+ #endif
|
|
|
+#endif
|
|
|
+
|
|
|
+#ifdef CONFIG_BC3450_USB
|
|
|
+ #define CONFIG_CMD_USB
|
|
|
+#endif
|
|
|
+
|
|
|
+#ifdef CONFIG_PCI
|
|
|
+ #define CONFIG_CMD_PCI
|
|
|
+#endif
|
|
|
|
|
|
-/*
|
|
|
- * Supported commands
|
|
|
- */
|
|
|
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | \
|
|
|
- ADD_BMP_CMD | \
|
|
|
- ADD_IDE_CMD | \
|
|
|
- ADD_FAT_CMD | \
|
|
|
- ADD_EXT2_CMD | \
|
|
|
- ADD_PCI_CMD | \
|
|
|
- ADD_USB_CMD | \
|
|
|
- CFG_CMD_ASKENV | \
|
|
|
- CFG_CMD_DATE | \
|
|
|
- CFG_CMD_DHCP | \
|
|
|
- CFG_CMD_ECHO | \
|
|
|
- CFG_CMD_EEPROM | \
|
|
|
- CFG_CMD_I2C | \
|
|
|
- CFG_CMD_JFFS2 | \
|
|
|
- CFG_CMD_MII | \
|
|
|
- CFG_CMD_NFS | \
|
|
|
- CFG_CMD_PING | \
|
|
|
- CFG_CMD_POST_DIAG | \
|
|
|
- CFG_CMD_REGINFO | \
|
|
|
- CFG_CMD_SNTP | \
|
|
|
- CFG_CMD_BSP)
|
|
|
-
|
|
|
-/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
|
|
-#include <cmd_confdefs.h>
|
|
|
|
|
|
#define CONFIG_TIMESTAMP /* display image timestamps */
|
|
|
|
|
|
@@ -450,7 +424,7 @@
|
|
|
*/
|
|
|
#define CFG_LONGHELP /* undef to save memory */
|
|
|
#define CFG_PROMPT "=> " /* Monitor Command Prompt */
|
|
|
-#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 */
|
|
|
@@ -469,6 +443,11 @@
|
|
|
|
|
|
#define CFG_HZ 1000 /* dec freq: 1ms ticks */
|
|
|
|
|
|
+#define CFG_CACHELINE_SIZE 32 /* For MPC5xxx CPUs */
|
|
|
+#if defined(CONFIG_CMD_KGDB)
|
|
|
+# define CFG_CACHELINE_SHIFT 5 /* log base 2 of the above value */
|
|
|
+#endif
|
|
|
+
|
|
|
/*
|
|
|
* Enable loopw commando. This has only affect, if CFG_CMD_MEM is defined,
|
|
|
* which is normally part of the default commands (CFV_CMD_DFL)
|
Jon Loeliger