rename CFG_ENV_IS_IN_FLASH in CONFIG_ENV_IS_IN_FLASH

[karo-tx-uboot.git] / include / configs / sc520_spunk.h

diff --git a/include/configs/sc520_spunk.h b/include/configs/sc520_spunk.h
index c6f7f1526c63170b209069be62bd0bfacbfafad3..a8f520c3c2ebdc5e450622d3cfc0a9d560edf6c8 100644 (file)
--- a/include/configs/sc520_spunk.h
+++ b/include/configs/sc520_spunk.h
@@ -88,8 +88,12 @@
 
 
 #define CONFIG_BOOTDELAY       15
-#define CONFIG_BOOTARGS        "root=/dev/mtdblock1 console=ttyS0,9600 mtdparts=phys:7936k(root),256k(uboot) "
-#define CONFIG_BOOTCOMMAND     "setenv bootargs root=/dev/nfs ip=autoconf console=ttyS0,9600 mtdparts=phys:7808k(root),128k(env),256k(uboot); bootp; bootm"
+#define CONFIG_BOOTARGS                "root=/dev/mtdblock1 console=ttyS0,9600 " \
+                                       "mtdparts=phys:7936k(root),256k(uboot) "
+#define CONFIG_BOOTCOMMAND     "setenv bootargs root=/dev/nfs ip=autoconf " \
+                                       "console=ttyS0,9600 " \
+                                       "mtdparts=phys:7808k(root),128k(env),256k(uboot);" \
+                                       "bootp;bootm"
 
 #if defined(CONFIG_CMD_KGDB)
 #define CONFIG_KGDB_BAUDRATE   115200          /* speed to run kgdb serial port */
@@ -140,7 +144,7 @@
 
 #define CONFIG_SPI_EEPROM       /* SPI EEPROMs such as AT25010 or AT25640 */
 #define CONFIG_MW_EEPROM        /* MicroWire EEPROMS such as AT93LC46 */
-#define CONFIG_DS1722           /* Dallas DS1722 SPI Temperature probe */
+#define CONFIG_DTT_DS1722       /* Dallas DS1722 SPI Temperature probe */
 
 
 /* allow to overwrite serial and ethaddr */
@@ -149,7 +153,7 @@
 
 #if 0
 /* Environment in flash */
-#define CFG_ENV_IS_IN_FLASH     1
+#define CONFIG_ENV_IS_IN_FLASH     1
 # define CFG_ENV_ADDR          (0x387a0000)    /* Addr of Environment Sector   */
 # define CFG_ENV_SIZE          0x20000 /* Total Size of Environment Sector (or 0x10000) */
 # define CFG_ENV_OFFSET         0
@@ -157,7 +161,7 @@
 #else
 /* Environment in EEPROM */
 
-# define CFG_ENV_IS_IN_EEPROM   1
+# define CONFIG_ENV_IS_IN_EEPROM   1
 # define CONFIG_SPI
 # define CONFIG_SPI_X 1
 # define CFG_ENV_SIZE          0x2000  /* Total Size of Environment EEPROM     */