* Patch by Thomas Frieden, 13 Nov 2002:

  Add code for AmigaOne board
  (preliminary merge to U-Boot, still WIP)

* Patch by Jon Diekema, 12 Nov 2002:
  - Adding URL for IEEE OUI lookup
  - Making the autoboot #defines dependent on CONFIG_AUTOBOOT_KEYED
    being defined.
  - In the CONFIG_EXTRA_ENV_SETTINGS #define, the root-on-initrd and
    root-on-nfs macros are designed to switch how the default boot
    method gets defined.

1 files changed, 26 insertions, 25 deletions

diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index 25f386b95c..c462c3f425 100644
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -12,7 +12,7 @@
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
@@ -24,8 +24,8 @@
 /*
  *  Definitions for Configuring the monitor commands
  */
-#ifndef	_CMD_CONFIG_H
-#define	_CMD_CONFIG_H
+#ifndef _CMD_CONFIG_H
+#define _CMD_CONFIG_H
 
 /*
  * Configurable monitor commands
@@ -42,27 +42,27 @@
 #define CFG_CMD_ENV		0x00000100	/* saveenv			*/
 #define CFG_CMD_KGDB		0x00000200	/* kgdb				*/
 #define CFG_CMD_PCMCIA		0x00000400	/* PCMCIA support		*/
-#define	CFG_CMD_IDE		0x00000800	/* IDE harddisk support		*/
-#define	CFG_CMD_PCI		0x00001000	/* pciinfo			*/
-#define	CFG_CMD_IRQ		0x00002000	/* irqinfo			*/
+#define CFG_CMD_IDE		0x00000800	/* IDE harddisk support		*/
+#define CFG_CMD_PCI		0x00001000	/* pciinfo			*/
+#define CFG_CMD_IRQ		0x00002000	/* irqinfo			*/
 #define CFG_CMD_BOOTD		0x00004000	/* bootd			*/
 #define CFG_CMD_CONSOLE		0x00008000	/* coninfo			*/
 #define CFG_CMD_EEPROM		0x00010000	/* EEPROM read/write support	*/
-#define	CFG_CMD_ASKENV		0x00020000	/* ask for env variable		*/
-#define	CFG_CMD_RUN		0x00040000	/* run command in env variable	*/
-#define	CFG_CMD_ECHO		0x00080000	/* echo arguments		*/
-#define	CFG_CMD_I2C		0x00100000	/* I2C serial bus support	*/
-#define	CFG_CMD_REGINFO		0x00200000	/* Register dump		*/
-#define	CFG_CMD_IMMAP		0x00400000	/* IMMR dump support		*/
-#define	CFG_CMD_DATE		0x00800000	/* support for RTC, date/time...*/
+#define CFG_CMD_ASKENV		0x00020000	/* ask for env variable		*/
+#define CFG_CMD_RUN		0x00040000	/* run command in env variable	*/
+#define CFG_CMD_ECHO		0x00080000	/* echo arguments		*/
+#define CFG_CMD_I2C		0x00100000	/* I2C serial bus support	*/
+#define CFG_CMD_REGINFO		0x00200000	/* Register dump		*/
+#define CFG_CMD_IMMAP		0x00400000	/* IMMR dump support		*/
+#define CFG_CMD_DATE		0x00800000	/* support for RTC, date/time...*/
 #define CFG_CMD_DHCP		0x01000000	/* DHCP Support			*/
 #define CFG_CMD_BEDBUG		0x02000000	/* Include BedBug Debugger	*/
-#define	CFG_CMD_FDC		0x04000000	/* Floppy Disk Support		*/
-#define	CFG_CMD_SCSI		0x08000000	/* SCSI Support			*/
-#define	CFG_CMD_AUTOSCRIPT	0x10000000	/* Autoscript Support		*/
-#define	CFG_CMD_MII		0x20000000	/* MII support			*/
+#define CFG_CMD_FDC		0x04000000	/* Floppy Disk Support		*/
+#define CFG_CMD_SCSI		0x08000000	/* SCSI Support			*/
+#define CFG_CMD_AUTOSCRIPT	0x10000000	/* Autoscript Support		*/
+#define CFG_CMD_MII		0x20000000	/* MII support			*/
 #define CFG_CMD_SETGETDCR	0x40000000	/* DCR support on 4xx		*/
-#define	CFG_CMD_BSP		0x80000000	/* Board Specific functions	*/
+#define CFG_CMD_BSP		0x80000000	/* Board Specific functions	*/
 
 #define CFG_CMD_ELF	0x0000000100000000	/* ELF (VxWorks) load/boot cmd	*/
 #define CFG_CMD_MISC	0x0000000200000000	/* Misc functions like sleep etc*/
@@ -70,13 +70,14 @@
 #define CFG_CMD_DOC	0x0000000800000000	/* Disk-On-Chip Support		*/
 #define CFG_CMD_JFFS2	0x0000001000000000	/* JFFS2 Support		*/
 #define CFG_CMD_DTT	0x0000002000000000	/* Digital Therm and Thermostat */
-#define CFG_CMD_SDRAM	0x0000004000000000	/* SDRAM DIMM SPD info printout	*/
+#define CFG_CMD_SDRAM	0x0000004000000000	/* SDRAM DIMM SPD info printout */
 #define CFG_CMD_DIAG	0x0000008000000000	/* Diagnostics			*/
-#define CFG_CMD_FPGA	0x0000010000000000	/* FPGA configuration Support   */
+#define CFG_CMD_FPGA	0x0000010000000000	/* FPGA configuration Support	*/
 #define CFG_CMD_HWFLOW	0x0000020000000000	/* RTS/CTS hw flow control	*/
 #define CFG_CMD_SAVES	0x0000040000000000	/* save S record dump		*/
 #define CFG_CMD_SPI	0x0000100000000000	/* SPI utility			*/
-#define CFG_CMD_FDOS    0x0000200000000000      /* Floppy DOS support           */
+#define CFG_CMD_FDOS	0x0000200000000000	/* Floppy DOS support		*/
+#define CFG_CMD_VFD	0x0000400000000000	/* VFD support (TRAB)		*/
 
 #define CFG_CMD_ALL	0xFFFFFFFFFFFFFFFF	/* ALL commands			*/
 
@@ -96,7 +97,7 @@
 			CFG_CMD_EEPROM	| \
 			CFG_CMD_ELF	| \
 			CFG_CMD_FDC	| \
-                        CFG_CMD_FDOS    | \
+			CFG_CMD_FDOS	| \
 			CFG_CMD_HWFLOW	| \
 			CFG_CMD_I2C	| \
 			CFG_CMD_IDE	| \
@@ -107,7 +108,7 @@
 			CFG_CMD_MII	| \
 			CFG_CMD_PCI	| \
 			CFG_CMD_PCMCIA	| \
-			CFG_CMD_REGINFO	| \
+			CFG_CMD_REGINFO | \
 			CFG_CMD_SAVES	| \
 			CFG_CMD_SCSI	| \
 			CFG_CMD_SDRAM	| \
@@ -117,10 +118,10 @@
 
 /* Default configuration
  */
-#define	CONFIG_CMD_DFL	(CFG_CMD_ALL & ~CFG_CMD_NONSTD)
+#define CONFIG_CMD_DFL	(CFG_CMD_ALL & ~CFG_CMD_NONSTD)
 
 #ifndef CONFIG_COMMANDS
-#define CONFIG_COMMANDS	CONFIG_CMD_DFL
+#define CONFIG_COMMANDS CONFIG_CMD_DFL
 #endif