[U-Boot] [PATCH v2 0/2] davinci: omapl138_lcdk: load DT when doing EMMC boot
Load the DT when doing EMMC boot.
v1 -> v2: * removed the unecessary PATCH 1, 4 and 5. * no change to PATCH 2 and 3.
Fabien Parent (2): davinci: omapl138_lcdk: improve readability of boot command davinci: omapl138_lcdk: add DT support for EMMC boot
include/configs/omapl138_lcdk.h | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-)
Improve the readability of the boot command. This will help a later commit that adds DT support.
Signed-off-by: Fabien Parent fparent@baylibre.com Reviewed-by: Tom Rini trini@konsulko.com ---
v1 -> v2: * no change
--- 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 854fc47..c896638 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -200,7 +200,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
On Tue, Nov 29, 2016 at 05:15:02PM +0100, Fabien Parent wrote:
Improve the readability of the boot command. This will help a later commit that adds DT support.
Signed-off-by: Fabien Parent fparent@baylibre.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
When booting from EMMC, load the DTB and pass it to the kernel.
Signed-off-by: Fabien Parent fparent@baylibre.com Reviewed-by: Tom Rini trini@konsulko.com ---
v1 -> v2: * No change
--- include/configs/omapl138_lcdk.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index c896638..fe9f94d 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -207,12 +207,16 @@ "run spiboot; " \ "fi" #define CONFIG_EXTRA_ENV_SETTINGS \ + "fdtaddr=0xc0600000\0" \ + "fdtfile=da850-lcdk.dtb\0" \ + "fdtboot=bootm 0xc0700000 - ${fdtaddr};\0" \ "mmcboot=" \ "if fatload mmc 0 0xc0600000 boot.scr; then " \ "source 0xc0600000; " \ "else " \ "fatload mmc 0 0xc0700000 uImage; " \ - "bootm 0xc0700000; " \ + "fatload mmc 0 ${fdtaddr} ${fdtfile}; " \ + "run fdtboot; " \ "fi;\0" \ "spiboot=" \ "sf probe 0; " \
On Tue, Nov 29, 2016 at 05:15:03PM +0100, Fabien Parent wrote:
When booting from EMMC, load the DTB and pass it to the kernel.
Signed-off-by: Fabien Parent fparent@baylibre.com Reviewed-by: Tom Rini trini@konsulko.com
Applied to u-boot/master, thanks!
participants (2)
-
Fabien Parent -
Tom Rini