| Message ID | 1410420188-6160-1-git-send-email-guillaume.gardet@free.fr |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
Ping. Guillaume Le 11/09/2014 09:23, Guillaume GARDET a écrit : > This patch adds boot script support to am335x_evm > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> > > --- > include/configs/am335x_evm.h | 29 ++++++++++++++++++----------- > 1 file changed, 18 insertions(+), 11 deletions(-) > > diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h > index df1a6fc..aef0ad3 100644 > --- a/include/configs/am335x_evm.h > +++ b/include/configs/am335x_evm.h > @@ -115,6 +115,9 @@ > "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ > "ip=dhcp\0" \ > "bootenv=uEnv.txt\0" \ > + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ > + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ > + "source ${loadaddr}\0" \ > "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ > "importbootenv=echo Importing environment from mmc ...; " \ > "env import -t -r $loadaddr $filesize\0" \ > @@ -142,17 +145,21 @@ > "mmcboot=mmc dev ${mmcdev}; " \ > "if mmc rescan; then " \ > "echo SD/MMC found on device ${mmcdev};" \ > - "if run loadbootenv; then " \ > - "echo Loaded environment from ${bootenv};" \ > - "run importbootenv;" \ > - "fi;" \ > - "if test -n $uenvcmd; then " \ > - "echo Running uenvcmd ...;" \ > - "run uenvcmd;" \ > - "fi;" \ > - "if run loadimage; then " \ > - "run mmcloados;" \ > - "fi;" \ > + "if run loadbootscript; then " \ > + "run bootscript;" \ > + "else " \ > + "if run loadbootenv; then " \ > + "echo Loaded environment from ${bootenv};" \ > + "run importbootenv;" \ > + "fi;" \ > + "if test -n $uenvcmd; then " \ > + "echo Running uenvcmd ...;" \ > + "run uenvcmd;" \ > + "fi;" \ > + "if run loadimage; then " \ > + "run mmcloados;" \ > + "fi;" \ > + "fi ;" \ > "fi;\0" \ > "spiboot=echo Booting from spi ...; " \ > "run spiargs; " \
On Thu, Sep 11, 2014 at 09:23:08AM +0200, Guillaume GARDET wrote: > This patch adds boot script support to am335x_evm > > Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> > Cc: Tom Rini <trini@ti.com> Applied to u-boot-ti/master, thanks!
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index df1a6fc..aef0ad3 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -115,6 +115,9 @@ "nfsroot=${serverip}:${rootpath},${nfsopts} rw " \ "ip=dhcp\0" \ "bootenv=uEnv.txt\0" \ + "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ "loadbootenv=load mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "importbootenv=echo Importing environment from mmc ...; " \ "env import -t -r $loadaddr $filesize\0" \ @@ -142,17 +145,21 @@ "mmcboot=mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loadimage; then " \ - "run mmcloados;" \ - "fi;" \ + "if run loadbootscript; then " \ + "run bootscript;" \ + "else " \ + "if run loadbootenv; then " \ + "echo Loaded environment from ${bootenv};" \ + "run importbootenv;" \ + "fi;" \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...;" \ + "run uenvcmd;" \ + "fi;" \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ + "fi ;" \ "fi;\0" \ "spiboot=echo Booting from spi ...; " \ "run spiargs; " \
This patch adds boot script support to am335x_evm Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Cc: Tom Rini <trini@ti.com> --- include/configs/am335x_evm.h | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-)