From 6d4aadaa33448cb79888a7d8e6f13eb47038ec0a Mon Sep 17 00:00:00 2001 From: "H. Nikolaus Schaller" Date: Sat, 12 Dec 2015 22:57:00 +0100 Subject: [PATCH] boot-scr: adjust names to what the default boot script for omap5 is using Signed-off-by: H. Nikolaus Schaller --- Letux/boot-scr/boot-letux-cortex15.txt | 10 +++++----- Letux/boot-scr/boot-pyra.txt | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Letux/boot-scr/boot-letux-cortex15.txt b/Letux/boot-scr/boot-letux-cortex15.txt index b0b2b6905eb..6b93d7ae5f8 100644 --- a/Letux/boot-scr/boot-letux-cortex15.txt +++ b/Letux/boot-scr/boot-letux-cortex15.txt @@ -1,5 +1,5 @@ -setenv devicetree omap5-letux-cortex15+pyra -setenv mmc 0 # mmc number as seen by u-boot where it looks for kernel +setenv fdtfile omap5-letux-cortex15+pyra.dtb +setenv mmcdev 0 # mmc number as seen by u-boot where it looks for kernel setenv kernelmmc 0 # mmc number as seen by kernel setenv defaultdisplay lcd setenv PARTITION 1 # partition where kernel is found (simulates the partition selection mechanism of the GTA04) @@ -9,13 +9,13 @@ setenv PARTITIONTYPE FAT setenv mmcargs 'setenv bootargs elevator=noop console=ttyO2,115200n8 root=/dev/mmcblk${kernelmmc}p2 rw rootwait earlyprintk fixrtc' # load device tree and kernel binary -fatload mmc ${mmc}:${PARTITION} 0x825f0000 ${devicetree}.dtb -fatload mmc ${mmc}:${PARTITION} 0x80300000 uImage +fatload mmc ${mmcdev}:${PARTITION} 0x825f0000 ${devicetree} +fatload mmc ${mmcdev}:${PARTITION} 0x80300000 uImage run mmcargs # allow to overwrite boot args (incl. kernelmmc) -if fatload mmc ${mmc}:${PARTITION} 0x81300000 bootargs.scr +if fatload mmc ${mmcdev}:${PARTITION} 0x81300000 bootargs.scr then source 0x81300000 fi diff --git a/Letux/boot-scr/boot-pyra.txt b/Letux/boot-scr/boot-pyra.txt index f6f071fd121..7ce5bd4c6dc 100644 --- a/Letux/boot-scr/boot-pyra.txt +++ b/Letux/boot-scr/boot-pyra.txt @@ -1,5 +1,5 @@ -setenv devicetree omap5-letux-cortex15+pyra -setenv mmc 0 # mmc number as seen by u-boot where it looks for kernel +setenv fdtfile omap5-letux-cortex15+pyra +setenv mmcdev 0 # mmc number as seen by u-boot where it looks for kernel setenv kernelmmc 1 # mmc number as seen by kernel setenv defaultdisplay lcd setenv PARTITION 1 # partition where kernel is found (simulates the partition selection mechanism of the GTA04) @@ -9,13 +9,13 @@ setenv PARTITIONTYPE FAT setenv mmcargs 'setenv bootargs elevator=noop console=ttyO2,115200n8 root=/dev/mmcblk${kernelmmc}p2 rw rootwait earlyprintk fixrtc' # load device tree and kernel binary -fatload mmc ${mmc}:${PARTITION} 0x825f0000 ${devicetree}.dtb -fatload mmc ${mmc}:${PARTITION} 0x80300000 uImage +fatload mmc ${mmcdev}:${PARTITION} 0x825f0000 ${fdtfile} +fatload mmc ${mmcdev}:${PARTITION} 0x80300000 uImage run mmcargs # allow to overwrite boot args (incl. kernelmmc) -if fatload mmc ${mmc}:${PARTITION} 0x81300000 bootargs.scr +if fatload mmc ${mmcdev}:${PARTITION} 0x81300000 bootargs.scr then source 0x81300000 fi -- 2.39.5