summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-06-20 22:46:53 +1000
committerNathan Rossi <nathan@nathanrossi.com>2017-06-20 23:07:02 +1000
commit6472328917c240d1ad03561f038a6fe2de8bb382 (patch)
treee021b2794ae742aeab1975e5dc938c594b3206b4
parent2371ecf0a0ad37cb775d4c09e89a1e70ab8f347a (diff)
downloadmeta-xilinx-6472328917c240d1ad03561f038a6fe2de8bb382.tar.gz
u-boot-zynq-uenv.bb: Enforce default load addresses
There is differences in the value of *_load_address environment variables between U-Boot versions (u-boot/u-boot-xlnx) as well as any environment stored in spi flash. Instead of relying on correct configuration being set, set the expected values in uEnv.txt to avoid issues. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-rw-r--r--recipes-bsp/u-boot/u-boot-zynq-uenv.bb2
1 files changed, 2 insertions, 0 deletions
diff --git a/recipes-bsp/u-boot/u-boot-zynq-uenv.bb b/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
index 60b2759c..6cb9b9ec 100644
--- a/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
+++ b/recipes-bsp/u-boot/u-boot-zynq-uenv.bb
@@ -45,7 +45,9 @@ do_compile() {
45 echo "machine_name=${MACHINE}" > ${WORKDIR}/uEnv.txt 45 echo "machine_name=${MACHINE}" > ${WORKDIR}/uEnv.txt
46 46
47 echo "kernel_image=${KERNEL_IMAGETYPE}" >> ${WORKDIR}/uEnv.txt 47 echo "kernel_image=${KERNEL_IMAGETYPE}" >> ${WORKDIR}/uEnv.txt
48 echo "kernel_load_address=0x2080000" >> ${WORKDIR}/uEnv.txt
48 echo "devicetree_image=${@bootfiles_dtb_filepath(d)}" >> ${WORKDIR}/uEnv.txt 49 echo "devicetree_image=${@bootfiles_dtb_filepath(d)}" >> ${WORKDIR}/uEnv.txt
50 echo "devicetree_load_address=0x2000000" >> ${WORKDIR}/uEnv.txt
49 51
50 # bootargs, default to booting with the rootfs device being partition 2 of the first mmc device 52 # bootargs, default to booting with the rootfs device being partition 2 of the first mmc device
51 echo 'bootargs=console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait earlyprintk' >> ${WORKDIR}/uEnv.txt 53 echo 'bootargs=console=ttyPS0,115200 root=/dev/mmcblk0p2 rw rootwait earlyprintk' >> ${WORKDIR}/uEnv.txt