| Message ID | 1472170040-10397-2-git-send-email-festevam@gmail.com |
|---|---|
| State | Accepted |
| Commit | ca4f338e2efece5196eb2178e5f7d07be828da6e |
| Delegated to: | Stefano Babic |
| Headers | show |
Hi Stefano, On Thu, Aug 25, 2016 at 9:07 PM, Fabio Estevam <festevam@gmail.com> wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > warp7 can run different kernel versions, such as NXP 4.1 or mainline. > > Currently the rootfs location is passed via mmcblk number and the > problem with this approach is that the mmcblk number for the eMMC > changes depending on the kernel version. > > In order to avoid such issue, use UUID method to specify the rootfs > location. > > Succesfully tested booting a NXP 4.1 and also a mainline kernel. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> Are you happy with this series? Could it go to 2016.09? Thanks
Hi Fabio, On 02/09/2016 22:35, Fabio Estevam wrote: > Hi Stefano, > > On Thu, Aug 25, 2016 at 9:07 PM, Fabio Estevam <festevam@gmail.com> wrote: >> From: Fabio Estevam <fabio.estevam@nxp.com> >> >> warp7 can run different kernel versions, such as NXP 4.1 or mainline. >> >> Currently the rootfs location is passed via mmcblk number and the >> problem with this approach is that the mmcblk number for the eMMC >> changes depending on the kernel version. >> >> In order to avoid such issue, use UUID method to specify the rootfs >> location. >> >> Succesfully tested booting a NXP 4.1 and also a mainline kernel. >> >> Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > > Are you happy with this series? Yes. > Could it go to 2016.09? I'll merge it. Regards, Stefano
On 26/08/2016 02:07, Fabio Estevam wrote: > From: Fabio Estevam <fabio.estevam@nxp.com> > > warp7 can run different kernel versions, such as NXP 4.1 or mainline. > > Currently the rootfs location is passed via mmcblk number and the > problem with this approach is that the mmcblk number for the eMMC > changes depending on the kernel version. > > In order to avoid such issue, use UUID method to specify the rootfs > location. > > Succesfully tested booting a NXP 4.1 and also a mainline kernel. > > Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> > --- Applied to u-boot-imx, thanks ! Best regards, Stefano Babic
diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 91009a8..a695507 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -29,6 +29,9 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 +#define CONFIG_PARTITION_UUIDS +#define CONFIG_CMD_PART + #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ @@ -45,9 +48,9 @@ "ip_dyn=yes\0" \ "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \ "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \ - "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \ + "finduuid=part uuid mmc 0:2 uuid\0" \ "mmcargs=setenv bootargs console=${console},${baudrate} " \ - "root=${mmcroot}\0" \ + "root=PARTUUID=${uuid} rootwait rw\0" \ "loadbootscript=" \ "fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ "bootscript=echo Running bootscript from mmc ...; " \ @@ -55,6 +58,7 @@ "loadimage=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${image}\0" \ "loadfdt=fatload mmc ${mmcdev}:${mmcpart} ${fdt_addr} ${fdt_file}\0" \ "mmcboot=echo Booting from mmc ...; " \ + "run finduuid; " \ "run mmcargs; " \ "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ "if run loadfdt; then " \ @@ -113,7 +117,6 @@ #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 0 -#define CONFIG_MMCROOT "/dev/mmcblk2p2" /* USB Configs */ #define CONFIG_USB_STORAGE