bootcount: Migrate CONFIG_SYS_BOOTCOUNT_ADDR

[people/ms/u-boot.git] / include / configs / pcm052.h

diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h
index b4b60ac865b46ba82eb272e32f9ac9914b84c1ef..94f580d35955730671071691a39b8e3ea4b13523 100644 (file)
--- a/include/configs/pcm052.h
+++ b/include/configs/pcm052.h
@@ -35,19 +35,6 @@
 #define CONFIG_MTD_PARTITIONS
 #define CONFIG_MTD_DEVICE
 
-#ifndef MTDIDS_DEFAULT
-#define MTDIDS_DEFAULT                 "nand0=NAND"
-#endif
-
-#ifndef MTDPARTS_DEFAULT
-#define MTDPARTS_DEFAULT               "mtdparts=NAND:640k(bootloader)"\
-                                       ",128k(env1)"\
-                                       ",128k(env2)"\
-                                       ",128k(dtb)"\
-                                       ",6144k(kernel)"\
-                                       ",-(root)"
-#endif
-
 #endif
 
 #define CONFIG_FSL_ESDHC
@@ -89,8 +76,7 @@
 #define CONFIG_LOADADDR                        0x82000000
 
 /* We boot from the gfxRAM area of the OCRAM. */
-#define CONFIG_SYS_TEXT_BASE           0x3f408000
-#define CONFIG_BOARD_SIZE_LIMIT                524288
+#define CONFIG_BOARD_SIZE_LIMIT                520192
 
 /* if no target-specific extra environment settings were defined by the
    target, define an empty one */
@@ -133,7 +119,7 @@
        "nfs_root=/path/to/nfs/root\0" \
        "tftptimeout=1000\0" \
        "tftptimeoutcountmax=1000000\0" \
-       "mtdparts=" MTDPARTS_DEFAULT "\0" \
+       "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
        "bootargs_base=setenv bootargs rw " \
                " mem=" __stringify(CONFIG_PCM052_DDR_SIZE) "M " \
                "console=ttyLP1,115200n8\0" \
@@ -200,14 +186,6 @@
                "nand write ${ram_addr} root ${filesize}; fi\0"
 
 /* Miscellaneous configurable options */
-#define CONFIG_SYS_LONGHELP            /* undef to save memory */
-#define CONFIG_AUTO_COMPLETE
-#define CONFIG_CMDLINE_EDITING
-#define CONFIG_SYS_CBSIZE              256     /* Console I/O Buffer Size */
-#define CONFIG_SYS_PBSIZE              \
-                       (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16)
-#define CONFIG_SYS_MAXARGS             16      /* max number of command args */
-#define CONFIG_SYS_BARGSIZE            CONFIG_SYS_CBSIZE
 
 #define CONFIG_SYS_MEMTEST_START       0x80010000
 #define CONFIG_SYS_MEMTEST_END         0x87C00000