petalinux: fixed booting stuff

diff --git a/petalinux/Makefile b/petalinux/Makefile
index 7a71d5bc057649fa2cf88446a9204b2911fd4550..29af8004888595593963a615e82bfc97a9bdc034 100644 (file)
--- a/petalinux/Makefile
+++ b/petalinux/Makefile
@@ -9,7 +9,7 @@ config: .configured
        $(MAKE) subsystems/linux/configs/u-boot/platform-auto.h
        touch .configured
 
-build: .configured
+build: .configured subsystems/linux/configs/u-boot/platform-auto.h
        petalinux-build
        $(MAKE) bootscript images/linux/BOOT.BIN
 

diff --git a/petalinux/bootscript.txt b/petalinux/bootscript.txt
index 3e1e937a1670510a9a9e26345fcc8523f2aa5931..939678d88924cdf6ed128fa88377ef75576c6426 100644 (file)
--- a/petalinux/bootscript.txt
+++ b/petalinux/bootscript.txt
@@ -1,3 +1,5 @@
+echo "Running bootscript ..."
+
 setenv tftp_dir ''
 
 setenv bitstream_image top_wrapper.bit
@@ -7,15 +9,16 @@ setenv kernel_img image.ub
 setenv nfsserverip 192.168.1.75
 setenv nfspath /export/canbench
 
+setenv bootargs ${bootargs} console=ttyPS0,115200
 # Comment out if out want to use compiled-in values.
 # If duplicate parameters are present, the later will take effect.
-setenv bootargs ${bootargs} ip=${ipaddr} nfsroot=${nfsserverip}:${nfspath}
+setenv bootargs ${bootargs} ip=${ipaddr} root=/dev/nfs rw nfsroot=${nfsserverip}:${nfspath}
 
 setenv bitstream_load_address 0x04000000
 
-setenv bitstream_tftp 'tftpboot ${bitstream_load_address} ${tftp_dir}${bitstream_image}'
-setenv dtb_tftp 'tftpboot ${dtbnetstart} ${tftp_dir}${dtb_img}'
-setenv kernel_tftp 'tftpboot ${netstart} ${tftp_dir}${kernel_img}'
+setenv bitstream_tftp 'echo === Loading FPGA bitstream; tftpboot ${bitstream_load_address} ${tftp_dir}${bitstream_image}'
+setenv dtb_tftp 'echo === Loading Device Tree; tftpboot ${dtbnetstart} ${tftp_dir}${dtb_img}'
+setenv kernel_tftp 'echo === Loading Linux kernel; tftpboot ${netstart} ${tftp_dir}${kernel_img}'
 
 setenv bitstream_load 'fpga loadb 0 ${bitstream_load_address} ${filesize}'
 

diff --git a/petalinux/uEnv.txt b/petalinux/uEnv.txt
index 54c95241da99eb20bb3ba91f031118f542208964..a929455720d3698a63a0ed00759902b22f70e4ce 100644 (file)
--- a/petalinux/uEnv.txt
+++ b/petalinux/uEnv.txt
@@ -1,6 +1,6 @@
 ipaddr=192.168.1.16
 serverip=192.168.1.75
-bootscript_addr=${clobstart}
+bootscript_addr=0x01000000
 bootscript_path=bootscript
-tboot=tftpboot ${bootscript_addr} ${serverip}:${bootscript_path} ; source ${bootscript_addr}
+tboot=tftpboot ${bootscript_addr} ${serverip}:${bootscript_path} && source ${bootscript_addr}
 default_bootcmd=run tboot

diff --git a/petalinux/uboot-extra-env.h b/petalinux/uboot-extra-env.h
index 2bbbdf57025aa32ffeb7a238ea043a9f98dd9e86..4785d0e06fac1caa3d6f860d98607d39827c72be 100644 (file)
--- a/petalinux/uboot-extra-env.h
+++ b/petalinux/uboot-extra-env.h
@@ -1,7 +1,8 @@
        /* load uEnv.txt before boot (copied from U-Boot default config) */ \
        "loadbootenv_addr=0x2000000\0" \
        "bootenv=uEnv.txt\0" \
-       "loadbootenv=load mmc 0 ${loadbootenv_addr} ${bootenv}\0" \
+       "loadbootenv_impl=${loadcmd} mmc 0 ${loadbootenv_addr} ${bootenv}; setenv loadcmd\0" \
+       "loadbootenv=setenv loadcmd fatload; if env run loadbootenv_impl; then else setenv loadcmd ext2load; env run loadbootenv_impl; fi\0" \
        "importbootenv=echo Importing environment from SD ...; " "env import -t ${loadbootenv_addr} $filesize\0" \
        "sd_uEnvtxt_existence_test=test -e mmc 0 /uEnv.txt\0" \
        "preboot=if env run sd_uEnvtxt_existence_test; " "then if env run loadbootenv; " "then env run importbootenv; " "fi; " "fi; \0" \