diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx51_3stack_android.h | 20 | ||||
| -rw-r--r-- | include/configs/mx51_bbg.h | 13 | ||||
| -rw-r--r-- | include/configs/mx51_bbg_android.h | 16 |
3 files changed, 20 insertions, 29 deletions
diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h index a875dcb..7661713 100644 --- a/include/configs/mx51_3stack_android.h +++ b/include/configs/mx51_3stack_android.h @@ -89,7 +89,12 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NET -/* #define CONFIG_CMD_UBIFS */ +/* +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#define CONFIG_RBTREE +#define CONFIG_LZO +*/ /* * Android support Configs @@ -108,11 +113,14 @@ } #define CONFIG_MXC_KPD_COLMAX 6 #define CONFIG_MXC_KPD_ROWMAX 4 -#define CONFIG_ANDROID_NORMAL_BOOTARGS "ip=dhcp mem=480M init=/init wvga calibration" -#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC "run bootargs_base bootargs_android;mmc read 0 ${loadaddr} 0x800 0x1280;bootm" -#define CONFIG_ANDROID_RECOVERY_BOOTARGS_NAND "setenv bootargs ${bootargs} root=/dev/mtdblock2 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD_NAND "run bootargs_base bootargs_android;nand read ${loadaddr} 0x300000 0x250000;bootm" +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC \ + "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=off init=/init rootfstype=ext3" +#define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC \ + "run bootargs_base bootargs_android;mmc read 0 ${loadaddr} 0x800 0x1280;bootm" +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_NAND \ + "setenv bootargs ${bootargs} ip=off rootfstype=ubifs root=ubi1:recovery init=/init ubi.mtd=3 ubi.mtd=2" +#define CONFIG_ANDROID_RECOVERY_BOOTCMD_NAND \ + "run bootargs_base bootargs_android;nand read ${loadaddr} 0x300000 0x250000;bootm" #define CONFIG_ANDROID_RECOVERY_CMD_FILE "/recovery/command" #define CONFIG_ANDROID_BOOTMOD_DELAY 3 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h index 1634e0e..64f0e2b 100644 --- a/include/configs/mx51_bbg.h +++ b/include/configs/mx51_bbg.h @@ -238,25 +238,14 @@ */ #define CONFIG_SYS_NO_FLASH -/*----------------------------------------------------------------------- - * NAND FLASH driver setup - */ -#define NAND_MAX_CHIPS 8 -#define CONFIG_SYS_MAX_NAND_DEVICE 1 -#define CONFIG_SYS_NAND_BASE 0x40000000 - /* Monitor at beginning of flash */ #define CONFIG_FSL_ENV_IN_SF /* #define CONFIG_FSL_ENV_IN_MMC */ -/* #define CONFIG_FSL_ENV_IN_NAND */ #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE -#if defined(CONFIG_FSL_ENV_IN_NAND) - #define CONFIG_ENV_IS_IN_NAND 1 - #define CONFIG_ENV_OFFSET 0x100000 -#elif defined(CONFIG_FSL_ENV_IN_MMC) +#if defined(CONFIG_FSL_ENV_IN_MMC) #define CONFIG_ENV_IS_IN_MMC 1 #define CONFIG_ENV_OFFSET (768 * 1024) #elif defined(CONFIG_FSL_ENV_IN_SF) diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h index 14a9ce3..f791f4d 100644 --- a/include/configs/mx51_bbg_android.h +++ b/include/configs/mx51_bbg_android.h @@ -73,10 +73,6 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NET -/* -#define CONFIG_CMD_UBI -#define CONFIG_CMD_UBIFS -*/ /* * Android support Configs @@ -97,7 +93,7 @@ KEY_7, KEY_8, KEY_9, KEY_F3, KEY_DOWN, KEY_F4, \ KEY_0, KEY_OK, KEY_ESC, KEY_ENTER, KEY_MENU, KEY_BACK, \ } -/* + /* { \ KEY_3, KEY_2, KEY_0, KEY_OK, KEY_ESC, KEY_ENTER, KEY_F1, KEY_4, KEY_6, KEY_5, @@ -106,15 +102,13 @@ */ #define CONFIG_MXC_KPD_COLMAX 6 #define CONFIG_MXC_KPD_ROWMAX 4 -#define CONFIG_ANDROID_NORMAL_BOOTARGS "ip=dhcp mem=480M init=/init wvga calibration" -#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC "run bootargs_base bootargs_android;mmc read 0 ${loadaddr} 0x800 0x1280;bootm" -#define CONFIG_ANDROID_RECOVERY_BOOTARGS_NAND "setenv bootargs ${bootargs} root=/dev/mtdblock2 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD_NAND "run bootargs_base bootargs_android;nand read ${loadaddr} 0x300000 0x250000;bootm" +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC \ + "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=off init=/init rootfstype=ext3 wvga" +#define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC \ + "run bootargs_base bootargs_android;mmc read 0 ${loadaddr} 0x800 0x1280;bootm" #define CONFIG_ANDROID_RECOVERY_CMD_FILE "/recovery/command" #define CONFIG_ANDROID_BOOTMOD_DELAY 3 #define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 -#define CONFIG_ANDROID_CACHE_PARTITION_NAND "cache" /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE |