3 files changed, 5 insertions, 5 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 112f287a..33dd732c 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -25,7 +25,7 @@ xilinx-tools:${LAYERDIR}/dynamic-layers/meta-xilinx-tools/recipes-*/*/*.bbappend
 LAYERDEPENDS_xilinx = "core"
 LAYERRECOMMENDS_xilinx = "openembedded-layer chromium-browser-layer"
 
-LAYERSERIES_COMPAT_xilinx = "kirkstone"
+LAYERSERIES_COMPAT_xilinx = "langdale"
 
 SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
   *->zocl \
@@ -46,8 +46,6 @@ SIGGEN_EXCLUDE_SAFE_RECIPE_DEPS += " \
 
 XILINX_RELEASE_VERSION ??= "v2022.2"
 
-XILINX_DEPRECATED[meta-xilinx] = "Kirkstone is not officially supported.  See the meta-xilinx/README.kirkstone file for more information."
-
 BUILDCFG_VARS:append = " XILINX_RELEASE_VERSION"
 
 PREFERRED_VERSION_qemu-xilinx ?= "v6.1.0-xilinx-${XILINX_RELEASE_VERSION}%"
diff --git a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
index aa91f771..7d3d45f3 100644
--- a/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
+++ b/meta-xilinx-core/conf/machine/include/machine-xilinx-default.inc
@@ -33,7 +33,6 @@ XSERVER ?= " \
         xserver-xorg \
         xf86-input-evdev \
         xf86-input-mouse \
-        xf86-input-keyboard \
         xf86-video-fbdev \
         ${XSERVER_EXT} \
         "
diff --git a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
index 5efd99ea..a8f512a7 100644
--- a/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
+++ b/meta-xilinx-core/recipes-bsp/arm-trusted-firmware/arm-trusted-firmware.inc
@@ -75,12 +75,15 @@ EXTRA_OEMAKE:append:versal-net = "${@' VERSAL_NET_ATF_MEM_SIZE=${ATF_MEM_SIZE}'
 ATF_PROVENCORE = "SPD=pncd SPD_PNCD_NS_IRQ=51 ZYNQMP_BL32_MEM_BASE=0x70000000 ZYNQMP_BL32_MEM_SIZE=0x0FF00000"
 EXTRA_OEMAKE:append = "${@bb.utils.contains('MACHINE_FEATURES', 'provencore', ' ${ATF_PROVENCORE}', '', d)}"
 
+# Workaround for bl31.elf has a LOAD segment with RWX permissions
+EXTRA_OEMAKE:append = ' TF_LDFLAGS="--no-warn-rwx-segments --fatal-warnings -O1 --gc-sections"'
+
 do_configure() {
         oe_runmake clean -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM}
 }
 
 do_compile() {
-        oe_runmake -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} RESET_TO_BL31=1 bl31
+        oe_runmake -C ${S} BUILD_BASE=${B} PLAT=${PLATFORM} RESET_TO_BL31=1 bl31 V=1
 }
 
 do_install() {