diff --git a/scalp_mipi/.petalinux/metadata b/scalp_mipi/.petalinux/metadata index cedfb4a2d119d4296ee4ac6dd97e1ff06e41d1fb..389c7d76d4f15e9d472e8dcf7e1724eba1e8089c 100644 --- a/scalp_mipi/.petalinux/metadata +++ b/scalp_mipi/.petalinux/metadata @@ -1,6 +1,6 @@ PETALINUX_VER=2020.2 VALIDATE_HW_CHKSUM=1 -HARDWARE_CHECKSUM=9530777292ab337e6ffec029633406cf +HARDWARE_CHECKSUM=e455d46a2f79452434efb96ecd7e1436 YOCTO_SDK=5ff8fc5f85d1566b314bb73eaa378212 -RFSCONFIG_CHKSUM=234f2f09c23647961a2fbda891ad049b +RFSCONFIG_CHKSUM=df6c01228307a44cafb11942d9616a09 HARDWARE_PATH=/home/orphee/Documents/recherche/scalp/scalp_firmware/designs/vivado/scalp_mipi/2020.2/lin64/scalp_mipi/scalp_mipi.xsa diff --git a/scalp_mipi/project-spec/configs/rootfs_config b/scalp_mipi/project-spec/configs/rootfs_config index bb422cb8fa91e74bb677bbdf8f2f76fa2490c89f..02bde1df93ae29269ab87b92f60a249b4141e71d 100644 --- a/scalp_mipi/project-spec/configs/rootfs_config +++ b/scalp_mipi/project-spec/configs/rootfs_config @@ -4031,6 +4031,7 @@ CONFIG_pcam5c-stream=y CONFIG_rgbleds-ctrl=y CONFIG_sja1105-conf=y CONFIG_sja1105-init=y +CONFIG_video-mem-dump=y # # user packages diff --git a/scalp_mipi/project-spec/configs/u-boot-xlnx/platform-auto.h b/scalp_mipi/project-spec/configs/u-boot-xlnx/platform-auto.h index 2bda8f7eefccb655db5fd5f318df416defda7779..f439d3c85b7ba54d3b96f44a509452fc9f470cdb 100644 --- a/scalp_mipi/project-spec/configs/u-boot-xlnx/platform-auto.h +++ b/scalp_mipi/project-spec/configs/u-boot-xlnx/platform-auto.h @@ -35,7 +35,7 @@ #define CONFIG_MII #define CONFIG_NET_MULTI #define CONFIG_NETCONSOLE 1 -#define CONFIG_SERVERIP 10.136.125.49 +#define CONFIG_SERVERIP 192.168.1.123 #define CONFIG_IPADDR 192.168.0.10 #define CONFIG_GATEWAYIP 192.168.0.1 #define CONFIG_NETMASK 255.255.255.0 diff --git a/scalp_mipi/project-spec/hw-description/scalp_mipi.bit b/scalp_mipi/project-spec/hw-description/scalp_mipi.bit index 2e6728c13da34ff4a1a5c78d519c88c115787e91..5736615bf7e21b0dede7f3925fb5372859bfa468 100644 Binary files a/scalp_mipi/project-spec/hw-description/scalp_mipi.bit and b/scalp_mipi/project-spec/hw-description/scalp_mipi.bit differ diff --git a/scalp_mipi/project-spec/hw-description/system.xsa b/scalp_mipi/project-spec/hw-description/system.xsa index 027074128e7056a6435e4303006f8b584e335f68..4cc81ca3f10d5ac769f28a8a0705eef95783ed21 100644 Binary files a/scalp_mipi/project-spec/hw-description/system.xsa and b/scalp_mipi/project-spec/hw-description/system.xsa differ diff --git a/scalp_mipi/project-spec/meta-user/conf/user-rootfsconfig b/scalp_mipi/project-spec/meta-user/conf/user-rootfsconfig index 58548f04aa6f42e4cabf5f97b2778187675091d8..3869097fd191baca9b1e2cd8b9befe2c1d719809 100644 --- a/scalp_mipi/project-spec/meta-user/conf/user-rootfsconfig +++ b/scalp_mipi/project-spec/meta-user/conf/user-rootfsconfig @@ -10,3 +10,4 @@ CONFIG_bitstream-conf CONFIG_rgbleds-ctrl CONFIG_i2c1-test CONFIG_pcam5c-stream +CONFIG_video-mem-dump diff --git a/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/.gdbinit b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/.gdbinit new file mode 100644 index 0000000000000000000000000000000000000000..760896a756bada91c6625fe928d9dfbb17efd8bf --- /dev/null +++ b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/.gdbinit @@ -0,0 +1,3 @@ +# Load the PetaLinux SDK main gdbinit script +source plnx_gdbinit + diff --git a/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/README b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/README new file mode 100644 index 0000000000000000000000000000000000000000..195daf81ccfd799c5e1fee9dc13578c8ada9eb9f --- /dev/null +++ b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/README @@ -0,0 +1,30 @@ +PetaLinux User Application Template +=================================== + +This directory contains a PetaLinux user application created from a template. + +You can easily import any already built application or script by copying +it into this directory, and editing the automatically generated Makefile +as described below. + +Modify the "install:" target in Makefile to use $(TARGETINST) to install your +prebuilt application or script to the host copy of the target file system +referring to the comments of the "install:" target. + +Before building the application, you will need to enable the application +from PetaLinux menuconfig by running: + "petalinux-config -c rootfs" +You will see your application in the "apps --->" submenu. + +To install your prebuilt application or script to the target file system +copy on the host, simply run the command. + "petalinux-build -c rootfs/video-mem-dump" + +You will also need to rebuild PetaLinux bootable images so that the images +is updated with the updated target filesystem copy, run this command: + "petalinux-build -c rootfs" + +You can also run one PetaLinux command to install the application to the +target filesystem host copy and update the bootable images as follows: + "petalinux-build" + diff --git a/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/files/video-mem-dump b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/files/video-mem-dump new file mode 100644 index 0000000000000000000000000000000000000000..8fe3fe87edc5af62150a315288c4e2091d9f3142 --- /dev/null +++ b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/files/video-mem-dump @@ -0,0 +1,13 @@ +#!/bin/sh +addr=0xe100000 +width=640 +height=10 +size=$(($width*$height/4-1)) +rm -f mem.txt +for i in `seq 0 $size` +do + data=$(devmem $(($addr+$i*0x40)) 64) + parsed_data=$(awk -Fx '{print $2}' <<< $data) + echo -n $parsed_data >> mem.txt +done +echo "Done." diff --git a/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/video-mem-dump.bb b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/video-mem-dump.bb new file mode 100644 index 0000000000000000000000000000000000000000..09b9cb9ebe65074c8e9a8ce0671b8066462808f2 --- /dev/null +++ b/scalp_mipi/project-spec/meta-user/recipes-apps/video-mem-dump/video-mem-dump.bb @@ -0,0 +1,18 @@ +# +# This file is the video-mem-dump recipe. +# + +SUMMARY = "Simple video-mem-dump application" +SECTION = "PETALINUX/apps" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302" + +SRC_URI = "file://video-mem-dump \ + " + +S = "${WORKDIR}" + +do_install() { + install -d ${D}/${bindir} + install -m 0755 ${S}/video-mem-dump ${D}/${bindir} +} diff --git a/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/pl-user.dtsi b/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/pl-user.dtsi index 245b49368717a1ae167f916c4323542cb585109c..4fcbbe2e7057ff4e7368c119e99f74cff4a70143 100644 --- a/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/pl-user.dtsi +++ b/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/pl-user.dtsi @@ -95,7 +95,7 @@ xlnx,max-lanes = <2>; xlnx,mipi-slv-int = <0x0>; xlnx,ooc-vid-clk = "6.666"; - xlnx,ppc = <1>; + xlnx,ppc = <2>; xlnx,rcve-alt-deskew-seq = "false"; xlnx,rcve-deskew-seq = "false"; xlnx,share-idlyctrl = "true"; diff --git a/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/system-user.dtsi b/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/system-user.dtsi index df17d9b2aa41d7d508aa0febd729309ca5590254..04d2cbbb421963085e03389148fe0bb55e9a4003 100644 --- a/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/system-user.dtsi +++ b/scalp_mipi/project-spec/meta-user/recipes-bsp/device-tree/files/system-user.dtsi @@ -323,9 +323,6 @@ regulator-name = "1v8"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; - //gpio = <&gpio0 58 GPIO_ACTIVE_HIGH>; - //startup-delay-us = <50000>; - //enable-active-high; }; pcam_2v8: regulator-2v8 { compatible = "regulator-fixed";