| 1 | diff --git a/include/configs/nanonote.h b/include/configs/nanonote.h |
| 2 | index dde5cb4..8e4f6d1 100644 |
| 3 | --- a/include/configs/nanonote.h |
| 4 | +++ b/include/configs/nanonote.h |
| 5 | @@ -90,7 +90,7 @@ |
| 6 | /* Print Buffer Size */ |
| 7 | #define CONFIG_SYS_MAXARGS 16 /* max number of command args*/ |
| 8 | |
| 9 | -#define CONFIG_SYS_MALLOC_LEN 896 * 1024 |
| 10 | +#define CONFIG_SYS_MALLOC_LEN 4 * 1024 * 1024 |
| 11 | #define CONFIG_SYS_BOOTPARAMS_LEN 128 * 1024 |
| 12 | |
| 13 | #define CONFIG_SYS_SDRAM_BASE 0x80000000 /* Cached addr */ |
| 14 | diff --git a/include/configs/qi_lb60.h b/include/configs/qi_lb60.h |
| 15 | index 9f08c74..7ed9a1e 100644 |
| 16 | --- a/include/configs/qi_lb60.h |
| 17 | +++ b/include/configs/qi_lb60.h |
| 18 | @@ -8,6 +8,20 @@ |
| 19 | //#define DEBUG |
| 20 | #define CONFIG_BOOTCOMMAND "nand read 0x80600000 0x400000 0x200000;bootm" |
| 21 | #define CONFIG_BOOTARGS "mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait" |
| 22 | + |
| 23 | +#define CONFIG_CMD_UBIFS |
| 24 | +#define CONFIG_CMD_UBI |
| 25 | +#define CONFIG_MTD_PARTITIONS |
| 26 | +#define CONFIG_MTD_DEVICE |
| 27 | +#define CONFIG_CMD_MTDPARTS |
| 28 | +#define CONFIG_CMD_UBI |
| 29 | +#define CONFIG_CMD_UBIFS |
| 30 | +#define CONFIG_LZO |
| 31 | +#define CONFIG_RBTREE |
| 32 | + |
| 33 | +#define MTDIDS_DEFAULT "nand0=jz4740-nand" |
| 34 | +#define MTDPARTS_DEFAULT "mtdparts=jz4740-nand:4M@0(uboot)ro,4M@4M(kernel)ro,512M@8M(rootfs)ro,-(data)ro" |
| 35 | + |
| 36 | #define CONFIG_EXTRA_ENV_SETTINGS \ |
| 37 | "bootcmdfromsd=mmc init; ext2load mmc 0 0x80600000 /boot/uImage; bootm;\0" \ |
| 38 | "bootargsfromsd=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p1 rw rootwait\0" \ |
| 39 | @@ -17,8 +31,8 @@ |
| 40 | "bootargsf2=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p2 rw rootwait\0" \ |
| 41 | "bootcmdf3=mmc init; ext2load mmc 0:3 0x80600000 /boot/uImage; bootm;\0" \ |
| 42 | "bootargsf3=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p3 rw rootwait\0" \ |
| 43 | - "bootcmdf4=mmc init; ext2load mmc 0:4 0x80600000 /boot/uImage; bootm;\0" \ |
| 44 | - "bootargsf4=mem=32M console=tty0 console=ttyS0,57600n8 rootfstype=ext2 root=/dev/mmcblk0p4 rw rootwait\0" |
| 45 | + "bootcmdf4=mtdparts default;ubi part rootfs;ubifsmount rootfs;ubifsload 0x80600000 /boot/uImage; bootm;\0" \ |
| 46 | + "bootargsf4=mem=32M console=tty0 console=ttyS0,57600n8 ubi.mtd=2 rootfstype=ubifs root=ubi0:rootfs rw rootwait" |
| 47 | |
| 48 | /* SDRAM paramters */ |
| 49 | #define SDRAM_BW16 1 /* Data bus width: 0-32bit, 1-16bit */ |
| 50 | |
