Merge git://www.denx.de/git/u-boot-imx

[u-boot] / include / configs / pm9263.h

diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h
index f7a55510727a511becb5ce1784cc4ba44b0c1867..667d68f960aa48fa62afbc8b37459c2d182023ab 100644 (file)
--- a/include/configs/pm9263.h
+++ b/include/configs/pm9263.h
@@ -250,10 +250,6 @@
 #define CONFIG_BOOTCOMMAND     "sf probe 0; " \
                                "sf read 0x22000000 0x84000 0x294000; " \
                                "bootm 0x22000000"
-#define CONFIG_BOOTARGS                "console=ttyS0,115200 " \
-                               "root=/dev/mtdblock0 " \
-                               "mtdparts=atmel_nand:-(root) "\
-                               "rw rootfstype=jffs2"
 
 #elif defined(CONFIG_SYS_USE_NANDFLASH) /* CFG_USE_NANDFLASH */
 
@@ -262,16 +258,6 @@
 #define CONFIG_ENV_OFFSET_REDUND       0x80000
 #define CONFIG_ENV_SIZE                0x20000         /* 1 sector = 128 kB */
 #define CONFIG_BOOTCOMMAND     "nand read 0x22000000 0xA0000 0x200000; bootm"
-#define CONFIG_BOOTARGS                "console=ttyS0,115200 "         \
-                               "root=/dev/mtdblock5 "          \
-                               "mtdparts=atmel_nand:"          \
-                                       "128k(bootstrap)ro,"    \
-                                       "256k(uboot)ro,"        \
-                                       "128k(env1)ro,"         \
-                                       "128k(env2)ro,"         \
-                                       "2M(linux),"            \
-                                       "-(root) "              \
-                               "rw rootfstype=jffs2"
 
 #elif defined(CONFIG_SYS_USE_FLASH) /* CFG_USE_FLASH */
 
@@ -291,8 +277,6 @@
 #define CONFIG_ROOTPATH                        "/ronetix/rootfs"
 
 #define CONFIG_CON_ROT                 "fbcon=rotate:3 "
-#define CONFIG_BOOTARGS                        "root=/dev/mtdblock4 rootfstype=jffs2 "\
-                                       CONFIG_CON_ROT
 
 #define MTDIDS_DEFAULT                 "nor0=physmap-flash.0,nand0=nand"
 #define MTDPARTS_DEFAULT               \