Merge branch 'Makefile-next' of git://git.denx.de/u-boot-arm

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

diff --git a/include/configs/p3mx.h b/include/configs/p3mx.h
index 8ae38cb..2df1d9d 100644 (file)
--- a/include/configs/p3mx.h
+++ b/include/configs/p3mx.h
@@ -42,6 +42,7 @@
 
 #if defined (CONFIG_P3M750)
 #define CONFIG_750FX                   /* 750GL/GX/FX                  */
+#define CONFIG_HIGH_BATS               /* High BATs supported          */
 #define CFG_BOARD_NAME         "P3M750"
 #define CFG_BUS_HZ             100000000
 #define CFG_BUS_CLK            CFG_BUS_HZ
@@ -60,7 +61,6 @@
 #define CONFIG_BOARD_EARLY_INIT_F 1     /* Call board_early_init_f     */
 #define CONFIG_BOARD_EARLY_INIT_R 1     /* Call board_early_init_f     */
 #define CONFIG_MISC_INIT_R      1      /* Call misc_init_r()           */
-#define CONFIG_ADD_RAM_INFO    1       /* Print additional info        */
 
 /*-----------------------------------------------------------------------
  * Base addresses -- Note these are effective addresses where the
@@ -128,7 +128,7 @@
  * FLASH related
  *----------------------------------------------------------------------*/
 #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_MAX_FLASH_BANKS    1       /* max number of memory banks           */
 #define CFG_MAX_FLASH_SECT     512     /* max number of sectors on one chip    */
 #define CFG_FLASH_ERASE_TOUT   120000  /* Timeout for Flash Erase (in ms)      */
@@ -137,14 +137,14 @@
 #define CFG_FLASH_PROTECTION   1       /* use hardware flash protection        */
 #define CFG_FLASH_EMPTY_INFO           /* print 'E' for empty sector on flinfo */
 
-#define CFG_ENV_IS_IN_FLASH     1      /* use FLASH for environment vars       */
+#define CONFIG_ENV_IS_IN_FLASH     1   /* use FLASH for environment vars       */
 #if defined (CONFIG_P3M750)
-#define CFG_ENV_SECT_SIZE      0x20000         /* one sector (1 device)*/
+#define CONFIG_ENV_SECT_SIZE   0x20000 /* one sector (1 device)                */
 #elif defined (CONFIG_P3M7448)
-#define CFG_ENV_SECT_SIZE      0x40000         /* two sectors (2 devices parallel */
+#define CONFIG_ENV_SECT_SIZE   0x40000 /* two sectors (2 devices parallel      */
 #endif
-#define        CFG_ENV_SIZE            0x2000  /* Total Size of Environment Sector     */
-#define CFG_ENV_ADDR           (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
+#define        CONFIG_ENV_SIZE         0x2000  /* Total Size of Environment Sector     */
+#define CONFIG_ENV_ADDR                (CFG_MONITOR_BASE + CFG_MONITOR_LEN)
 
 /*-----------------------------------------------------------------------
  * DDR SDRAM
@@ -220,7 +220,7 @@
        "update=protect off fff00000 fff3ffff;era fff00000 fff3ffff;"   \
                "cp.b 100000 fff00000 40000;"                           \
                "setenv filesize;saveenv\0"                             \
-       "upd=run load;run update\0"                                     \
+       "upd=run load update\0"                                         \
        "serverip=11.0.0.152\0"
 
 #if defined (CONFIG_P3M750)