Message ID | 20170415193039.10170-1-xypron.glpk@gmx.de |
---|---|
State | Accepted |
Commit | 1f677e4266b1265fca9c8cc93f755900b3ce7503 |
Delegated to: | Tom Rini |
Headers | show |
On 2017-04-15, xypron.glpk@gmx.de wrote: > To enable automatic booting from SD card or eMMC the MMC > devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES. > > Booting from SD card, eMMC, and DHCP are tried in sequence. > A missing or failing device is gracefully handled. > > Cc: Andreas Färber <afaerber@suse.de> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Tested booting from microSD on an odroid-c2. Tested-by: Vagrant Cascadian <vagrant@debian.org> live well, vagrant > --- > v3: > Adjust patch title to reflect that this patch applies to all > gxbb boards. > Vega S95 Telos has 3 MMC devices. > So add MMC 2. > v2: > odroid-c2: enable MMC as boot target > https://lists.denx.de/pipermail/u-boot/2017-April/287358.html > Enhance commit message to clearly indicate how the > boot targets are sequenced. > v1: > This is a resubmission of > https://lists.denx.de/pipermail/u-boot/2017-April/287315.html > where this patch was part of patch series which was no longer applicable. > --- > include/configs/meson-gxbb-common.h | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h > index cc2b5b61d4..997ce2df19 100644 > --- a/include/configs/meson-gxbb-common.h > +++ b/include/configs/meson-gxbb-common.h > @@ -39,6 +39,9 @@ > #include <config_distro_defaults.h> > > #define BOOT_TARGET_DEVICES(func) \ > + func(MMC, mmc, 0) \ > + func(MMC, mmc, 1) \ > + func(MMC, mmc, 2) \ > func(DHCP, dhcp, na) > > #include <config_distro_bootcmd.h>
Am 15.04.2017 um 21:30 schrieb Heinrich Schuchardt: > To enable automatic booting from SD card or eMMC the MMC > devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES. > > Booting from SD card, eMMC, and DHCP are tried in sequence. > A missing or failing device is gracefully handled. > > Cc: Andreas Färber <afaerber@suse.de> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> Reviewed-by: Andreas Färber <afaerber@suse.de> The issues with SDIO mmc 0 are being investigated at a different level, so I think it is okay to merge this generalized version for -rc3. Once done, Vagrant's PXE addition can be rebased. Thanks, Andreas
Am 19.04.2017 um 07:12 schrieb Andreas Färber: > Am 15.04.2017 um 21:30 schrieb Heinrich Schuchardt: >> To enable automatic booting from SD card or eMMC the MMC >> devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES. >> >> Booting from SD card, eMMC, and DHCP are tried in sequence. >> A missing or failing device is gracefully handled. >> >> Cc: Andreas Färber <afaerber@suse.de> >> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > > Reviewed-by: Andreas Färber <afaerber@suse.de> > > The issues with SDIO mmc 0 are being investigated at a different level, > so I think it is okay to merge this generalized version for -rc3. Ping? In case it helps, I can by now also add a second Tested-by: Andreas Färber <afaerber@suse.de> Regards, Andreas > Once done, Vagrant's PXE addition can be rebased. > > Thanks, > Andreas
On Sat, Apr 15, 2017 at 09:30:39PM +0200, xypron.glpk@gmx.de wrote: > To enable automatic booting from SD card or eMMC the MMC > devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES. > > Booting from SD card, eMMC, and DHCP are tried in sequence. > A missing or failing device is gracefully handled. > > Cc: Andreas Färber <afaerber@suse.de> > Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> > Tested-by: Vagrant Cascadian <vagrant@debian.org> > Reviewed-by: Andreas Färber <afaerber@suse.de> > Tested-by: Andreas Färber <afaerber@suse.de> Applied to u-boot/master, thanks!
diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index cc2b5b61d4..997ce2df19 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -39,6 +39,9 @@ #include <config_distro_defaults.h> #define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(MMC, mmc, 1) \ + func(MMC, mmc, 2) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h>
To enable automatic booting from SD card or eMMC the MMC devices 0, 1, and 2 are added to the BOOT_TARGET_DEVICES. Booting from SD card, eMMC, and DHCP are tried in sequence. A missing or failing device is gracefully handled. Cc: Andreas Färber <afaerber@suse.de> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de> --- v3: Adjust patch title to reflect that this patch applies to all gxbb boards. Vega S95 Telos has 3 MMC devices. So add MMC 2. v2: odroid-c2: enable MMC as boot target https://lists.denx.de/pipermail/u-boot/2017-April/287358.html Enhance commit message to clearly indicate how the boot targets are sequenced. v1: This is a resubmission of https://lists.denx.de/pipermail/u-boot/2017-April/287315.html where this patch was part of patch series which was no longer applicable. --- include/configs/meson-gxbb-common.h | 3 +++ 1 file changed, 3 insertions(+)