From 61b3e9f31eabfba1a155e67c32812922be854716 Mon Sep 17 00:00:00 2001 From: Martin Jerabek Date: Tue, 17 May 2016 23:50:38 +0200 Subject: [PATCH] bootscript: changed IPs, updated paths --- Makefile | 2 +- petalinux/bootscript.txt | 9 ++++++--- petalinux/subsystems/linux/config | 2 +- system/script/dist.tcl | 3 +-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9347c0a..444e90d 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,7 @@ # 2. peta linux # 3. apps (latester) -TFTPROOT := /tftpboot +TFTPROOT := /tftpboot/uzedcan system_project: cd system/script && vivado -mode batch -nolog -nojournal -source recreate.tcl diff --git a/petalinux/bootscript.txt b/petalinux/bootscript.txt index 1da6faa..d7ddeaf 100644 --- a/petalinux/bootscript.txt +++ b/petalinux/bootscript.txt @@ -2,11 +2,14 @@ echo "Running bootscript ..." setenv tftp_dir '' -setenv bitstream_image system.bit -setenv dtb_img system.dtb -setenv kernel_img image.ub +setenv tftp_path /uzedcan +setenv bitstream_image ${tftp_path}/system.bit +setenv dtb_img ${tftp_path}/system.dtb +setenv kernel_img ${tftp_path}/image.ub setenv nfsserverip 192.168.1.75 +#setenv nfsserverip 147.32.86.163 + setenv nfspath /export/canbench setenv bootargs ${bootargs} console=ttyPS0,115200 diff --git a/petalinux/subsystems/linux/config b/petalinux/subsystems/linux/config index e571949..6bee655 100644 --- a/petalinux/subsystems/linux/config +++ b/petalinux/subsystems/linux/config @@ -187,7 +187,7 @@ CONFIG_SUBSYSTEM_UIMAGE_HASH_CRC32=y CONFIG_SUBSYSTEM_COMPRESS_IMAGE=y CONFIG_SUBSYSTEM_DTB_PADDING_SIZE=0x1000 CONFIG_SUBSYSTEM_COPY_TO_TFTPBOOT=y -CONFIG_SUBSYSTEM_TFTPBOOT_DIR="/tftpboot" +CONFIG_SUBSYSTEM_TFTPBOOT_DIR="/tftpboot/uzedcan" # # Firmware Version Configuration diff --git a/system/script/dist.tcl b/system/script/dist.tcl index f4f25e2..35fe1c0 100644 --- a/system/script/dist.tcl +++ b/system/script/dist.tcl @@ -11,8 +11,7 @@ puts "Project dir: $dir" puts "Impl dir: $impl_dir" file copy -force $impl_dir/top_wrapper.hwdef $dir/../system.hdf file copy -force $impl_dir/top_wrapper.bit $dir/../system.bit -file copy -force $dir/../system.hdf /tftpboot/system.hdf -file copy -force $dir/../system.bit /tftpboot/system.bit +file copy -force $dir/../system.bit /tftpboot/uzedcan/system.bit cd $dir/.. exec bootgen -image system.bif -w -process_bitstream bin -- 2.39.2