diff --git a/README.md b/README.md
index f32777a00044b1af5d491296f6f6deb7813e2b39..7d45bbb31a4be39adf14c42dbee8b6d4873da1b7 100644
--- a/README.md
+++ b/README.md
@@ -80,9 +80,11 @@ and File -> Export -> Export Hardware -> include bitstream
```
$ git clone https://gitedu.hesge.ch/soma/scalp_petalinux.git
$ cd scalp_petalinux
-$ git checkout SCALP-SAFE-v0.01
+$ git checkout SCALP-SAFE-v0.2
```
+**Use version 0.2 only for the GIT scalp_petalinux repository and not for the GIT scalp_firmware repository. The version difference is not an error.**
+
### Create new Petalinux project from a BSP
```
@@ -224,6 +226,8 @@ $ find . -name zynq_spi.o
The image content can be produced by using the **mkenvimage** command.
```
+Do not use this command :
+
$ echo -e "custom_board_name=\"Zynq Scalp Board\"\ncustom_board_version=\"RevB 2008\"\ncustom_board_vendor=\"Hepia CoRES - LSN\"" > images/linux/scalp-u-boot.env
$ /tools/u-boot-tools/mkenvimage -s 0x20000 -o images/linux/scalp-u-boot.env.bin images/linux/scalp-u-boot.env
```
@@ -235,6 +239,8 @@ In my case, I copied the tools produced by U-Boot into the **/tools/u-boot-tools
```
$ petalinux-package --boot --fsbl images/linux/zynq_fsbl.elf --fpga images/linux/system.bit --u-boot --kernel --offset 0x540000 --dtb images/linux/system.dtb --offset 0x520000 --force
+Do not use this command :
+
$ petalinux-package --boot --fsbl images/linux/zynq_fsbl.elf --offset 0x0 --fpga images/linux/system.bit --u-boot --add images/linux/scalp-u-boot.env.bin --offset 0x500000 --kernel --offset 0x540000 --dtb images/linux/system.dtb --offset 0x520000 --force
```
@@ -540,6 +546,8 @@ fi
Finaly build it...
```
+$ petalinux-build -c sja1105-init -x do_cleanall
+$ petalinux-build -c sja1105-init
$ petalinux-build -c sja1105-init -x do_install -f
$ petalinux-build -c rootfs
$ petalinux-build
diff --git a/bsp/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp b/bsp/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp
new file mode 100644
index 0000000000000000000000000000000000000000..6846d91161ed9a27e314f66d41e91d7e3994cf93
Binary files /dev/null and b/bsp/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp differ
diff --git a/scalp_safe_petalinux/.petalinux/metadata b/scalp_safe_petalinux/.petalinux/metadata
index 93d498ef917bc3375d93a8aca60c02d9734dcdc0..ad9d9d04a545e0d8e612519b595fd20fbebbe78b 100644
--- a/scalp_safe_petalinux/.petalinux/metadata
+++ b/scalp_safe_petalinux/.petalinux/metadata
@@ -1,6 +1,6 @@
PETALINUX_VER=2020.2
VALIDATE_HW_CHKSUM=1
HARDWARE_PATH=/home/jo/Documents/Projets/Hepia/scalp_project/scalp_firmware/designs/vivado/scalp_safe_firmware/2020.2/lin64/scalp_safe_firmware/scalp_safe_firmware.xsa
-HARDWARE_CHECKSUM=e4c86ebb7157c318baafe6ea2691035e
+HARDWARE_CHECKSUM=c0e54849f94ffc5aaa53e1cad4e1235f
YOCTO_SDK=5ff8fc5f85d1566b314bb73eaa378212
RFSCONFIG_CHKSUM=269e3949c0bcc4ef769c74fd4481e933
diff --git a/scalp_safe_petalinux/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp b/scalp_safe_petalinux/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp
new file mode 100644
index 0000000000000000000000000000000000000000..6846d91161ed9a27e314f66d41e91d7e3994cf93
Binary files /dev/null and b/scalp_safe_petalinux/SCALP-SAFE-FIRMWARE-BSP-V0.2.bsp differ
diff --git a/scalp_safe_petalinux/project-spec/configs/config b/scalp_safe_petalinux/project-spec/configs/config
index dd4576075b2b365fb95d88df2b6e9c9b4163ec5d..8e56e48da1cf69574124551ca172547fe509d409 100644
--- a/scalp_safe_petalinux/project-spec/configs/config
+++ b/scalp_safe_petalinux/project-spec/configs/config
@@ -195,7 +195,7 @@ CONFIG_SUBSYSTEM_EXTRA_DT_FILES=""
#
CONFIG_SUBSYSTEM_BOOTARGS_AUTO=y
CONFIG_SUBSYSTEM_BOOTARGS_EARLYPRINTK=y
-CONFIG_SUBSYSTEM_BOOTARGS_GENERATED="console=ttyPS0,115200 earlycon"
+
CONFIG_SUBSYSTEM_DEVICETREE_COMPILER_FLAGS="-@"
# CONFIG_SUBSYSTEM_DTB_OVERLAY is not set
# CONFIG_SUBSYSTEM_REMOVE_PL_DTB is not set
@@ -290,3 +290,4 @@ CONFIG_YOCTO_NETWORK_SSTATE_FEEDS_URL="http://petalinux.xilinx.com/sswreleases/r
# User Layers
#
CONFIG_USER_LAYER_0=""
+CONFIG_SUBSYSTEM_BOOTARGS_GENERATED="console=ttyPS0,115200 earlycon"
diff --git a/scalp_safe_petalinux/project-spec/configs/u-boot-xlnx/platform-auto.h b/scalp_safe_petalinux/project-spec/configs/u-boot-xlnx/platform-auto.h
index 1bfbbcdbac2de6e6821e9fa8ae08051e1638771f..16b4f360eeb5412701432ac13900bb56aa53411f 100644
--- a/scalp_safe_petalinux/project-spec/configs/u-boot-xlnx/platform-auto.h
+++ b/scalp_safe_petalinux/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 192.168.1.153
+#define CONFIG_SERVERIP 10.136.135.67
#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_safe_petalinux/project-spec/hw-description/scalp_safe_firmware.bit b/scalp_safe_petalinux/project-spec/hw-description/scalp_safe_firmware.bit
index 4444a48227db9b3859ffcc9bd10049f7397636c9..23eb74d76dece145f45538952c942a7f8de9eec0 100644
Binary files a/scalp_safe_petalinux/project-spec/hw-description/scalp_safe_firmware.bit and b/scalp_safe_petalinux/project-spec/hw-description/scalp_safe_firmware.bit differ
diff --git a/scalp_safe_petalinux/project-spec/hw-description/system.xsa b/scalp_safe_petalinux/project-spec/hw-description/system.xsa
index e71dc988b5fee1b0925040854a4c5caf0deda31b..5d18795d6fe6b33532d6e4287580d2f70772f40f 100644
Binary files a/scalp_safe_petalinux/project-spec/hw-description/system.xsa and b/scalp_safe_petalinux/project-spec/hw-description/system.xsa differ
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/sja1105-init.bb b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/sja1105-init.bb
index ba11594a51b81b3804525eb8391c2d8689dc40d6..95bd83c909d94527b3e9f1bd6829476ea788d14f 100644
--- a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/sja1105-init.bb
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/sja1105-init.bb
@@ -18,13 +18,13 @@ inherit update-rc.d
INITSCRIPT_NAME = "sja1105-init"
-INITSCRIPT_PARAMS = "start 81 K ."
+INITSCRIPT_PARAMS = "start 99 S ."
do_install() {
install -d ${D}${sysconfdir}/init.d
install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/init.d/sja1105-init
- install -d ${D}${sysconfdir}/rc0.d
- install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rc0.d/K81sja1105-init
+ install -d ${D}${sysconfdir}/rcS.d
+ install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rcS.d/S99sja1105-init
}
FILES_${PN} += "${sysconfdir}/*"
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend b/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
index ea4597a327f3fa806a47465ea6c1a4cdbd6322dd..f97568a051e529424fcbb962230e309238589dc4 100644
--- a/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/u-boot-xlnx_%.bbappend
@@ -1,6 +1,8 @@
FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI += "file://platform-top.h"
+SRC_URI += "file://platform-top.h \
+ file://devtool-fragment.cfg \
+ "
SRC_URI += "file://scalp_uboot.cfg"
SRC_URI += "file://u-boot-setexpt.patch"
SRC_URI += "file://u-boot-scalp-sja1105.patch"