diff options
| author | Frank Li <Frank.Li@nxp.com> | 2018-08-25 16:42:23 -0500 |
|---|---|---|
| committer | Frank Li <Frank.Li@nxp.com> | 2018-08-27 15:58:35 -0500 |
| commit | 69514b8e04f32dd4273cf7a86e2a723f8f0c1460 (patch) | |
| tree | f7f3eac1c57b6830e27b79d6a7ca0de04f340f6a /include | |
| parent | 79f0199fe8bd77b6e2a6829c93e61af5ee3fa0a4 (diff) | |
MLK-19336-2 mx6qsabreauto nand config add fastboot support
Correct nand partition informatition
Signed-off-by: Frank Li <Frank.Li@nxp.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/mx6sabre_common.h | 13 | ||||
| -rw-r--r-- | include/configs/mx6sxsabreauto.h | 25 |
2 files changed, 17 insertions, 21 deletions
diff --git a/include/configs/mx6sabre_common.h b/include/configs/mx6sabre_common.h index 6d13a617007..ebddff6637b 100644 --- a/include/configs/mx6sabre_common.h +++ b/include/configs/mx6sabre_common.h @@ -44,7 +44,7 @@ #endif #ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\\\;gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) " +#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\;gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs) " #else #define MFG_NAND_PARTITION "" #endif @@ -62,7 +62,9 @@ "weim_uboot=0x08001000\0"\ "weim_base=0x08000000\0"\ "spi_bus=1\0"\ - "spi_uboot=0x400\0" + "spi_uboot=0x400\0" \ + "mtdparts=" MFG_NAND_PARTITION \ + "\0"\ #ifdef CONFIG_SUPPORT_EMMC_BOOT #define EMMC_ENV \ @@ -100,12 +102,13 @@ TEE_ENV \ "fdt_addr=0x18000000\0" \ "fdt_high=0xffffffff\0" \ + "console=" CONSOLE_DEV "\0" \ "bootargs=console=" CONSOLE_DEV ",115200 ubi.mtd=6 " \ - "root=ubi0:rootfs rootfstype=ubifs " \ + "root=ubi0:nandrootfs rootfstype=ubifs " \ MFG_NAND_PARTITION \ "\0" \ - "bootcmd=nand read ${loadaddr} 0x5000000 0x800000;"\ - "nand read ${fdt_addr} 0x6000000 0x100000;"\ + "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ + "nand read ${fdt_addr} 0x5000000 0x100000;"\ "if test ${tee} = yes; then " \ "nand read ${tee_addr} 0x4000000 0x400000;"\ "bootm ${teeaddr} - ${fdt_addr};" \ diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 2fa7f51f0d1..750bc77deea 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -10,6 +10,7 @@ #define __CONFIG_H #include "mx6_common.h" +#include "imx_env.h" #define CONFIG_DBG_MONITOR @@ -20,7 +21,7 @@ #define CONFIG_MXC_UART_BASE UART1_BASE #ifdef CONFIG_NAND_BOOT -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) " +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs) " #else #define MFG_NAND_PARTITION "" #endif @@ -58,22 +59,12 @@ #define CONFIG_MFG_ENV_SETTINGS \ - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \ - "rdinit=/linuxrc " \ - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \ - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \ - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\ - "g_mass_storage.iSerialNumber=\"\" "\ - MFG_NAND_PARTITION \ - "\0" \ + CONFIG_MFG_ENV_SETTINGS_DEFAULT \ "initrd_addr=0x83800000\0" \ "initrd_high=0xffffffff\0" \ - "bootcmd_mfg=run mfgtool_args; " \ - "if test ${tee} = yes; then " \ - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \ - "else " \ - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \ - "fi;\0" + "sd_dev=2\0" \ + "mtdparts=" MFG_NAND_PARTITION \ + "\0"\ #if defined(CONFIG_NAND_BOOT) #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -84,7 +75,7 @@ "fdt_high=0xffffffff\0" \ "console=ttymxc0\0" \ "bootargs=console=ttymxc0,115200 ubi.mtd=6 " \ - "root=ubi0:rootfs rootfstype=ubifs " \ + "root=ubi0:nandrootfs rootfstype=ubifs " \ MFG_NAND_PARTITION \ "\0" \ "bootcmd=nand read ${loadaddr} 0x4000000 0x800000;"\ @@ -259,6 +250,8 @@ #define CONFIG_PHY_ATHEROS #define CONFIG_FEC_MXC_MDIO_BASE ENET_BASE_ADDR +#define CONFIG_SERIAL_TAG + #ifdef CONFIG_CMD_USB #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) |