Code cleanup
This commit is contained in:
@@ -81,7 +81,7 @@
|
||||
CFG_CMD_MEMORY | \
|
||||
CFG_CMD_LOADS | \
|
||||
CFG_CMD_LOADB)
|
||||
#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD)
|
||||
#define CONFIG_CMD_NORMAL (CONFIG_CMD_DFL & ~CFG_CMD_BOOTD & ~CFG_CMD_REISER)
|
||||
#define CONFIG_CMD_GDB (CONFIG_CMD_NORMAL | CFG_CMD_KGDB)
|
||||
#define CONFIG_CMD_FULL (CFG_CMD_ALL & ~CFG_CMD_BEDBUG \
|
||||
& ~CFG_CMD_BMP \
|
||||
@@ -103,6 +103,7 @@
|
||||
& ~CFG_CMD_NAND \
|
||||
& ~CFG_CMD_PCI \
|
||||
& ~CFG_CMD_PCMCIA \
|
||||
& ~CFG_CMD_REISER \
|
||||
& ~CFG_CMD_SCSI \
|
||||
& ~CFG_CMD_SPI \
|
||||
& ~CFG_CMD_USB \
|
||||
|
||||
@@ -170,6 +170,7 @@
|
||||
CFG_CMD_NAND | \
|
||||
CFG_CMD_PCI | \
|
||||
CFG_CMD_PCMCIA | \
|
||||
CFG_CMD_REISER | \
|
||||
CFG_CMD_SCSI | \
|
||||
CFG_CMD_SPI | \
|
||||
CFG_CMD_USB | \
|
||||
|
||||
@@ -164,6 +164,7 @@
|
||||
CFG_CMD_MMC | \
|
||||
CFG_CMD_NAND | \
|
||||
CFG_CMD_PCMCIA | \
|
||||
CFG_CMD_REISER | \
|
||||
CFG_CMD_SCSI | \
|
||||
CFG_CMD_SPI | \
|
||||
CFG_CMD_VFD | \
|
||||
@@ -172,8 +173,8 @@
|
||||
/* Define a command string that is automatically executed when no character
|
||||
* is read on the console interface withing "Boot Delay" after reset.
|
||||
*/
|
||||
#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
|
||||
#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
|
||||
|
||||
#ifdef CONFIG_BOOT_ROOT_INITRD
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
|
||||
@@ -694,6 +694,4 @@
|
||||
|
||||
#endif /* CONFIG_NO_SERIAL_EEPROM */
|
||||
|
||||
#define CFG_OPB_FREQ 50000000
|
||||
|
||||
#endif /* __CONFIG_H */
|
||||
|
||||
+20
-23
@@ -89,35 +89,32 @@
|
||||
#define CONFIG_HARD_I2C
|
||||
#define CFG_I2C_SPEED 40000
|
||||
#define CFG_I2C_SLAVE 0xfe
|
||||
#define CFG_I2C_EEPROM_ADDR 0x50
|
||||
#define CFG_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CFG_EEPROM_WRITE_BITS 4
|
||||
#define CFG_EEPROM_WRITE_DELAY_MS 10
|
||||
#define CFG_I2C_EEPROM_ADDR 0x50
|
||||
#define CFG_I2C_EEPROM_ADDR_LEN 1
|
||||
#define CFG_EEPROM_WRITE_BITS 4
|
||||
#define CFG_EEPROM_WRITE_DELAY_MS 10
|
||||
|
||||
#define CONFIG_COMMANDS ( CFG_CMD_ALL & \
|
||||
~CFG_CMD_PCMCIA & \
|
||||
~CFG_CMD_IDE & \
|
||||
~CFG_CMD_PCI & \
|
||||
~CFG_CMD_FDC & \
|
||||
~CFG_CMD_HWFLOW & \
|
||||
~CFG_CMD_FDOS & \
|
||||
~CFG_CMD_SCSI & \
|
||||
~CFG_CMD_SETGETDCR & \
|
||||
~CFG_CMD_BSP & \
|
||||
~CFG_CMD_USB & \
|
||||
~CFG_CMD_VFD & \
|
||||
~CFG_CMD_SPI & \
|
||||
/* ~CFG_CMD_I2C & */ \
|
||||
~CFG_CMD_IRQ & \
|
||||
~CFG_CMD_NAND & \
|
||||
~CFG_CMD_JFFS2 & \
|
||||
~CFG_CMD_DATE & \
|
||||
~CFG_CMD_DTT & \
|
||||
~CFG_CMD_FDC & \
|
||||
~CFG_CMD_FDOS & \
|
||||
~CFG_CMD_HWFLOW & \
|
||||
~CFG_CMD_IDE & \
|
||||
~CFG_CMD_IRQ & \
|
||||
~CFG_CMD_JFFS2 & \
|
||||
~CFG_CMD_MII & \
|
||||
~CFG_CMD_MMC & \
|
||||
/*~CFG_CMD_NET &*/ \
|
||||
/*~CFG_CMD_ELF &*/ \
|
||||
/* ~CFG_CMD_EEPROM & */ \
|
||||
~CFG_CMD_DATE )
|
||||
~CFG_CMD_NAND & \
|
||||
~CFG_CMD_PCI & \
|
||||
~CFG_CMD_PCMCIA & \
|
||||
~CFG_CMD_REISER & \
|
||||
~CFG_CMD_SCSI & \
|
||||
~CFG_CMD_SETGETDCR & \
|
||||
~CFG_CMD_SPI & \
|
||||
~CFG_CMD_USB & \
|
||||
~CFG_CMD_VFD )
|
||||
|
||||
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
|
||||
#include <cmd_confdefs.h>
|
||||
|
||||
@@ -123,7 +123,7 @@
|
||||
#define CONFIG_COMMANDS ( CONFIG_CMD_DFL | \
|
||||
ADD_PCI_CMD | \
|
||||
ADD_USB_CMD | \
|
||||
ADD_IDE_CMD | \
|
||||
ADD_IDE_CMD | \
|
||||
CFG_CMD_ASKENV | \
|
||||
CFG_CMD_DATE | \
|
||||
CFG_CMD_DHCP | \
|
||||
|
||||
@@ -130,6 +130,7 @@
|
||||
CFG_CMD_NAND | \
|
||||
CFG_CMD_PCI | \
|
||||
CFG_CMD_PCMCIA | \
|
||||
CFG_CMD_REISER | \
|
||||
CFG_CMD_SCSI | \
|
||||
CFG_CMD_SPI | \
|
||||
CFG_CMD_USB | \
|
||||
|
||||
@@ -288,6 +288,7 @@
|
||||
~CFG_CMD_PCI & \
|
||||
~CFG_CMD_PCMCIA & \
|
||||
~CFG_CMD_SCSI & \
|
||||
~CFG_CMD_REISER & \
|
||||
~CFG_CMD_SPI & \
|
||||
~CFG_CMD_USB & \
|
||||
~CFG_CMD_VFD & \
|
||||
|
||||
@@ -188,6 +188,7 @@
|
||||
CFG_CMD_PCMCIA | \
|
||||
CFG_CMD_PCI | \
|
||||
CFG_CMD_USB | \
|
||||
CFG_CMD_REISER | \
|
||||
CFG_CMD_SCSI | \
|
||||
CFG_CMD_SPI | \
|
||||
CFG_CMD_VFD ) )
|
||||
|
||||
@@ -238,8 +238,8 @@
|
||||
/* Define a command string that is automatically executed when no character
|
||||
* is read on the console interface withing "Boot Delay" after reset.
|
||||
*/
|
||||
#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
|
||||
#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
|
||||
|
||||
#ifdef CONFIG_BOOT_ROOT_INITRD
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
|
||||
@@ -443,8 +443,8 @@
|
||||
/* Define a command string that is automatically executed when no character
|
||||
* is read on the console interface withing "Boot Delay" after reset.
|
||||
*/
|
||||
#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
|
||||
#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
|
||||
|
||||
#ifdef CONFIG_BOOT_ROOT_INITRD
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
|
||||
@@ -389,8 +389,8 @@
|
||||
/* Define a command string that is automatically executed when no character
|
||||
* is read on the console interface withing "Boot Delay" after reset.
|
||||
*/
|
||||
#define CONFIG_BOOT_ROOT_INITRD 0 /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS 1 /* Use a NFS mounted root file system */
|
||||
#undef CONFIG_BOOT_ROOT_INITRD /* Use ram disk for the root file system */
|
||||
#define CONFIG_BOOT_ROOT_NFS /* Use a NFS mounted root file system */
|
||||
|
||||
#ifdef CONFIG_BOOT_ROOT_INITRD
|
||||
#define CONFIG_BOOTCOMMAND \
|
||||
|
||||
@@ -80,4 +80,3 @@ extern int reiserfs_ls (char *dirname);
|
||||
extern int reiserfs_open (char *filename);
|
||||
extern int reiserfs_read (char *buf, unsigned len);
|
||||
extern int reiserfs_mount (unsigned part_length);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user