Remove unused CFG_EEPROM_PAGE_WRITE_ENABLE references

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

diff --git a/include/configs/zeus.h b/include/configs/zeus.h
index 810a528..abf6bd3 100644 (file)
--- a/include/configs/zeus.h
+++ b/include/configs/zeus.h
@@ -42,7 +42,7 @@
 #define PLLMR0_DEFAULT         PLLMR0_333_111_55_111
 #define PLLMR1_DEFAULT         PLLMR1_333_111_55_111
 
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 
 #define CONFIG_OVERWRITE_ETHADDR_ONCE  1
 
@@ -175,7 +175,6 @@
 /* mask of address bits that overflow into the "EEPROM chip address"    */
 #define CFG_I2C_EEPROM_ADDR_OVERFLOW   0x07
 
-#define CFG_EEPROM_PAGE_WRITE_ENABLE   1       /* write eeprom in pages */
 #define CFG_EEPROM_PAGE_WRITE_BITS     3       /* 8 byte write page size */
 #define CFG_EEPROM_PAGE_WRITE_DELAY_MS 10      /* and takes up to 10 msec */
 
@@ -210,7 +209,7 @@
  * FLASH organization
  */
 #define CFG_FLASH_CFI                          /* The flash is CFI compatible  */
-#define CFG_FLASH_CFI_DRIVER                   /* Use common CFI driver        */
+#define CONFIG_FLASH_CFI_DRIVER                        /* Use common CFI driver        */
 
 #define CFG_FLASH_BANKS_LIST   { CFG_FLASH_BASE }
 
@@ -226,14 +225,14 @@
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 #define CFG_FLASH_QUIET_TEST   1       /* don't warn upon unknown flash        */
 
-#ifdef CFG_ENV_IS_IN_FLASH
-#define CFG_ENV_SECT_SIZE      0x20000 /* size of one complete sector          */
-#define CFG_ENV_ADDR           ((-CFG_MONITOR_LEN)-CFG_ENV_SECT_SIZE)
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
+#ifdef CONFIG_ENV_IS_IN_FLASH
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* size of one complete sector          */
+#define CONFIG_ENV_ADDR                ((-CFG_MONITOR_LEN)-CONFIG_ENV_SECT_SIZE)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */
 
 /* Address and size of Redundant Environment Sector    */
-#define CFG_ENV_ADDR_REDUND    (CFG_ENV_ADDR-CFG_ENV_SECT_SIZE)
-#define CFG_ENV_SIZE_REDUND    (CFG_ENV_SIZE)
+#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_ADDR-CONFIG_ENV_SECT_SIZE)
+#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
 #endif
 
 /*-----------------------------------------------------------------------
@@ -309,6 +308,12 @@
 #define CONFIG_KGDB_SER_INDEX  2               /* which serial port to use */
 #endif
 
+/*
+ * Pass open firmware flat tree
+ */
+#define CONFIG_OF_LIBFDT
+#define CONFIG_OF_BOARD_SETUP
+
 /* ENVIRONMENT VARS */
 
 #define CONFIG_PREBOOT         "echo;echo Welcome to Bulletendpoints board v1.1;echo"
@@ -333,7 +338,7 @@
        "nfsargs=setenv bootargs root=/dev/nfs rw"                      \
                " nfsroot=${serverip}:${rootpath}\0"                    \
        "ramargs=setenv bootargs root=/dev/ram rw"                      \
-               " ramdisk=${ramdisk_size}\0"                            \
+               " ramdisk_size=${ramdisk_size}\0"                       \
        "addip=setenv bootargs ${bootargs} "                            \
                "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}"      \
                ":${hostname}:${netdev}:off panic=1\0"                  \