From 1120dda8cc9031de70a4f9c9987b204b49c0d2dd Mon Sep 17 00:00:00 2001 From: Sekhar Nori Date: Thu, 6 Apr 2017 14:52:57 +0530 Subject: [PATCH] davinci: omapl138_lcdk: switch to using common mmc args 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 Reviewed-by: Lukasz Majewski Reviewed-by: Tom Rini --- 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 36bb27f2f5..9d90e46b80 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -260,30 +260,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 + #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 -- 2.25.1