From 592c5cabe78fe1cef4eb733904c81a9555d59a7e Mon Sep 17 00:00:00 2001 From: wdenk Date: Sat, 21 Jun 2003 00:17:24 +0000 Subject: Patch by Murray Jensen, 20 Jun 2003: - hymod update - cleanup (especially for gcc-3.x compilers) --- include/cmd_confdefs.h | 110 +++++++++++++++++++++++------------------------ include/configs/hymod.h | 4 +- include/linux/mtd/nftl.h | 2 +- 3 files changed, 58 insertions(+), 58 deletions(-) (limited to 'include') diff --git a/include/cmd_confdefs.h b/include/cmd_confdefs.h index 2d9b5a554d..74614eb4c7 100644 --- a/include/cmd_confdefs.h +++ b/include/cmd_confdefs.h @@ -30,62 +30,62 @@ /* * Configurable monitor commands */ -#define CFG_CMD_BDI 0x00000001 /* bdinfo */ -#define CFG_CMD_LOADS 0x00000002 /* loads */ -#define CFG_CMD_LOADB 0x00000004 /* loadb */ -#define CFG_CMD_IMI 0x00000008 /* iminfo */ -#define CFG_CMD_CACHE 0x00000010 /* icache, dcache */ -#define CFG_CMD_FLASH 0x00000020 /* flinfo, erase, protect */ -#define CFG_CMD_MEMORY 0x00000040 /* md, mm, nm, mw, cp, cmp, */ +#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, */ /* crc, base, loop, mtest */ -#define CFG_CMD_NET 0x00000080 /* bootp, tftpboot, rarpboot */ -#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_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_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_SETGETDCR 0x40000000 /* DCR support on 4xx */ -#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*/ -#define CFG_CMD_USB 0x0000000400000000 /* USB Support */ -#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_DIAG 0x0000008000000000 /* Diagnostics */ -#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_VFD 0x0000400000000000 /* VFD support (TRAB) */ -#define CFG_CMD_NAND 0x0000800000000000 /* NAND support */ -#define CFG_CMD_BMP 0x0001000000000000 /* BMP support */ -#define CFG_CMD_PORTIO 0x0002000000000000 /* Port I/O */ -#define CFG_CMD_PING 0x0004000000000000 /* ping support */ -#define CFG_CMD_MMC 0x0008000000000000 /* MMC support */ -#define CFG_CMD_FAT 0x0010000000000000 /* FAT support */ - -#define CFG_CMD_ALL 0xFFFFFFFFFFFFFFFF /* ALL commands */ +#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_ALL 0xFFFFFFFFFFFFFFFFU /* ALL commands */ /* Commands that are considered "non-standard" for some reason * (memory hogs, requires special hardware, not fully tested, etc.) diff --git a/include/configs/hymod.h b/include/configs/hymod.h index dc7de4461d..62b025cdf7 100644 --- a/include/configs/hymod.h +++ b/include/configs/hymod.h @@ -219,7 +219,7 @@ #define CONFIG_KGDB_EXTC_RATE 3686400 /* serial ext clk rate in Hz */ #define CONFIG_KGDB_EXTC_PINSEL 0 /* pin select 0=CLK3/CLK9,1=CLK5/CLK15*/ # if defined(CONFIG_KGDB_USE_EXTC) -#define CONFIG_KGDB_BAUDRATE 230400 /* speed to run kgdb serial port at */ +#define CONFIG_KGDB_BAUDRATE 115200 /* speed to run kgdb serial port at */ # else #define CONFIG_KGDB_BAUDRATE 9600 /* speed to run kgdb serial port at */ # endif @@ -384,7 +384,7 @@ #define CFG_FLASH_WRITE_TOUT 500 /* Flash Write Timeout (in ms) */ #define CFG_ENV_IS_IN_FLASH 1 -#define CFG_ENV_SIZE 0x1000 /* Total Size of Environment Sector */ +#define CFG_ENV_SIZE 0x40000 /* Total Size of Environment Sector */ #define CFG_ENV_SECT_SIZE 0x40000 /* see README - env sect real size */ #define CFG_ENV_ADDR (CFG_FLASH_BASE+CFG_MONITOR_LEN-CFG_ENV_SECT_SIZE) diff --git a/include/linux/mtd/nftl.h b/include/linux/mtd/nftl.h index 5023a9fb1f..37517582d5 100644 --- a/include/linux/mtd/nftl.h +++ b/include/linux/mtd/nftl.h @@ -90,7 +90,7 @@ struct NFTLrecord { __u16 lastEUN; /* should be suppressed */ __u16 numfreeEUNs; __u16 LastFreeEUN; /* To speed up finding a free EUN */ - __u32 long nr_sects; + __u32 nr_sects; int head,sect,cyl; __u16 *EUNtable; /* [numvunits]: First EUN for each virtual unit */ __u16 *ReplUnitTable; /* [numEUNs]: ReplUnitNumber for each */ -- cgit v1.2.3