| Message ID | 7e358e7ccb99ac6eee66a6f76d2c3280c66bdaad.1464608199.git.andrew.shadura@collabora.co.uk |
|---|---|
| State | Awaiting Upstream |
| Delegated to: | Stefano Babic |
| Headers | show |
On Mon, May 30, 2016 at 01:37:08PM +0200, Andrew Shadura wrote: > From: Kimmo Surakka <kimmo.surakka@ge.com> > > Add missing ${partnum} to set rootdev correctly when > booting from USB or MMC. > > Signed-off-by: Kimmo Surakka <kimmo.surakka@ge.com> > [Rebased against v2016.05 and adjusted the variable name] > Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> > > Signed-off-by: Andrew Shadura <andrew.shadura@collabora.co.uk> Acked-by: Martin Donnelly <martin.donnelly@ge.com> > --- > include/configs/ge_bx50v3.h | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h > index 98f20c6..4033460 100644 > --- a/include/configs/ge_bx50v3.h > +++ b/include/configs/ge_bx50v3.h > @@ -228,12 +228,12 @@ > > #define CONFIG_MMCBOOTCOMMAND \ > "setenv dev mmc; " \ > - "setenv rootdev mmcblk0p1; " \ > + "setenv rootdev mmcblk0p${partnum}; " \ > \ > "setenv devnum ${sddev}; " \ > "if mmc dev ${devnum}; then " \ > "run tryboot; " \ > - "setenv rootdev mmcblk1p1; " \ > + "setenv rootdev mmcblk1p${partnum}; " \ > "fi; " \ > \ > "setenv devnum ${emmcdev}; " \ > @@ -245,7 +245,7 @@ > "usb start; " \ > "setenv dev usb; " \ > "setenv devnum 0; " \ > - "setenv rootdev sda1; " \ > + "setenv rootdev sda${partnum}; " \ > "run tryboot; " \ > \ > CONFIG_MMCBOOTCOMMAND \ > -- > 2.7.4 >
diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 98f20c6..4033460 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -228,12 +228,12 @@ #define CONFIG_MMCBOOTCOMMAND \ "setenv dev mmc; " \ - "setenv rootdev mmcblk0p1; " \ + "setenv rootdev mmcblk0p${partnum}; " \ \ "setenv devnum ${sddev}; " \ "if mmc dev ${devnum}; then " \ "run tryboot; " \ - "setenv rootdev mmcblk1p1; " \ + "setenv rootdev mmcblk1p${partnum}; " \ "fi; " \ \ "setenv devnum ${emmcdev}; " \ @@ -245,7 +245,7 @@ "usb start; " \ "setenv dev usb; " \ "setenv devnum 0; " \ - "setenv rootdev sda1; " \ + "setenv rootdev sda${partnum}; " \ "run tryboot; " \ \ CONFIG_MMCBOOTCOMMAND \