diff --git a/scalp_safe_petalinux/.petalinux/metadata b/scalp_safe_petalinux/.petalinux/metadata
index ad9d9d04a545e0d8e612519b595fd20fbebbe78b..7d06983b8164440df45c75d90cde1a6ea9f9f0ea 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=c0e54849f94ffc5aaa53e1cad4e1235f
+HARDWARE_CHECKSUM=e4c86ebb7157c318baafe6ea2691035e
YOCTO_SDK=5ff8fc5f85d1566b314bb73eaa378212
-RFSCONFIG_CHKSUM=269e3949c0bcc4ef769c74fd4481e933
+RFSCONFIG_CHKSUM=098862acb0a15bbc6a0d0999eb493baa
diff --git a/scalp_safe_petalinux/project-spec/configs/config b/scalp_safe_petalinux/project-spec/configs/config
index 8e56e48da1cf69574124551ca172547fe509d409..dd4576075b2b365fb95d88df2b6e9c9b4163ec5d 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,4 +290,3 @@ 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/rootfs_config b/scalp_safe_petalinux/project-spec/configs/rootfs_config
index 161507813fdff296262a90b3baa41c9020fd2ad7..b745e0dfec1eeb9b458b8c87a60904ed866d2f23 100644
--- a/scalp_safe_petalinux/project-spec/configs/rootfs_config
+++ b/scalp_safe_petalinux/project-spec/configs/rootfs_config
@@ -4024,6 +4024,7 @@ CONFIG_imagefeature-debug-tweaks=y
#
# CONFIG_gpio-demo is not set
# CONFIG_peekpoke is not set
+CONFIG_sja1105-conf=y
CONFIG_sja1105-init=y
#
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 16b4f360eeb5412701432ac13900bb56aa53411f..1bfbbcdbac2de6e6821e9fa8ae08051e1638771f 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 10.136.135.67
+#define CONFIG_SERVERIP 192.168.1.153
#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 23eb74d76dece145f45538952c942a7f8de9eec0..4444a48227db9b3859ffcc9bd10049f7397636c9 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 5d18795d6fe6b33532d6e4287580d2f70772f40f..e71dc988b5fee1b0925040854a4c5caf0deda31b 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/conf/user-rootfsconfig b/scalp_safe_petalinux/project-spec/meta-user/conf/user-rootfsconfig
index 20fe4d3c43477465727db860a7811011ec2fa041..3e2e33e7e773616f4938bab4c81df882b7da5f2c 100644
--- a/scalp_safe_petalinux/project-spec/meta-user/conf/user-rootfsconfig
+++ b/scalp_safe_petalinux/project-spec/meta-user/conf/user-rootfsconfig
@@ -4,3 +4,4 @@
CONFIG_gpio-demo
CONFIG_peekpoke
CONFIG_sja1105-init
+CONFIG_sja1105-conf
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/.gdbinit b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/.gdbinit
new file mode 100644
index 0000000000000000000000000000000000000000..760896a756bada91c6625fe928d9dfbb17efd8bf
--- /dev/null
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/.gdbinit
@@ -0,0 +1,3 @@
+# Load the PetaLinux SDK main gdbinit script
+source plnx_gdbinit
+
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/README b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/README
new file mode 100644
index 0000000000000000000000000000000000000000..f8921ee1b87b8bbef0dc2a40a918a761f2b7e0b3
--- /dev/null
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/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/sja1105-conf"
+
+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_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/files/sja1105-conf b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/files/sja1105-conf
new file mode 100644
index 0000000000000000000000000000000000000000..07f27b151af6c99e7516a6a9abf5b57404ccf87d
--- /dev/null
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/files/sja1105-conf
@@ -0,0 +1,162 @@
+#!/bin/sh
+
+sja1105_ports_link_up()
+{
+ echo "[INFO] sja1105-conf : sja1105 ports linking up..."
+
+ ip link set swp0_east up
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : swp0_east port is up."
+ else
+ exit 1
+ fi
+
+ ip link set swp2_bottom up
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : swp2_bottom port is up."
+ else
+ exit 1
+ fi
+
+ ip link set swp3_top up
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : swp3_top port is up."
+ else
+ exit 1
+ fi
+
+ ip link set swp4_west up
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : swp4_west port is up."
+ else
+ exit 1
+ fi
+
+ echo "[INFO] sja1105-conf : sja1105 ports linked up."
+}
+
+sja1105_creat_bridge()
+{
+ echo "[INFO] sja1105-conf : Creation and configuration of the bridge in progress..."
+
+ ip link add name br0 type bridge
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Added a new bridge-like interface."
+ else
+ exit 1
+ fi
+
+ ip link set dev br0 type bridge vlan_filtering 1
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Configuration of the bridge interface in VLAN filtering mode."
+ else
+ exit 1
+ fi
+
+ echo "[INFO] sja1105-conf : Creation and configuration of the bridge is done."
+}
+
+sja1105_link_ports_to_bridge()
+{
+ echo "[INFO] sja1105-conf : sja1105 ports are being attached to the bridge..."
+
+ ip link set dev swp0_east master br0
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Addition of the swp0_east interface to the bridge interface."
+ else
+ exit 1
+ fi
+
+ ip link set dev swp2_bottom master br0
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Addition of the swp2_bottom interface to the bridge interface."
+ else
+ exit 1
+ fi
+
+ ip link set dev swp3_top master br0
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Addition of the swp3_top interface to the bridge interface."
+ else
+ exit 1
+ fi
+
+ ip link set dev swp4_west master br0
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Addition of the swp4_west interface to the bridge interface."
+ else
+ exit 1
+ fi
+
+ echo "[INFO] sja1105-conf : sja1105 ports are attached to the bridge."
+}
+
+sja1105_ports_vlan_conf()
+{
+ echo "[INFO] sja1105-conf : sja1105 ports VLAN configuration in progress..."
+
+ bridge vlan add dev swp0_east vid 1 pvid untagged
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Configuration of the swp0_east interface in untagged VLAN mode."
+ else
+ exit 1
+ fi
+
+ bridge vlan add dev swp2_bottom vid 2 pvid untagged
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Configuration of the swp2_bottom interface in untagged VLAN mode."
+ else
+ exit 1
+ fi
+
+ bridge vlan add dev swp3_top vid 3 pvid untagged
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Configuration of the swp3_top interface in untagged VLAN mode."
+ else
+ exit 1
+ fi
+
+ bridge vlan add dev swp4_west vid 4 pvid untagged
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : Configuration of the swp4_west interface in untagged VLAN mode."
+ else
+ exit 1
+ fi
+
+ echo "[INFO] sja1105-conf : sja1105 ports VLAN configuration is done."
+}
+
+sja1105_bridge_link_up()
+{
+ echo "[INFO] sja1105-conf : sja1105 bridge linking up..."
+
+ ip link set br0 up
+
+ if [ "$?" -eq "0" ] ; then
+ echo "[INFO] sja1105-conf : bridge-like interface is up."
+ else
+ exit 1
+ fi
+
+ echo "[INFO] sja1105-conf : sja1105 bridge linked up."
+}
+
+sja1105_ports_link_up
+sja1105_creat_bridge
+sja1105_link_ports_to_bridge
+sja1105_ports_vlan_conf
+sja1105_bridge_link_up
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/sja1105-conf.bb b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/sja1105-conf.bb
new file mode 100644
index 0000000000000000000000000000000000000000..fa8bbbc3f5b3223ce7f0af2993b1b28086462c98
--- /dev/null
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-conf/sja1105-conf.bb
@@ -0,0 +1,18 @@
+#
+# This file is the sja1105-conf recipe.
+#
+
+SUMMARY = "Simple sja1105-conf application"
+SECTION = "PETALINUX/apps"
+LICENSE = "MIT"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
+
+SRC_URI = "file://sja1105-conf \
+ "
+
+S = "${WORKDIR}"
+
+do_install() {
+ install -d ${D}/${bindir}
+ install -m 0755 ${S}/sja1105-conf ${D}/${bindir}
+}
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/files/sja1105-init b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/files/sja1105-init
index 7391c6665ca200cb2066f99cbde73d66f504e891..ecb6d50dbca7277809b8e067e14df8adf04b9f33 100644
--- a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/files/sja1105-init
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/files/sja1105-init
@@ -1,123 +1,51 @@
#!/bin/sh
-
-echo "SJA1105 PetaLinux init script is running..."
-
-ip link set swp0_east up
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : swp0_east port is up."
-else
- exit 1
-fi
-
-ip link set swp2_bottom up
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : swp2_bottom port is up."
-else
- exit 1
-fi
-
-ip link set swp3_top up
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : swp3_top port is up."
-else
- exit 1
-fi
-
-ip link set swp4_west up
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : swp4_west port is up."
-else
- exit 1
-fi
-
-ip link add name br0 type bridge
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Added a new bridge-like interface."
-else
- exit 1
-fi
-
-ip link set dev br0 type bridge vlan_filtering 1
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Configuration of the bridge interface in VLAN filtering mode."
-else
- exit 1
-fi
-
-ip link set dev swp0_east master br0
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Addition of the swp0_east interface to the bridge interface."
-else
- exit 1
-fi
-
-ip link set dev swp2_bottom master br0
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Addition of the swp2_bottom interface to the bridge interface."
-else
- exit 1
-fi
-
-ip link set dev swp3_top master br0
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Addition of the swp3_top interface to the bridge interface."
-else
- exit 1
-fi
-
-ip link set dev swp4_west master br0
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Addition of the swp4_west interface to the bridge interface."
-else
- exit 1
-fi
-
-bridge vlan add dev swp0_east vid 1 pvid untagged
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Configuration of the swp0_east interface in untagged VLAN mode."
-else
- exit 1
-fi
-
-bridge vlan add dev swp2_bottom vid 2 pvid untagged
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Configuration of the swp2_bottom interface in untagged VLAN mode."
-else
- exit 1
-fi
-
-bridge vlan add dev swp3_top vid 3 pvid untagged
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Configuration of the swp3_top interface in untagged VLAN mode."
-else
- exit 1
-fi
-
-bridge vlan add dev swp4_west vid 4 pvid untagged
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : Configuration of the swp4_west interface in untagged VLAN mode."
-else
- exit 1
-fi
-
-ip link set br0 up
-
-if [ "$?" -eq "0" ] ; then
- echo -e "[INFO] sja1105-init : bridge-like interface is up."
-else
- exit 1
-fi
+### BEGIN INIT INFO
+# Provides: sja1105-init
+# Required-Start: $local_fs $network $named $time $syslog
+# Required-Stop: $local_fs $network $named $time $syslog
+# Default-Start: 2 3 4 5
+# Default-Stop: 0 1 6
+# Description: sja1105 init.d script configuration.
+### END INIT INFO
+
+SCRIPT=sja1105-conf
+RUNAS=root
+
+PIDFILE=/var/run/sja1105-init.pid
+LOGFILE=/var/log/sja1105-init.log
+
+start() {
+ if [ -f /var/run/$PIDNAME ] && kill -0 $(cat /var/run/$PIDNAME); then
+ echo 'Service already running' >&2
+ return 1
+ fi
+ echo 'Starting service…' >&2
+ local CMD="$SCRIPT &> \"$LOGFILE\" & echo \$!"
+ su -c "$CMD" $RUNAS > "$PIDFILE"
+ echo 'Service started' >&2
+}
+
+stop() {
+ if [ ! -f "$PIDFILE" ] || ! kill -0 $(cat "$PIDFILE"); then
+ echo 'Service not running' >&2
+ return 1
+ fi
+ echo 'Stopping service…' >&2
+ kill -15 $(cat "$PIDFILE") && rm -f "$PIDFILE"
+ echo 'Service stopped' >&2
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ retart)
+ stop
+ start
+ ;;
+ *)
+ echo "Usage: $0 {start|stop|restart|uninstall}"
+esac
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 95bd83c909d94527b3e9f1bd6829476ea788d14f..fc5d6b0230f6a36e9c7eedba6e4a3082cbdaf510 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,19 @@ inherit update-rc.d
INITSCRIPT_NAME = "sja1105-init"
-INITSCRIPT_PARAMS = "start 99 S ."
+INITSCRIPT_PARAMS = "start 02 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}/rcS.d
- install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rcS.d/S99sja1105-init
+ install -d ${D}${sysconfdir}/rc2.d
+ install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rc2.d/S02sja1105-init
+ install -d ${D}${sysconfdir}/rc3.d
+ install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rc3.d/S02sja1105-init
+ install -d ${D}${sysconfdir}/rc4.d
+ install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rc4.d/S02sja1105-init
+ install -d ${D}${sysconfdir}/rc5.d
+ install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/rc5.d/S02sja1105-init
}
FILES_${PN} += "${sysconfdir}/*"
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~
deleted file mode 100644
index fc35bf825ab00535fd2cffd6578e29582fea0c4f..0000000000000000000000000000000000000000
--- a/scalp_safe_petalinux/project-spec/meta-user/recipes-apps/sja1105-init/sja1105-init.bb~
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# This file is the sja1105-init recipe.
-#
-
-SUMMARY = "Simple sja1105-init application"
-SECTION = "PETALINUX/apps"
-LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda2f7b4f302"
-
-SRC_URI = "file://sja1105-init \
- "
-
-S = "${WORKDIR}"
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-
-inherit update-rc.d
-
-INITSCRIPT_NAME = "sja1105-init"
-
-INITSCRIPT_PARAMS = "start 81 K ."
-
-do_install() {
- install -d ${D}${sysconfdir}/init.d
- install -m 0755 ${S}/sja1105-init ${D}${sysconfdir}/init.d/sja1105-init
-}
-
-FILES_${PN} += "${sysconfdir}/*"
diff --git a/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/files/devtool-fragment.cfg b/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/files/devtool-fragment.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..e4573d7894cb1b07634b3582dc7447bf0c4ea7ab
--- /dev/null
+++ b/scalp_safe_petalinux/project-spec/meta-user/recipes-bsp/u-boot/files/devtool-fragment.cfg
@@ -0,0 +1,73 @@
+CONFIG_API=y
+CONFIG_QSPI_BOOT=y
+CONFIG_SPI_BOOT=y
+CONFIG_LOG=y
+# CONFIG_SPL_LOG is not set
+# CONFIG_TPL_LOG is not set
+CONFIG_LOG_MAX_LEVEL=5
+CONFIG_LOG_CONSOLE=y
+# CONFIG_LOG_TEST is not set
+# CONFIG_LOG_ERROR_RETURN is not set
+CONFIG_SYS_PROMPT="ScalpZynq> "
+CONFIG_BUILD_BIN2C=y
+CONFIG_CMD_CONFIG=y
+CONFIG_CMD_LICENSE=y
+# CONFIG_BOOTM_PLAN9 is not set
+# CONFIG_BOOTM_RTEMS is not set
+# CONFIG_BOOTM_VXWORKS is not set
+CONFIG_CMD_GREPENV=y
+CONFIG_CMD_ERASEENV=y
+CONFIG_CMD_ENV_FLAGS=y
+CONFIG_CMD_NVEDIT_INFO=y
+CONFIG_CMD_EEPROM=y
+CONFIG_CMD_EEPROM_LAYOUT=y
+CONFIG_EEPROM_LAYOUT_HELP_STRING="<not defined>"
+CONFIG_CMD_MEMINFO=y
+CONFIG_CMD_MX_CYCLIC=y
+CONFIG_CMD_FPGA_LOAD_SECURE=y
+CONFIG_CMD_MTD=y
+CONFIG_CMD_SETEXPR=y
+CONFIG_CMD_UBI=y
+CONFIG_CMD_UBIFS=y
+# CONFIG_ENV_IS_IN_UBI is not set
+CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET=0xfa
+CONFIG_SYS_I2C_EEPROM_ADDR=0x53
+CONFIG_MTD_PARTITIONS=y
+CONFIG_SPI_FLASH_MTD=y
+CONFIG_MTD_UBI=y
+CONFIG_MTD_UBI_WL_THRESHOLD=4096
+CONFIG_MTD_UBI_BEB_LIMIT=20
+# CONFIG_MTD_UBI_FASTMAP is not set
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_ZYNQ_SPI=y
+CONFIG_ZYNQ_QSPI=y
+CONFIG_RGMII=y
+CONFIG_FS_JFFS2=y
+CONFIG_RBTREE=y
+CONFIG_LZO=y
+CONFIG_ENV_OFFSET=0x0
+CONFIG_ENV_ADDR=0x500000
+CONFIG_XILINX_OF_BOARD_DTB_ADDR=0x520000
+CONFIG_PACKING=y
+CONFIG_CMD_SJA1105=y
+CONFIG_SCALP_SJA1105=y
+CONFIG_PINCTRL=y
+CONFIG_PINCTRL_FULL=y
+CONFIG_PINCTRL_GENERIC=y
+CONFIG_PINMUX=y
+# CONFIG_PINCONF is not set
+CONFIG_PINCONF_RECURSIVE=y
+# CONFIG_PINCTRL_AT91 is not set
+# CONFIG_PINCTRL_AT91PIO4 is not set
+# CONFIG_PINCTRL_ROCKCHIP_RV1108 is not set
+# CONFIG_PINCTRL_SINGLE is not set
+# CONFIG_PINCTRL_STM32 is not set
+# CONFIG_PINCTRL_STMFX is not set
+CONFIG_DEFAULT_DEVICE_TREE="zynq-scalp"
+# CONFIG_OF_SEPARATE is not set
+CONFIG_OF_EMBED=y
+CONFIG_DM_MDIO=y
+CONFIG_DM_MDIO_MUX=y
+# CONFIG_MDIO_MUX_I2CREG is not set
+# CONFIG_MVMDIO is not set
\ No newline at end of file
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 f97568a051e529424fcbb962230e309238589dc4..747a01b21fdd73fbabf69226a448fcc9db28dccd 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
@@ -3,7 +3,6 @@ FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
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"
SRC_URI += "file://u-boot-zynq-scalp-dts.patch"