summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/configs/LANTEC.h3
-rw-r--r--include/configs/MPC8260ADS.h1
-rw-r--r--include/configs/MPC8266ADS.h5
-rw-r--r--include/configs/PPChameleonEVB.h2
-rw-r--r--include/configs/RBC823.h39
-rw-r--r--include/configs/TOP5200.h2
-rw-r--r--include/configs/ZPC1900.h1
-rw-r--r--include/configs/ep8260.h1
-rw-r--r--include/configs/hymod.h1
-rw-r--r--include/configs/ppmc8260.h4
-rw-r--r--include/configs/sacsng.h4
-rw-r--r--include/configs/sbc8260.h4
-rw-r--r--include/reiserfs.h1
13 files changed, 34 insertions, 34 deletions
diff --git a/include/configs/LANTEC.h b/include/configs/LANTEC.h
index 4c01cda064..49ffb931e4 100644
--- a/include/configs/LANTEC.h
+++ b/include/configs/LANTEC.h
@@ -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 \
diff --git a/include/configs/MPC8260ADS.h b/include/configs/MPC8260ADS.h
index f4ccdafba5..efc7a613fc 100644
--- a/include/configs/MPC8260ADS.h
+++ b/include/configs/MPC8260ADS.h
@@ -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 | \
diff --git a/include/configs/MPC8266ADS.h b/include/configs/MPC8266ADS.h
index 5b2a8a33e2..86a5986cf8 100644
--- a/include/configs/MPC8266ADS.h
+++ b/include/configs/MPC8266ADS.h
@@ -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 \
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index cb76e3cf3b..c2c372a449 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -694,6 +694,4 @@
#endif /* CONFIG_NO_SERIAL_EEPROM */
-#define CFG_OPB_FREQ 50000000
-
#endif /* __CONFIG_H */
diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index af6e98b1f0..1666d646c0 100644
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -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_BSP & \
+ ~CFG_CMD_DATE & \
+ ~CFG_CMD_DTT & \
~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_HWFLOW & \
+ ~CFG_CMD_IDE & \
~CFG_CMD_IRQ & \
- ~CFG_CMD_NAND & \
~CFG_CMD_JFFS2 & \
- ~CFG_CMD_DTT & \
~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>
diff --git a/include/configs/TOP5200.h b/include/configs/TOP5200.h
index 930ed2722d..aa6dcf81d4 100644
--- a/include/configs/TOP5200.h
+++ b/include/configs/TOP5200.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 | \
diff --git a/include/configs/ZPC1900.h b/include/configs/ZPC1900.h
index 673d9e5b5a..03331d6c03 100644
--- a/include/configs/ZPC1900.h
+++ b/include/configs/ZPC1900.h
@@ -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 | \
diff --git a/include/configs/ep8260.h b/include/configs/ep8260.h
index 8af139b887..274bd7d17d 100644
--- a/include/configs/ep8260.h
+++ b/include/configs/ep8260.h
@@ -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 & \
diff --git a/include/configs/hymod.h b/include/configs/hymod.h
index e5680a5d87..75f52b5a52 100644
--- a/include/configs/hymod.h
+++ b/include/configs/hymod.h
@@ -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 ) )
diff --git a/include/configs/ppmc8260.h b/include/configs/ppmc8260.h
index 38aaf19d75..2ad2867351 100644
--- a/include/configs/ppmc8260.h
+++ b/include/configs/ppmc8260.h
@@ -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 \
diff --git a/include/configs/sacsng.h b/include/configs/sacsng.h
index 0e6be34fe5..cc9774c6a4 100644
--- a/include/configs/sacsng.h
+++ b/include/configs/sacsng.h
@@ -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 \
diff --git a/include/configs/sbc8260.h b/include/configs/sbc8260.h
index 2414093dd7..251d62a70b 100644
--- a/include/configs/sbc8260.h
+++ b/include/configs/sbc8260.h
@@ -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 \
diff --git a/include/reiserfs.h b/include/reiserfs.h
index 7124f77610..c465b3cdaf 100644
--- a/include/reiserfs.h
+++ b/include/reiserfs.h
@@ -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);
-
OpenPOWER on IntegriCloud