diff options
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/mx25_3stack.h | 35 | ||||
| -rw-r--r-- | include/configs/mx31_3stack.h | 12 | ||||
| -rw-r--r-- | include/configs/mx35_3stack.h | 7 | ||||
| -rw-r--r-- | include/configs/mx35_3stack_mmc.h | 20 | ||||
| -rw-r--r-- | include/configs/mx51_3stack.h | 30 | ||||
| -rw-r--r-- | include/configs/mx51_3stack_android.h | 68 | ||||
| -rw-r--r-- | include/configs/mx51_bbg.h (renamed from include/configs/imx51.h) | 56 | ||||
| -rw-r--r-- | include/configs/mx51_bbg_android.h (renamed from include/configs/imx51_android.h) | 99 |
8 files changed, 187 insertions, 140 deletions
diff --git a/include/configs/mx25_3stack.h b/include/configs/mx25_3stack.h index 93e4b9a..2943479 100644 --- a/include/configs/mx25_3stack.h +++ b/include/configs/mx25_3stack.h @@ -96,17 +96,21 @@ /* #define CONFIG_CMD_SPI */ /* #define CONFIG_CMD_DATE */ #define CONFIG_CMD_NAND +/* #define CONFIG_CMD_MMC */ /* * MMC Configs * */ /* -#define CONFIG_FSL_MMC -#define CONFIG_MMC -#define CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION -#define CONFIG_CMD_FAT -#define CONFIG_MMC_BASE 0x0 */ +#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 +#endif +*/ /* Disabled due to compilation errors in cmd_bootm.c (IMLS seems to require * that CONFIG_NO_FLASH is undefined). @@ -128,9 +132,9 @@ "tftpboot 0x81000000 uImage; bootm\0" /*Support LAN9217*/ -/*#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE CS5_BASE*/ +/*#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE CS5_BASE*/ /*#define CONFIG_HAS_ETH1*/ #define CONFIG_CMD_NET @@ -189,13 +193,8 @@ #endif /* Monitor at beginning of flash */ -#if defined(CONFIG_FSL_SF) - #define CONFIG_FSL_ENV_IN_SF -#elif defined(CONFIG_FSL_MMC) - #define CONFIG_FSL_ENV_IN_MMC -#elif defined(CONFIG_CMD_NAND) - #define CONFIG_FSL_ENV_IN_NAND -#endif +/* #define CONFIG_FSL_ENV_IN_MMC */ +#define CONFIG_FSL_ENV_IN_NAND /*----------------------------------------------------------------------- * FLASH and environment organization @@ -206,10 +205,6 @@ #elif 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) - #define CONFIG_ENV_IS_IN_SPI_FLASH 1 - #define CONFIG_ENV_SPI_CS 1 - #define CONFIG_ENV_OFFSET (768 * 1024) #else #define CONFIG_ENV_IS_NOWHERE 1 #endif diff --git a/include/configs/mx31_3stack.h b/include/configs/mx31_3stack.h index e7b6f89..d7629b2 100644 --- a/include/configs/mx31_3stack.h +++ b/include/configs/mx31_3stack.h @@ -50,9 +50,8 @@ /* * Hardware drivers */ - -#define CONFIG_MX31_UART 1 -#define CONFIG_SYS_MX31_UART1 1 +#define CONFIG_MXC_UART 1 +#define CONFIG_SYS_MX31_UART1 1 #define CONFIG_MXC_SPI 1 @@ -99,9 +98,10 @@ "tftpboot ${loadaddr} ${tftp_server}:${kernel}; bootm\0" /* configure for smc91xx debug board ethernet */ -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE CS5_BASE +#define CONFIG_NET_MULTI +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE CS5_BASE #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/mx35_3stack.h b/include/configs/mx35_3stack.h index e0181d1..4140a86 100644 --- a/include/configs/mx35_3stack.h +++ b/include/configs/mx35_3stack.h @@ -90,6 +90,7 @@ #define CONFIG_CMD_I2C #define CONFIG_CMD_MII +#define CONFIG_CMD_NET #define CONFIG_BOOTDELAY 3 @@ -115,9 +116,9 @@ "setenv filesize; saveenv\0" /*Support LAN9217*/ -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE CS5_BASE_ADDR +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE CS5_BASE_ADDR #define CONFIG_HAS_ETH1 #define CONFIG_NET_MULTI 1 diff --git a/include/configs/mx35_3stack_mmc.h b/include/configs/mx35_3stack_mmc.h index 1676004..e1d5d75 100644 --- a/include/configs/mx35_3stack_mmc.h +++ b/include/configs/mx35_3stack_mmc.h @@ -86,6 +86,8 @@ /*#define CONFIG_CMD_SPI*/ /*#define CONFIG_CMD_DATE*/ /*#define CONFIG_CMD_NAND*/ +#define CONFIG_CMD_ENV +#define CONFIG_CMD_MMC #define CONFIG_CMD_I2C #define CONFIG_CMD_MII @@ -114,9 +116,9 @@ "setenv filesize; saveenv\0" /*Support LAN9217*/ -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE CS5_BASE_ADDR +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE CS5_BASE_ADDR #define CONFIG_HAS_ETH1 #define CONFIG_NET_MULTI 1 @@ -181,9 +183,14 @@ /* * MMC Configs * */ -#define CONFIG_FSL_MMC -#define CONFIG_MMC 1 -#define CONFIG_CMD_MMC +#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 +#endif #define CONFIG_FLASH_HEADER 1 #define CONFIG_FLASH_HEADER_OFFSET 0x400 @@ -191,7 +198,6 @@ #define CONFIG_DOS_PARTITION 1 #define CONFIG_CMD_FAT 1 -#define CONFIG_MMC_BASE 0x0 /*----------------------------------------------------------------------- * FLASH and environment organization diff --git a/include/configs/mx51_3stack.h b/include/configs/mx51_3stack.h index 236de3c..e0fa523 100644 --- a/include/configs/mx51_3stack.h +++ b/include/configs/mx51_3stack.h @@ -83,23 +83,27 @@ #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP /* Enable below configure when supporting nand */ -/* #define CONFIG_CMD_NAND */ +#define CONFIG_CMD_NAND #define CONFIG_MXC_NAND #define CONFIG_CMD_ENV +#define CMD_SAVEENV #undef CONFIG_CMD_IMLS #define CONFIG_CMD_MII #define CONFIG_CMD_NET +#define CONFIG_NET_MULTI +#define CONFIG_CMD_MMC /* * MMC Configs */ -#define CONFIG_FSL_MMC 1 - -#define CONFIG_MMC 1 -#define CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_CMD_FAT 1 -#define CONFIG_MMC_BASE 0x0 +#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 +#endif /* * I2C Configs @@ -135,9 +139,9 @@ "setenv filesize; saveenv\0" /*Support LAN9217*/ -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE_VARIABLE mx51_io_base_addr +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE mx51_io_base_addr /* * The MX51 3stack board seems to have a hardware "peculiarity" confirmed under @@ -203,7 +207,9 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 /* Monitor at beginning of flash */ -#define CONFIG_FSL_ENV_IN_MMC +#define CONFIG_FSL_ENV_IN_NAND +/* #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) diff --git a/include/configs/mx51_3stack_android.h b/include/configs/mx51_3stack_android.h index 153993b..a4c1004 100644 --- a/include/configs/mx51_3stack_android.h +++ b/include/configs/mx51_3stack_android.h @@ -84,30 +84,6 @@ #define MAX_SPI_BYTES (64 * 4) */ -/* - * MMC Configs - * */ -#define CONFIG_FSL_MMC 1 - -#define CONFIG_MMC 1 -#define CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_CMD_FAT 1 -#define CONFIG_MMC_BASE 0x0 - -/* - * Eth Configs - */ -#define CONFIG_HAS_ETH1 -#define CONFIG_NET_MULTI 1 -#define CONFIG_MXC_FEC -#define CONFIG_MII -#define CONFIG_DISCOVER_PHY - -#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_PHY_ADDR 0x1F -#define CONFIG_FEC0_MIIBASE -1 #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -134,7 +110,9 @@ #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_BOOTMOD_DELAY 3 +#define CONFIG_ANDROID_CACHE_PARTITION 4 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -153,6 +131,7 @@ /* Enable below configure when supporting nand */ #define CONFIG_CMD_NAND #define CONFIG_MXC_NAND +#define CONFIG_CMD_MMC #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS @@ -190,9 +169,35 @@ "setenv filesize; saveenv\0" /*Support LAN9217*/ -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE_VARIABLE mx51_io_base_addr +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE mx51_io_base_addr + +/* + * MMC Configs + * */ +#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 +#endif + +/* + * Eth Configs + */ +#define CONFIG_HAS_ETH1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_MXC_FEC +#define CONFIG_MII +#define CONFIG_DISCOVER_PHY + +#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_PHY_ADDR 0x1F +#define CONFIG_FEC0_MIIBASE -1 /* * The MX51 3stack board seems to have a hardware "peculiarity" confirmed under @@ -258,13 +263,8 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 /* Monitor at beginning of flash */ -#if defined(CONFIG_FSL_SF) - #define CONFIG_FSL_ENV_IN_SF -#elif defined(CONFIG_FSL_MMC) - #define CONFIG_FSL_ENV_IN_MMC -#elif defined(CONFIG_CMD_NAND) - #define CONFIG_FSL_ENV_IN_NAND -#endif +/* #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 diff --git a/include/configs/imx51.h b/include/configs/mx51_bbg.h index e5ae114..dd4727d 100644 --- a/include/configs/imx51.h +++ b/include/configs/mx51_bbg.h @@ -71,8 +71,6 @@ * SPI Configs * */ #define CONFIG_FSL_SF 1 -#define CONFIG_CMD_SPI -#define CONFIG_CMD_SF #define CONFIG_SPI_FLASH_IMX_ATMEL 1 #define CONFIG_SPI_FLASH_CS 1 #define CONFIG_IMX_SPI @@ -115,6 +113,50 @@ #define CONFIG_CMD_DHCP #define CONFIG_CMD_MII #define CONFIG_CMD_NET +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF +#define CONFIG_CMD_MMC + +/* + * SPI Configs + * */ +#ifdef CONFIG_CMD_SF + #define CONFIG_FSL_SF 1 + #define CONFIG_SPI_FLASH_IMX_ATMEL 1 + #define CONFIG_SPI_FLASH_CS 1 + #define CONFIG_IMX_SPI + #define CONFIG_IMX_SPI_PMIC + #define CONFIG_IMX_SPI_PMIC_CS 0 + + #define MAX_SPI_BYTES (64 * 4) +#endif + +/* + * MMC Configs + * */ +#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 +#endif +/* + * Eth Configs + */ +#define CONFIG_HAS_ETH1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_MXC_FEC +#define CONFIG_MII +#define CONFIG_DISCOVER_PHY + +#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_PHY_ADDR 0x1F +#define CONFIG_FEC0_MIIBASE -1 + + /* Enable below configure when supporting nand */ #define CONFIG_CMD_ENV @@ -205,13 +247,9 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 /* Monitor at beginning of flash */ -#if defined(CONFIG_FSL_SF) - #define CONFIG_FSL_ENV_IN_SF -#elif defined(CONFIG_FSL_MMC) - #define CONFIG_FSL_ENV_IN_MMC -#elif defined(CONFIG_CMD_NAND) - #define CONFIG_FSL_ENV_IN_NAND -#endif +/* #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 diff --git a/include/configs/imx51_android.h b/include/configs/mx51_bbg_android.h index 55bcfbf..d49e039 100644 --- a/include/configs/imx51_android.h +++ b/include/configs/mx51_bbg_android.h @@ -68,44 +68,6 @@ #define CONFIG_MX51_UART 1 #define CONFIG_MX51_UART1 1 -/* - * SPI Configs - * */ -#define CONFIG_FSL_SF 1 -#define CONFIG_CMD_SPI -#define CONFIG_CMD_SF -#define CONFIG_SPI_FLASH_IMX_ATMEL 1 -#define CONFIG_SPI_FLASH_CS 1 -#define CONFIG_IMX_SPI -#define CONFIG_IMX_SPI_PMIC -#define CONFIG_IMX_SPI_PMIC_CS 0 - -#define MAX_SPI_BYTES (64 * 4) - -/* - * MMC Configs - * */ -#define CONFIG_FSL_MMC 1 - -#define CONFIG_MMC 1 -#define CONFIG_CMD_MMC -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_CMD_FAT 1 -#define CONFIG_MMC_BASE 0x0 - -/* - * Eth Configs - */ -#define CONFIG_HAS_ETH1 -#define CONFIG_NET_MULTI 1 -#define CONFIG_MXC_FEC -#define CONFIG_MII -#define CONFIG_DISCOVER_PHY - -#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR -#define CONFIG_FEC0_PINMUX -1 -#define CONFIG_FEC0_PHY_ADDR 0x1F -#define CONFIG_FEC0_MIIBASE -1 #define CONFIG_CMD_PING #define CONFIG_CMD_DHCP @@ -138,8 +100,10 @@ #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_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_BOOTMOD_DELAY 3 +#define CONFIG_ANDROID_CACHE_PARTITION 4 /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE @@ -157,6 +121,7 @@ #define CONFIG_CMD_DHCP /* Enable below configure when supporting nand */ /* #define CONFIG_CMD_NAND */ +#define CONFIG_CMD_MMC #define CONFIG_CMD_ENV #undef CONFIG_CMD_IMLS @@ -195,9 +160,9 @@ /*Support LAN9217*/ /* -#define CONFIG_DRIVER_SMC911X 1 -#define CONFIG_DRIVER_SMC911X_16_BIT 1 -#define CONFIG_DRIVER_SMC911X_BASE_VARIABLE mx51_io_base_addr +#define CONFIG_SMC911X 1 +#define CONFIG_SMC911X_16_BIT 1 +#define CONFIG_SMC911X_BASE mx51_io_base_addr */ /* @@ -235,6 +200,46 @@ #define CONFIG_CMDLINE_EDITING 1 +/* + * Eth Configs + */ +#define CONFIG_HAS_ETH1 +#define CONFIG_NET_MULTI 1 +#define CONFIG_MXC_FEC +#define CONFIG_MII +#define CONFIG_DISCOVER_PHY + +#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_PHY_ADDR 0x1F +#define CONFIG_FEC0_MIIBASE -1 + +/* + * SPI Configs + * */ +#define CONFIG_FSL_SF 1 +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_IMX_ATMEL 1 +#define CONFIG_SPI_FLASH_CS 1 +#define CONFIG_IMX_SPI +#define CONFIG_IMX_SPI_PMIC +#define CONFIG_IMX_SPI_PMIC_CS 0 + +#define MAX_SPI_BYTES (64 * 4) + +/* + * MMC Configs + * */ +#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 /*----------------------------------------------------------------------- * Stack sizes * @@ -264,13 +269,9 @@ #define CONFIG_SYS_NAND_BASE 0x40000000 /* Monitor at beginning of flash */ -#if defined(CONFIG_FSL_SF) - #define CONFIG_FSL_ENV_IN_SF -#elif defined(CONFIG_FSL_MMC) - #define CONFIG_FSL_ENV_IN_MMC -#elif defined(CONFIG_CMD_NAND) - #define CONFIG_FSL_ENV_IN_NAND -#endif +/* #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 |