Re-factoring the legacy NAND code (legacy NAND now only in board-specific

[platform/kernel/u-boot.git] / include / configs / RBC823.h

diff --git a/include/configs/RBC823.h b/include/configs/RBC823.h
index 08eed27..21945a3 100644 (file)
--- a/include/configs/RBC823.h
+++ b/include/configs/RBC823.h
@@ -66,8 +66,8 @@
 #undef CONFIG_BOOTARGS
 #define CONFIG_BOOTCOMMAND                                                     \
        "bootp; "                                                               \
-       "setenv bootargs root=/dev/nfs rw nfsroot=$(serverip):$(rootpath) "     \
-       "ip=$(ipaddr):$(serverip):$(gatewayip):$(netmask):$(hostname)::off; "   \
+       "setenv bootargs root=/dev/nfs rw nfsroot=${serverip}:${rootpath} "     \
+       "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}::off; "   \
        "bootm"
 
 #define CONFIG_LOADS_ECHO      1       /* echo on for serial download  */
@@ -89,34 +89,37 @@
 #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_DISPLAY& \
+                               ~CFG_CMD_DTT    & \
+                               ~CFG_CMD_EXT2   & \
                                ~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_NET  &*/ \
-                               /*~CFG_CMD_ELF  &*/ \
-                               /* ~CFG_CMD_EEPROM      & */ \
-                               ~CFG_CMD_DATE   )
+                               ~CFG_CMD_MMC    & \
+                               ~CFG_CMD_NAND   & \
+                               ~CFG_CMD_PCI    & \
+                               ~CFG_CMD_PCMCIA & \
+                               ~CFG_CMD_REISER & \
+                               ~CFG_CMD_SCSI   & \
+                               ~CFG_CMD_SETGETDCR & \
+                               ~CFG_CMD_SNTP   & \
+                               ~CFG_CMD_SPI    & \
+                               ~CFG_CMD_UNIVERSE & \
+                               ~CFG_CMD_USB    & \
+                               ~CFG_CMD_VFD    & \
+                               ~CFG_CMD_XIMG   )
 
 /* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
 #include <cmd_confdefs.h>
@@ -323,6 +326,8 @@
 /************************************************************
  * Disk-On-Chip configuration
  ************************************************************/
+#define CFG_NAND_LEGACY
+
 #define CFG_MAX_DOC_DEVICE     1       /* Max number of DOC devices            */
 #define CFG_DOC_SHORT_TIMEOUT
 #define CFG_DOC_SUPPORT_2000
@@ -415,4 +420,22 @@
 #define        BOOTFLAG_COLD   0x01            /* Normal Power-On: Boot from FLASH     */
 #define BOOTFLAG_WARM  0x02            /* Software reboot                      */
 
+/*
+ * JFFS2 partitions
+ *
+ */
+/* No command line, one static partition, whole device */
+#undef CONFIG_JFFS2_CMDLINE
+#define CONFIG_JFFS2_DEV               "nor0"
+#define CONFIG_JFFS2_PART_SIZE         0xFFFFFFFF
+#define CONFIG_JFFS2_PART_OFFSET       0x00000000
+
+/* mtdparts command line support */
+/* Note: fake mtd_id used, no linux mtd map file */
+/*
+#define CONFIG_JFFS2_CMDLINE
+#define MTDIDS_DEFAULT         ""
+#define MTDPARTS_DEFAULT       ""
+*/
+
 #endif /* __CONFIG_H */