[PATCH for next 08/15] ARM: phytec-som-imx6: add boot device emmc and automount

[Stefan Christ]

Hi Sascha,

On Mon, May 02, 2016 at 09:51:56AM +0200, Sascha Hauer wrote:
> On Fri, Apr 29, 2016 at 09:25:28AM +0200, Stefan Christ wrote:
> > Hi Sascha,
> > 
> > > > diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/boot/emmc b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/boot/emmc
> > > > new file mode 100644
> > > > index 0000000..e3cc9e3
> > > > --- /dev/null
> > > > +++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-mira/boot/emmc
> > > > @@ -0,0 +1,5 @@
> > > > +#!/bin/sh
> > > > +
> > > > +global.bootm.image="/mnt/emmc/linuximage"
> > > > +global.bootm.oftree="/mnt/emmc/oftree"
> > > > +global.linux.bootargs.dyn.root="root=/dev/mmcblk3p2 rootwait rw"
> > > 
> > > Does this work reliably? Is there finally a patch upstream that creates
> > > fixed numbers for MMC/SD block devices?
> > 
> > Our kernel tree contains a patch for that. The mmcblk id is derived from the
> > device tree alias index. It isn't a mainline ready solution, since there are
> > some unhandled edge cases in the patch and it's implemented currently only for
> > the driver "sdhci-esdhc-imx".
> 
> There was yet another attempt for consistent mmcblk numbering shot down
> here just last weekend: http://www.spinics.net/lists/arm-kernel/msg501495.html
> 
> Given that there probably never will be a way to (reliably) pass the rootfs via
> root=mmcblkxy, I can't take this patch. I sent a patch which pushes the
> partuuid mechanism from the bootloader spec code to bootm which might
> help to solve this problem here.

Thanks for implementing this feature. Since our kernel and device tree is not
in the root filesystem currently, we cannot use it. We will take a look at the
bootspec to solve this problem.

 
> I applied this series without this patch. This provoked a little merge
> conflict in the patch renaming the environment directory. Please check
> the result in -next.

I just diffed the next branch. So far it looks good. The dropped patch also
introduced an 'automount' setting for the eMMC device. Have you an objection
about this? If no, I would sent an extra patch for that.

--- >8 --- 
diff --git a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount b/arch/arm/boar
index 3659cf7..a059e19 100644
--- a/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount
+++ b/arch/arm/boards/phytec-som-imx6/defaultenv-physom-imx6-phycore/init/automount
@@ -12,3 +12,6 @@ automount /mnt/tftp 'ifup eth0 && mount -t tftp $eth0.serverip /mnt/tftp'
 
 mkdir -p /mnt/mmc
 automount -d /mnt/mmc 'mmc0.probe=1 && [ -e /dev/mmc0.0 ] && mount /dev/mmc0.0 /mnt/mmc'
+
+mkdir -p /mnt/emmc
+automount -d /mnt/emmc 'mmc3.probe=1 && [ -e /dev/mmc3.0 ] && mount /dev/mmc3.0 /mnt/emmc'
--- >8 --- 

Mit freundlichen Grüßen / Kind regards,
	Stefan Christ