| Message ID | 20170406092257.15541-6-nsekhar@ti.com |
|---|---|
| State | Accepted |
| Commit | 1120dda8cc9031de70a4f9c9987b204b49c0d2dd |
| Headers | show |
| Series | davinci: omapl138_lcdk: align mmcboot with rest of TI boards | expand |
On Thu, 6 Apr 2017 14:52:57 +0530 Sekhar Nori <nsekhar@ti.com> wrote: > Now that we have common MMC/SD boot environment > variables that can be used across TI platforms, > switch OMAP-L138 LCDK to use them. > > As a nice side-effect, we get support for using > uEnv.txt on this platform. > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > --- > include/configs/omapl138_lcdk.h | 23 ++++++++++------------- > 1 file changed, 10 insertions(+), 13 deletions(-) > > diff --git a/include/configs/omapl138_lcdk.h > b/include/configs/omapl138_lcdk.h index 599fd5b7a874..e70760402b43 > 100644 --- a/include/configs/omapl138_lcdk.h > +++ b/include/configs/omapl138_lcdk.h > @@ -261,30 +261,27 @@ > #define CONFIG_CMDLINE_TAG > #define CONFIG_REVISION_TAG > #define CONFIG_SETUP_MEMORY_TAGS > -#define CONFIG_BOOTARGS "console=ttyS2,115200n8 > root=/dev/mmcblk0p2 rw rootwait ip=off" #define CONFIG_BOOTCOMMAND \ > - "if mmc rescan; then " \ > + "run envboot; " \ > "run mmcboot; " > - "fi" > > #define DEFAULT_LINUX_BOOT_ENV \ > "loadaddr=0xc0700000\0" \ > "fdtaddr=0xc0600000\0" \ > "scriptaddr=0xc0600000\0" > > +#include <environment/ti/mmc.h> > + > #define CONFIG_EXTRA_ENV_SETTINGS \ > DEFAULT_LINUX_BOOT_ENV \ > + DEFAULT_MMC_TI_ARGS \ > + "bootpart=0:2\0" \ > + "bootdir=/boot\0" \ > + "bootfile=zImage\0" \ > "fdtfile=da850-lcdk.dtb\0" \ > - "fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \ > - "mmcboot=" \ > - "if fatload mmc 0 ${scriptaddr} boot.scr; then " \ > - "source ${scriptaddr}; " \ > - "else " \ > - "fatload mmc 0 ${loadaddr} " \ > - __stringify(CONFIG_BOOTFILE) "; " \ > - "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ > - "run fdtboot; " \ > - "fi;\0" > + "boot_fdt=yes\0" \ > + "boot_fit=0\0" \ > + "console=ttyS2,115200n8\0" > > /* > * U-Boot commands Reviewed-by: Lukasz Majewski <lukma@denx.de> Best regards, Lukasz Majewski -- DENX Software Engineering GmbH, Managing Director: Wolfgang Denk HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd@denx.de
On Thu, Apr 06, 2017 at 02:52:57PM +0530, Sekhar Nori wrote: > Now that we have common MMC/SD boot environment > variables that can be used across TI platforms, > switch OMAP-L138 LCDK to use them. > > As a nice side-effect, we get support for using > uEnv.txt on this platform. > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> Reviewed-by: Tom Rini <trini@konsulko.com> -- Tom
On Thu, Apr 06, 2017 at 02:52:57PM +0530, Sekhar Nori wrote: > Now that we have common MMC/SD boot environment > variables that can be used across TI platforms, > switch OMAP-L138 LCDK to use them. > > As a nice side-effect, we get support for using > uEnv.txt on this platform. > > Signed-off-by: Sekhar Nori <nsekhar@ti.com> > Reviewed-by: Lukasz Majewski <lukma@denx.de> > Reviewed-by: Tom Rini <trini@konsulko.com> Applied to u-boot/master, thanks! -- Tom
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 599fd5b7a874..e70760402b43 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -261,30 +261,27 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_REVISION_TAG #define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTARGS "console=ttyS2,115200n8 root=/dev/mmcblk0p2 rw rootwait ip=off" #define CONFIG_BOOTCOMMAND \ - "if mmc rescan; then " \ + "run envboot; " \ "run mmcboot; " - "fi" #define DEFAULT_LINUX_BOOT_ENV \ "loadaddr=0xc0700000\0" \ "fdtaddr=0xc0600000\0" \ "scriptaddr=0xc0600000\0" +#include <environment/ti/mmc.h> + #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ + DEFAULT_MMC_TI_ARGS \ + "bootpart=0:2\0" \ + "bootdir=/boot\0" \ + "bootfile=zImage\0" \ "fdtfile=da850-lcdk.dtb\0" \ - "fdtboot=bootz ${loadaddr} - ${fdtaddr};\0" \ - "mmcboot=" \ - "if fatload mmc 0 ${scriptaddr} boot.scr; then " \ - "source ${scriptaddr}; " \ - "else " \ - "fatload mmc 0 ${loadaddr} " \ - __stringify(CONFIG_BOOTFILE) "; " \ - "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ - "run fdtboot; " \ - "fi;\0" + "boot_fdt=yes\0" \ + "boot_fit=0\0" \ + "console=ttyS2,115200n8\0" /* * U-Boot commands
Now that we have common MMC/SD boot environment variables that can be used across TI platforms, switch OMAP-L138 LCDK to use them. As a nice side-effect, we get support for using uEnv.txt on this platform. Signed-off-by: Sekhar Nori <nsekhar@ti.com> --- include/configs/omapl138_lcdk.h | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-)