diff options
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | board/freescale/mx50_rdp/mx50_rdp.c | 100 | ||||
| -rw-r--r-- | include/configs/mx50_rd3_android.h | 344 | ||||
| -rw-r--r-- | include/configs/mx50_rd3_mfg.h | 2 |
4 files changed, 443 insertions, 4 deletions
@@ -3258,6 +3258,7 @@ mx50_rd3_config \ mx50_rd3_mfg_config \ mx50_rdp_mfg_config \ mx50_rdp_android_config \ +mx50_rd3_android_config \ mx50_rdp_config : unconfig @[ -z "$(findstring iram_,$@)" ] || \ { echo "TEXT_BASE = 0xF8008400" >$(obj)board/freescale/mx50_rdp/config.tmp ; \ diff --git a/board/freescale/mx50_rdp/mx50_rdp.c b/board/freescale/mx50_rdp/mx50_rdp.c index 133ef6a..3bf1bdd 100644 --- a/board/freescale/mx50_rdp/mx50_rdp.c +++ b/board/freescale/mx50_rdp/mx50_rdp.c @@ -1274,16 +1274,95 @@ struct reco_envs supported_reco_envs[BOOT_DEV_NUM] = { .args = CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC, }, { - .cmd = NULL, - .args = NULL, + .cmd = CONFIG_ANDROID_RECOVERY_BOOTCMD_NAND, + .args = CONFIG_ANDROID_RECOVERY_BOOTARGS_NAND, }, }; +extern int ubifs_init(void); +extern int ubifs_mount(char *vol_name); +extern int ubifs_load(char *filename, u32 addr, u32 size); + +static int check_nand_recovery_cmd_file(char *mtd_part_name, + char *ubi_part_name, + char *path) +{ + struct mtd_device *dev_desc = NULL; + struct part_info *part = NULL; + struct mtd_partition mtd_part; + struct mtd_info *mtd_info = NULL; + char mtd_dev[16] = { 0 }; + char mtd_buffer[80] = { 0 }; + char read_test[PAGE_SIZE]; + u8 pnum = 0; + int err = 0, + filelen = 0; + + memset(&mtd_part, 0, sizeof(struct mtd_partition)); + + if (mtdparts_init() != 0) { + printf("Error initializing mtdparts!\n"); + return 0; + } + + if (find_dev_and_part(mtd_part_name, &dev_desc, &pnum, &part)) { + printf("Partition %s not found!\n", mtd_part_name); + return 0; + } + sprintf(mtd_dev, "%s%d", + MTD_DEV_TYPE(dev_desc->id->type), + dev_desc->id->num); + mtd_info = get_mtd_device_nm(mtd_dev); + if (IS_ERR(mtd_info)) { + printf("Partition %s not found on device %s!\n", + "nand", mtd_dev); + return 0; + } + + sprintf(mtd_buffer, "mtd=%d", pnum); + memset(&mtd_part, 0, sizeof(mtd_part)); + mtd_part.name = mtd_buffer; + mtd_part.size = part->size; + mtd_part.offset = part->offset; + add_mtd_partitions(mtd_info, &mtd_part, 1); + + err = ubi_mtd_param_parse(mtd_buffer, NULL); + if (err) { + del_mtd_partitions(mtd_info); + return 0; + } + + err = ubi_init(); + if (err) { + del_mtd_partitions(mtd_info); + return 0; + } + + /* Init ubifs */ + ubifs_init(); + + if (ubifs_mount(ubi_part_name)) { + printf("Mount ubifs volume %s fail!\n", + ubi_part_name); + return 0; + } + + /* Try to read one byte for a read test. */ + if (ubifs_load(path, &read_test[0], PAGE_SIZE)) { + /* File not found */ + filelen = 0; + } else + filelen = 1; + + return filelen; +} + int check_recovery_cmd_file(void) { disk_partition_t info; ulong part_length; int filelen; + char *env = NULL; switch (get_boot_device()) { case MMC_BOOT: @@ -1331,7 +1410,22 @@ int check_recovery_cmd_file(void) } break; case NAND_BOOT: - return 0; + env = getenv("mtdparts"); + if (!env) + setenv("mtdparts", MTDPARTS_DEFAULT); + + env = getenv("mtdids"); + if (!env) + setenv("mtdids", MTDIDS_DEFAULT); + + env = getenv("partition"); + if (!env) + setenv("partition", MTD_ACTIVE_PART); + + return check_nand_recovery_cmd_file( + CONFIG_ANDROID_UBIFS_PARTITION_NM, + CONFIG_ANDROID_CACHE_PARTITION_NAND, + CONFIG_ANDROID_RECOVERY_CMD_FILE); break; case SPI_NOR_BOOT: return 0; diff --git a/include/configs/mx50_rd3_android.h b/include/configs/mx50_rd3_android.h new file mode 100644 index 0000000..3d39584 --- /dev/null +++ b/include/configs/mx50_rd3_android.h @@ -0,0 +1,344 @@ +/* + * Copyright (C) 2011 Freescale Semiconductor, Inc. + * + * Configuration settings for the MX50-RD3 Freescale board. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <asm/arch/mx50.h> + + /* High Level Configuration Options */ +#define CONFIG_MXC +#define CONFIG_MX50 +#define CONFIG_MX50_RD3 +#define CONFIG_LPDDR2 +#define CONFIG_FLASH_HEADER +#define CONFIG_FLASH_HEADER_OFFSET 0x400 + +#define CONFIG_SKIP_RELOCATE_UBOOT + +/* +#define CONFIG_ARCH_CPU_INIT +#define CONFIG_ARCH_MMU +*/ + +#define CONFIG_MX50_HCLK_FREQ 24000000 +#define CONFIG_SYS_PLL2_FREQ 400 +#define CONFIG_SYS_AHB_PODF 2 +#define CONFIG_SYS_AXIA_PODF 0 +#define CONFIG_SYS_AXIB_PODF 1 + +#define CONFIG_DISPLAY_CPUINFO +#define CONFIG_DISPLAY_BOARDINFO + +#define CONFIG_SYS_64BIT_VSPRINTF + +#define BOARD_LATE_INIT +/* + * Disabled for now due to build problems under Debian and a significant + * increase in the final file size: 144260 vs. 109536 Bytes. + */ + +#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ +#define CONFIG_REVISION_TAG 1 +#define CONFIG_SETUP_MEMORY_TAGS 1 +#define CONFIG_INITRD_TAG 1 + +/* + * Size of malloc() pool + */ +#define CONFIG_SYS_MALLOC_LEN (4 * 1024 * 1024) +/* size in bytes reserved for initial data */ +#define CONFIG_SYS_GBL_DATA_SIZE 128 + +/* + * Hardware drivers + */ +#define CONFIG_MXC_UART +#define CONFIG_UART_BASE_ADDR UART1_BASE_ADDR + +/* allow to overwrite serial and ethaddr */ +#define CONFIG_ENV_OVERWRITE +#define CONFIG_CONS_INDEX 1 +#define CONFIG_BAUDRATE 115200 +#define CONFIG_SYS_BAUDRATE_TABLE {9600, 19200, 38400, 57600, 115200} + +/*********************************************************** + * Command definition + ***********************************************************/ + +#include <config_cmd_default.h> + +#define CONFIG_CMD_PING +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_MII +#define CONFIG_CMD_NET +#define CONFIG_NET_RETRY_COUNT 100 +#define CONFIG_NET_MULTI 1 +#define CONFIG_BOOTP_SUBNETMASK +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_DNS + +#define CONFIG_CMD_MMC +#define CONFIG_CMD_ENV + +/*#define CONFIG_CMD */ +#define CONFIG_REF_CLK_FREQ CONFIG_MX50_HCLK_FREQ + +#undef CONFIG_CMD_IMLS + +#define CONFIG_BOOTDELAY 3 + +#define CONFIG_PRIME "FEC0" + +#define CONFIG_LOADADDR 0x70800000 /* loadaddr env var */ +#define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x500000) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "netdev=eth0\0" \ + "ethprime=FEC0\0" \ + "uboot=u-boot.bin\0" \ + "kernel=uImage\0" \ + "rd_loadaddr=0x70D00000\0" \ + "nfsroot=/opt/eldk/arm\0" \ + "bootargs_base=setenv bootargs console=ttymxc0,115200\0"\ + "bootargs_nfs=setenv bootargs ${bootargs} root=/dev/nfs "\ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0"\ + "bootcmd_net=run bootargs_base bootargs_nfs; " \ + "tftpboot ${loadaddr} ${kernel}; bootm\0" \ + "bootcmd=run bootcmd_nand \0" \ + "bootcmd_nand=run bootargs_base bootargs_android;" \ + "sf probe 1;" \ + "sf read ${loadaddr} 0x40000 0x380000;" \ + "sf read ${rd_loadaddr} 0x3C0000 0x40000;" \ + "bootm ${loadaddr} ${rd_loadaddr}\0" \ + "bootargs_android=setenv bootargs ${bootargs} " \ + "androidboot.console=ttymxc0 init=/init " \ + "keypad gpmi:nand ubi.mtd=4\0" \ + "bootcmd_android_recovery=run bootargs_base" \ + " bootargs_android_recovery;" \ + "nand read ${loadaddr} 0x1400000 0x400000; bootm\0" \ + "bootargs_android_recovery=setenv bootargs ${bootargs}" \ + " init=/init keypad gpmi:nand ubi.mtd=3 ubi.mtd=4" \ + " root=ubi0:recovery rootfstype=ubifs\0" \ + + +#define CONFIG_ARP_TIMEOUT 200UL + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP /* undef to save memory */ +#define CONFIG_SYS_PROMPT "MX50_RD3 U-Boot > " +#define CONFIG_AUTO_COMPLETE +#define CONFIG_SYS_CBSIZE 256 /* Console I/O Buffer Size */ +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 /* max number of command args */ +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot Argument Buffer Size */ + +#define CONFIG_SYS_MEMTEST_START 0 /* memtest works on */ +#define CONFIG_SYS_MEMTEST_END 0x10000 + +#undef CONFIG_SYS_CLKS_IN_HZ /* everything, incl board info, in Hz */ + +#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR + +#define CONFIG_SYS_HZ 1000 + +#define CONFIG_CMDLINE_EDITING 1 + +#define CONFIG_FEC0_IOBASE FEC_BASE_ADDR +#define CONFIG_FEC0_PINMUX -1 +#define CONFIG_FEC0_PHY_ADDR -1 +#define CONFIG_FEC0_MIIBASE -1 + +#define CONFIG_GET_FEC_MAC_ADDR_FROM_IIM + +#define CONFIG_MXC_FEC +#define CONFIG_MII +#define CONFIG_MII_GASKET +#define CONFIG_DISCOVER_PHY + +/* + * DDR ZQ calibration + */ +#define CONFIG_ZQ_CALIB + +/* + * I2C Configs + */ +#define CONFIG_CMD_I2C 1 + +#ifdef CONFIG_CMD_I2C + #define CONFIG_HARD_I2C 1 + #define CONFIG_I2C_MXC 1 + #define CONFIG_SYS_I2C_PORT I2C2_BASE_ADDR + #define CONFIG_SYS_I2C_SPEED 100000 + #define CONFIG_SYS_I2C_SLAVE 0xfe +#endif + + +/* + * SPI Configs + */ +#define CONFIG_FSL_SF 1 +#define CONFIG_CMD_SPI +#define CONFIG_CMD_SF +#define CONFIG_SPI_FLASH_IMX_M25PXX 1 +#define CONFIG_SPI_FLASH_CS 1 +#define CONFIG_IMX_CSPI +#define IMX_CSPI_VER_0_7 1 +#define MAX_SPI_BYTES (8 * 4) +#define CONFIG_IMX_SPI_PMIC +#define CONFIG_IMX_SPI_PMIC_CS 0 + +/* + * MMC Configs + */ +#ifdef CONFIG_CMD_MMC + #define CONFIG_MMC 1 + #define CONFIG_GENERIC_MMC + #define CONFIG_IMX_MMC + #define CONFIG_SYS_FSL_ESDHC_NUM 3 + #define CONFIG_SYS_FSL_ESDHC_ADDR 0 + #define CONFIG_SYS_MMC_ENV_DEV 0 + #define CONFIG_DOS_PARTITION 1 + #define CONFIG_CMD_FAT 1 + #define CONFIG_CMD_EXT2 1 + + /* detect whether ESDHC1, ESDHC2, or ESDHC3 is boot device */ + #define CONFIG_DYNAMIC_MMC_DEVNO + + #define CONFIG_BOOT_PARTITION_ACCESS + #define CONFIG_EMMC_DDR_PORT_DETECT + #define CONFIG_EMMC_DDR_MODE + + /* Indicate to esdhc driver which ports support 8-bit data */ + #define CONFIG_MMC_8BIT_PORTS 0x2 /* ports 1 and 2 */ +#endif + +/* + * GPMI Nand Configs + */ +#undef CONFIG_CMD_NAND + +#ifdef CONFIG_CMD_NAND + #define CONFIG_NAND_GPMI + #define CONFIG_GPMI_NFC_SWAP_BLOCK_MARK + #define CONFIG_GPMI_NFC_V2 + + #define CONFIG_GPMI_REG_BASE GPMI_BASE_ADDR + #define CONFIG_BCH_REG_BASE BCH_BASE_ADDR + + #define NAND_MAX_CHIPS 8 + #define CONFIG_SYS_NAND_BASE 0x40000000 + #define CONFIG_SYS_MAX_NAND_DEVICE 1 +#endif + +/* + * APBH DMA Configs + */ +#define CONFIG_APBH_DMA + +#ifdef CONFIG_APBH_DMA + #define CONFIG_APBH_DMA_V2 + #define CONFIG_MXS_DMA_REG_BASE ABPHDMA_BASE_ADDR +#endif + +/*----------------------------------------------------------------------- + * Stack sizes + * + * The stack sizes are set up in start.S using the settings below + */ +#define CONFIG_STACKSIZE (128 * 1024) /* regular stack */ + +/*----------------------------------------------------------------------- + * Physical Memory Map + */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM_1 CSD0_BASE_ADDR +#define PHYS_SDRAM_1_SIZE (512 * 1024 * 1024) +#define iomem_valid_addr(addr, size) \ + (addr >= PHYS_SDRAM_1 && addr <= (PHYS_SDRAM_1 + PHYS_SDRAM_1_SIZE)) + +/*----------------------------------------------------------------------- + * FLASH and environment organization + */ +#define CONFIG_SYS_NO_FLASH + +/* Monitor at beginning of flash */ +#define CONFIG_FSL_ENV_IN_SF + +#define CONFIG_ENV_SECT_SIZE (64 * 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 0x1A00000 +#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 (192 * 1024) +#else + #define CONFIG_ENV_IS_NOWHERE 1 +#endif + +/* + * Android support Configs + */ +/* +#define CONFIG_ANDROID_RECOVERY +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_MMC \ + "setenv bootargs ${bootargs} init=/init root=/dev/mmcblk0p4" \ + " rootfs=ext4 keypad" +#define CONFIG_ANDROID_RECOVERY_BOOTCMD_MMC \ + "run bootargs_base bootargs_android_recovery;" \ + "mmc read 0 ${loadaddr} 0x800 0x2000;bootm" +#define CONFIG_ANDROID_RECOVERY_BOOTARGS_NAND \ + "setenv bootargs ${bootargs} init=/init keypad gpmi:nand ubi.mtd=3 ubi.mtd=4" \ + " root=ubi0:recovery rootfstype=ubifs keypad" +#define CONFIG_ANDROID_RECOVERY_BOOTCMD_NAND \ + "run bootargs_base bootargs_android_recovery;" \ + "nand read ${loadaddr} 0x1400000 0x400000; bootm" +#define CONFIG_ANDROID_RECOVERY_CMD_FILE "/recovery/command" + +#define CONFIG_CMD_UBI +#define CONFIG_CMD_UBIFS +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS +#define MTDIDS_DEFAULT "nand0=nand0" +#define MTDPARTS_DEFAULT "mtdparts=nand0:20M@0x0(BOOT),6M@0x1400000(KERNEL),1M@0x1A00000(MISC),20M@0x1B00000(RECOVERY),350M@0x2F00000(ROOT)" +#define MTD_ACTIVE_PART "nand0,4" +#define CONFIG_RBTREE +#define CONFIG_LZO +*/ + +#define CONFIG_ANDROID_SYSTEM_PARTITION_MMC 2 +#define CONFIG_ANDROID_RECOVERY_PARTITION_MMC 4 +#define CONFIG_ANDROID_CACHE_PARTITION_MMC 6 +#define CONFIG_ANDROID_UBIFS_PARTITION_NM "ROOT" +#define CONFIG_ANDROID_CACHE_PARTITION_NAND "cache" + +#endif /* __CONFIG_H */ diff --git a/include/configs/mx50_rd3_mfg.h b/include/configs/mx50_rd3_mfg.h index 4c13fc9..9feda4a 100644 --- a/include/configs/mx50_rd3_mfg.h +++ b/include/configs/mx50_rd3_mfg.h @@ -108,7 +108,7 @@ #define CONFIG_RD_LOADADDR (CONFIG_LOADADDR + 0x300000) #define CONFIG_BOOTARGS "console=ttymxc0,115200 "\ - "rdinit=/linuxrc" + "rdinit=/linuxrc gpmi:nand" #define CONFIG_BOOTCOMMAND "bootm 0x70800000 0x70B00000" #define CONFIG_ENV_IS_EMBEDDED #define CONFIG_EXTRA_ENV_SETTINGS \ |