From f96ab6a48a757ced5b37c1024162e7c5b9a5e1bb Mon Sep 17 00:00:00 2001 From: Fabien Parent Date: Tue, 29 Nov 2016 17:15:02 +0100 Subject: [PATCH] davinci: omapl138_lcdk: improve readability of boot command Improve the readability of the boot command. This will help a later commit that adds DT support. Signed-off-by: Fabien Parent Reviewed-by: Tom Rini --- include/configs/omapl138_lcdk.h | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index fd88f122ae..06a62cd6b1 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -267,7 +267,24 @@ #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 if fatload mmc 0 0xc0600000 boot.scr; then source 0xc0600000; else fatload mmc 0 0xc0700000 uImage; bootm c0700000; fi; else sf probe 0; sf read 0xc0700000 0x80000 0x220000; bootm 0xc0700000; fi" +#define CONFIG_BOOTCOMMAND \ + "if mmc rescan; then " \ + "run mmcboot; " \ + "else " \ + "run spiboot; " \ + "fi" +#define CONFIG_EXTRA_ENV_SETTINGS \ + "mmcboot=" \ + "if fatload mmc 0 0xc0600000 boot.scr; then " \ + "source 0xc0600000; " \ + "else " \ + "fatload mmc 0 0xc0700000 uImage; " \ + "bootm 0xc0700000; " \ + "fi;\0" \ + "spiboot=" \ + "sf probe 0; " \ + "sf read 0xc0700000 0x80000 0x220000; " \ + "bootm 0xc0700000;\0" /* * U-Boot commands -- 2.39.5