summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorwdenk <wdenk>2004-10-17 21:12:06 +0000
committerwdenk <wdenk>2004-10-17 21:12:06 +0000
commite86e5a07485bc0f33103004594a28882c028e7af (patch)
treeb3f2496049f2e8f82676372d840bc10bf077de44 /include
parent8b74bf31fe57edfc502f94e905977304eac943ca (diff)
downloadu-boot-imx-e86e5a07485bc0f33103004594a28882c028e7af.zip
u-boot-imx-e86e5a07485bc0f33103004594a28882c028e7af.tar.gz
u-boot-imx-e86e5a07485bc0f33103004594a28882c028e7af.tar.bz2
Code cleanup for GCC-3.3.x compilers
Diffstat (limited to 'include')
-rw-r--r--include/cmd_confdefs.h126
-rw-r--r--include/configs/xaeniax.h2
2 files changed, 64 insertions, 64 deletions
diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h
index 877753e..bdfc4f9 100644
--- a/include/cmd_confdefs.h
+++ b/include/cmd_confdefs.h
@@ -30,68 +30,68 @@
/*
* Configurable monitor commands
*/
-#define CFG_CMD_BDI 0x00000001U /* bdinfo */
-#define CFG_CMD_LOADS 0x00000002U /* loads */
-#define CFG_CMD_LOADB 0x00000004U /* loadb */
-#define CFG_CMD_IMI 0x00000008U /* iminfo */
-#define CFG_CMD_CACHE 0x00000010U /* icache, dcache */
-#define CFG_CMD_FLASH 0x00000020U /* flinfo, erase, protect */
-#define CFG_CMD_MEMORY 0x00000040U /* md, mm, nm, mw, cp, cmp, */
+#define CFG_CMD_BDI 0x00000001ULL /* bdinfo */
+#define CFG_CMD_LOADS 0x00000002ULL /* loads */
+#define CFG_CMD_LOADB 0x00000004ULL /* loadb */
+#define CFG_CMD_IMI 0x00000008ULL /* iminfo */
+#define CFG_CMD_CACHE 0x00000010ULL /* icache, dcache */
+#define CFG_CMD_FLASH 0x00000020ULL /* flinfo, erase, protect */
+#define CFG_CMD_MEMORY 0x00000040ULL /* md, mm, nm, mw, cp, cmp, */
/* crc, base, loop, mtest */
-#define CFG_CMD_NET 0x00000080U /* bootp, tftpboot, rarpboot */
-#define CFG_CMD_ENV 0x00000100U /* saveenv */
-#define CFG_CMD_KGDB 0x00000200U /* kgdb */
-#define CFG_CMD_PCMCIA 0x00000400U /* PCMCIA support */
-#define CFG_CMD_IDE 0x00000800U /* IDE harddisk support */
-#define CFG_CMD_PCI 0x00001000U /* pciinfo */
-#define CFG_CMD_IRQ 0x00002000U /* irqinfo */
-#define CFG_CMD_BOOTD 0x00004000U /* bootd */
-#define CFG_CMD_CONSOLE 0x00008000U /* coninfo */
-#define CFG_CMD_EEPROM 0x00010000U /* EEPROM read/write support */
-#define CFG_CMD_ASKENV 0x00020000U /* ask for env variable */
-#define CFG_CMD_RUN 0x00040000U /* run command in env variable */
-#define CFG_CMD_ECHO 0x00080000U /* echo arguments */
-#define CFG_CMD_I2C 0x00100000U /* I2C serial bus support */
-#define CFG_CMD_REGINFO 0x00200000U /* Register dump */
-#define CFG_CMD_IMMAP 0x00400000U /* IMMR dump support */
-#define CFG_CMD_DATE 0x00800000U /* support for RTC, date/time...*/
-#define CFG_CMD_DHCP 0x01000000U /* DHCP Support */
-#define CFG_CMD_BEDBUG 0x02000000U /* Include BedBug Debugger */
-#define CFG_CMD_FDC 0x04000000U /* Floppy Disk Support */
-#define CFG_CMD_SCSI 0x08000000U /* SCSI Support */
-#define CFG_CMD_AUTOSCRIPT 0x10000000U /* Autoscript Support */
-#define CFG_CMD_MII 0x20000000U /* MII support */
-#define CFG_CMD_SETGETDCR 0x40000000U /* DCR support on 4xx */
-#define CFG_CMD_BSP 0x80000000U /* Board Specific functions */
-
-#define CFG_CMD_ELF 0x0000000100000000U /* ELF (VxWorks) load/boot cmd */
-#define CFG_CMD_MISC 0x0000000200000000U /* Misc functions like sleep etc*/
-#define CFG_CMD_USB 0x0000000400000000U /* USB Support */
-#define CFG_CMD_DOC 0x0000000800000000U /* Disk-On-Chip Support */
-#define CFG_CMD_JFFS2 0x0000001000000000U /* JFFS2 Support */
-#define CFG_CMD_DTT 0x0000002000000000U /* Digital Therm and Thermostat */
-#define CFG_CMD_SDRAM 0x0000004000000000U /* SDRAM DIMM SPD info printout */
-#define CFG_CMD_DIAG 0x0000008000000000U /* Diagnostics */
-#define CFG_CMD_FPGA 0x0000010000000000U /* FPGA configuration Support */
-#define CFG_CMD_HWFLOW 0x0000020000000000U /* RTS/CTS hw flow control */
-#define CFG_CMD_SAVES 0x0000040000000000U /* save S record dump */
-#define CFG_CMD_SPI 0x0000100000000000U /* SPI utility */
-#define CFG_CMD_FDOS 0x0000200000000000U /* Floppy DOS support */
-#define CFG_CMD_VFD 0x0000400000000000U /* VFD support (TRAB) */
-#define CFG_CMD_NAND 0x0000800000000000U /* NAND support */
-#define CFG_CMD_BMP 0x0001000000000000U /* BMP support */
-#define CFG_CMD_PORTIO 0x0002000000000000U /* Port I/O */
-#define CFG_CMD_PING 0x0004000000000000U /* ping support */
-#define CFG_CMD_MMC 0x0008000000000000U /* MMC support */
-#define CFG_CMD_FAT 0x0010000000000000U /* FAT support */
-#define CFG_CMD_IMLS 0x0020000000000000U /* List all found images */
-#define CFG_CMD_ITEST 0x0040000000000000U /* Integer (and string) test */
-#define CFG_CMD_NFS 0x0080000000000000U /* NFS support */
-#define CFG_CMD_REISER 0x0100000000000000U /* Reiserfs support */
-#define CFG_CMD_CDP 0x0200000000000000U /* Cisco Discovery Protocol */
-#define CFG_CMD_XIMG 0x0400000000000000U /* Load part of Multi Image */
-
-#define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */
+#define CFG_CMD_NET 0x00000080ULL /* bootp, tftpboot, rarpboot */
+#define CFG_CMD_ENV 0x00000100ULL /* saveenv */
+#define CFG_CMD_KGDB 0x00000200ULL /* kgdb */
+#define CFG_CMD_PCMCIA 0x00000400ULL /* PCMCIA support */
+#define CFG_CMD_IDE 0x00000800ULL /* IDE harddisk support */
+#define CFG_CMD_PCI 0x00001000ULL /* pciinfo */
+#define CFG_CMD_IRQ 0x00002000ULL /* irqinfo */
+#define CFG_CMD_BOOTD 0x00004000ULL /* bootd */
+#define CFG_CMD_CONSOLE 0x00008000ULL /* coninfo */
+#define CFG_CMD_EEPROM 0x00010000ULL /* EEPROM read/write support */
+#define CFG_CMD_ASKENV 0x00020000ULL /* ask for env variable */
+#define CFG_CMD_RUN 0x00040000ULL /* run command in env variable */
+#define CFG_CMD_ECHO 0x00080000ULL /* echo arguments */
+#define CFG_CMD_I2C 0x00100000ULL /* I2C serial bus support */
+#define CFG_CMD_REGINFO 0x00200000ULL /* Register dump */
+#define CFG_CMD_IMMAP 0x00400000ULL /* IMMR dump support */
+#define CFG_CMD_DATE 0x00800000ULL /* support for RTC, date/time...*/
+#define CFG_CMD_DHCP 0x01000000ULL /* DHCP Support */
+#define CFG_CMD_BEDBUG 0x02000000ULL /* Include BedBug Debugger */
+#define CFG_CMD_FDC 0x04000000ULL /* Floppy Disk Support */
+#define CFG_CMD_SCSI 0x08000000ULL /* SCSI Support */
+#define CFG_CMD_AUTOSCRIPT 0x10000000ULL /* Autoscript Support */
+#define CFG_CMD_MII 0x20000000ULL /* MII support */
+#define CFG_CMD_SETGETDCR 0x40000000ULL /* DCR support on 4xx */
+#define CFG_CMD_BSP 0x80000000ULL /* Board Specific functions */
+
+#define CFG_CMD_ELF 0x0000000100000000ULL /* ELF (VxWorks) load/boot cmd */
+#define CFG_CMD_MISC 0x0000000200000000ULL /* Misc functions like sleep etc*/
+#define CFG_CMD_USB 0x0000000400000000ULL /* USB Support */
+#define CFG_CMD_DOC 0x0000000800000000ULL /* Disk-On-Chip Support */
+#define CFG_CMD_JFFS2 0x0000001000000000ULL /* JFFS2 Support */
+#define CFG_CMD_DTT 0x0000002000000000ULL /* Digital Therm and Thermostat */
+#define CFG_CMD_SDRAM 0x0000004000000000ULL /* SDRAM DIMM SPD info printout */
+#define CFG_CMD_DIAG 0x0000008000000000ULL /* Diagnostics */
+#define CFG_CMD_FPGA 0x0000010000000000ULL /* FPGA configuration Support */
+#define CFG_CMD_HWFLOW 0x0000020000000000ULL /* RTS/CTS hw flow control */
+#define CFG_CMD_SAVES 0x0000040000000000ULL /* save S record dump */
+#define CFG_CMD_SPI 0x0000100000000000ULL /* SPI utility */
+#define CFG_CMD_FDOS 0x0000200000000000ULL /* Floppy DOS support */
+#define CFG_CMD_VFD 0x0000400000000000ULL /* VFD support (TRAB) */
+#define CFG_CMD_NAND 0x0000800000000000ULL /* NAND support */
+#define CFG_CMD_BMP 0x0001000000000000ULL /* BMP support */
+#define CFG_CMD_PORTIO 0x0002000000000000ULL /* Port I/O */
+#define CFG_CMD_PING 0x0004000000000000ULL /* ping support */
+#define CFG_CMD_MMC 0x0008000000000000ULL /* MMC support */
+#define CFG_CMD_FAT 0x0010000000000000ULL /* FAT support */
+#define CFG_CMD_IMLS 0x0020000000000000ULL /* List all found images */
+#define CFG_CMD_ITEST 0x0040000000000000ULL /* Integer (and string) test */
+#define CFG_CMD_NFS 0x0080000000000000ULL /* NFS support */
+#define CFG_CMD_REISER 0x0100000000000000ULL /* Reiserfs support */
+#define CFG_CMD_CDP 0x0200000000000000ULL /* Cisco Discovery Protocol */
+#define CFG_CMD_XIMG 0x0400000000000000ULL /* Load part of Multi Image */
+
+#define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFFULL /* ALL commands */
/* Commands that are considered "non-standard" for some reason
* (memory hogs, requires special hardware, not fully tested, etc.)
@@ -101,6 +101,7 @@
CFG_CMD_BMP | \
CFG_CMD_BSP | \
CFG_CMD_CACHE | \
+ CFG_CMD_CDP | \
CFG_CMD_DATE | \
CFG_CMD_DHCP | \
CFG_CMD_DIAG | \
@@ -133,8 +134,7 @@
CFG_CMD_SDRAM | \
CFG_CMD_SPI | \
CFG_CMD_USB | \
- CFG_CMD_VFD | \
- CFG_CMD_CDP )
+ CFG_CMD_VFD )
/* Default configuration
*/
diff --git a/include/configs/xaeniax.h b/include/configs/xaeniax.h
index 569788a..0ae26c2 100644
--- a/include/configs/xaeniax.h
+++ b/include/configs/xaeniax.h
@@ -69,7 +69,7 @@
#define CFG_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 } /* valid baudrates */
-#define CONFIG_COMMANDS (CONFIG_CMD_DFL | CFG_CMD_DIAG | CFG_CMD_SDRAM & ~CONFIG_CMD_DTT)
+#define CONFIG_COMMANDS ((CONFIG_CMD_DFL | CFG_CMD_DIAG | CFG_CMD_SDRAM) & ~CFG_CMD_DTT)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#include <cmd_confdefs.h>