diff options
Diffstat (limited to 'include/configs')
-rw-r--r-- | include/configs/mx25_3stack.h | 1 | ||||
-rw-r--r-- | include/configs/mx35_3stack_mmc.h | 1 | ||||
-rw-r--r-- | include/configs/mx51_3stack.h | 15 | ||||
-rw-r--r-- | include/configs/mx51_3stack_android.h | 14 | ||||
-rw-r--r-- | include/configs/mx51_bbg.h | 6 | ||||
-rw-r--r-- | include/configs/mx51_bbg_android.h | 22 |
6 files changed, 27 insertions, 32 deletions
diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h index 2943479..8272cbe 100644 --- a/include/configs/mx25_3stack.h +++ b/include/configs/mx25_3stack.h @@ -104,7 +104,6 @@ /* #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h index e1d5d75..27b45c8 100644 --- a/include/configs/mx35_3stack_mmc.h +++ b/include/configs/mx35_3stack_mmc.h @@ -185,7 +185,6 @@ * */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 diff --git a/include/configs/mx51_3stack.h b/include/configs/mx51_3stack.h index 2714857..794ae83 100644 --- a/include/configs/mx51_3stack.h +++ b/include/configs/mx51_3stack.h @@ -83,10 +83,8 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP /* Enable below configure when supporting nand */ -/* #define CONFIG_CMD_NAND #define CONFIG_MXC_NAND -*/ #define CONFIG_CMD_ENV #define CMD_SAVEENV #undef CONFIG_CMD_IMLS @@ -100,7 +98,6 @@ */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 @@ -117,17 +114,6 @@ #define CONFIG_SYS_I2C_SPEED 400000 #define CONFIG_SYS_I2C_SLAVE 0xfe -/* - * PATA Configs - */ -#define CONFIG_CMD_PATA -#define CONFIG_CMD_EXT2 -#define CONFIG_MXC_ATA -#define CONFIG_LIBATA -#define CONFIG_LBA48 -#define CONFIG_SYS_ATA_MAX_DEVICE 1 -#define CONFIG_SYS_ATA_BASE_ADDR ATA_BASE_ADDR - #define CONFIG_BOOTDELAY 3 #define CONFIG_LOADADDR 0x90800000 /* loadaddr env var */ @@ -223,7 +209,6 @@ /* Monitor at beginning of flash */ #define CONFIG_FSL_ENV_IN_NAND /* #define CONFIG_FSL_ENV_IN_NAND */ -/* #define CONFIG_FSL_ENV_IN_MMC */ #define CONFIG_ENV_SECT_SIZE (128 * 1024) #define CONFIG_ENV_SIZE CONFIG_ENV_SECT_SIZE diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h index a4c1004..a875dcb 100644 --- a/include/configs/mx51_3stack_android.h +++ b/include/configs/mx51_3stack_android.h @@ -89,6 +89,7 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NET +/* #define CONFIG_CMD_UBIFS */ /* * Android support Configs @@ -108,11 +109,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 "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD "run bootargs_base bootargs_android;mmcinit;cp.b 0x100000 ${loadaddr} 0x250000;bootm" -#define CONFIG_ANDROID_RECOVERY_CMD_FILE "/cache/recovery/command" +#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_CMD_FILE "/recovery/command" #define CONFIG_ANDROID_BOOTMOD_DELAY 3 -#define CONFIG_ANDROID_CACHE_PARTITION 4 +#define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 +#define CONFIG_ANDROID_CACHE_PARTITION_NAND 2 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -178,11 +182,11 @@ * */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 #endif /* diff --git a/include/configs/mx51_bbg.h b/include/configs/mx51_bbg.h index dd4727d..1634e0e 100644 --- a/include/configs/mx51_bbg.h +++ b/include/configs/mx51_bbg.h @@ -136,7 +136,6 @@ * */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 @@ -247,8 +246,8 @@ #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_SF +/* #define CONFIG_FSL_ENV_IN_MMC */ /* #define CONFIG_FSL_ENV_IN_NAND */ #define CONFIG_ENV_SECT_SIZE (128 * 1024) @@ -262,7 +261,6 @@ #define CONFIG_ENV_OFFSET (768 * 1024) #elif defined(CONFIG_FSL_ENV_IN_SF) #define CONFIG_ENV_IS_IN_SPI_FLASH 1 - #define CONFIG_ENV_IS_EMBEDDED 1 #define CONFIG_ENV_SPI_CS 1 #define CONFIG_ENV_OFFSET (768 * 1024) #else diff --git a/include/configs/mx51_bbg_android.h b/include/configs/mx51_bbg_android.h index d49e039..14a9ce3 100644 --- a/include/configs/mx51_bbg_android.h +++ b/include/configs/mx51_bbg_android.h @@ -73,6 +73,10 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NET +/* +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +*/ /* * Android support Configs @@ -81,6 +85,10 @@ #define CONFIG_FSL_ANDROID +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS + + #define CONFIG_MXC_KPD #define CONFIG_MXC_KEYMAPPING \ { \ @@ -96,14 +104,17 @@ KEY_LEFT, KEY_1, KEY_ , KEY_8, KEY_9, KEY_RIGHT, } */ -#define CONFIG_MXC_KPD_COLMAX 4 +#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 "setenv bootargs ${bootargs} root=/dev/mmcblk0p4 ip=dhcp init=/init rootfstype=ext3 wvga" -#define CONFIG_ANDROID_RECOVERY_BOOTCMD "run bootargs_base bootargs_android;mmc read 0 ${loadaddr} 0x800 0x1280;bootm" -#define CONFIG_ANDROID_RECOVERY_CMD_FILE "/cache/recovery/command" +#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_CMD_FILE "/recovery/command" #define CONFIG_ANDROID_BOOTMOD_DELAY 3 -#define CONFIG_ANDROID_CACHE_PARTITION 4 +#define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 +#define CONFIG_ANDROID_CACHE_PARTITION_NAND "cache" /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -233,7 +244,6 @@ * */ #ifdef CONFIG_CMD_MMC #define CONFIG_MMC 1 - #define CONFIG_MMC_BASE 0x0 #define CONFIG_GENERIC_MMC #define CONFIG_IMX_MMC #define CONFIG_DOS_PARTITION 1 |