4 files changed, 5 insertions, 51 deletions

diff --git a/meta-xilinx-core/conf/layer.conf b/meta-xilinx-core/conf/layer.conf
index 7663ce2f..e8145be8 100644
--- a/meta-xilinx-core/conf/layer.conf
+++ b/meta-xilinx-core/conf/layer.conf
@@ -69,7 +69,7 @@ PREFERRED_VERSION_u-boot-xlnx ?= "${@d.getVarFlag('XILINX_UBOOT_VERSION', d.getV
 
 XILINX_LINUX_VERSION[v2022.1] = "5.15.19-xilinx-v2022.1%"
 XILINX_LINUX_VERSION[v2022.2] = "5.15.36-xilinx-v2022.2%"
-XILINX_LINUX_VERSION[v2023.1] = "5.15.0-xilinx-v2023.1%"
+XILINX_LINUX_VERSION[v2023.1] = "6.1.0-xilinx-v2023.1%"
 PREFERRED_VERSION_linux-xlnx ?= "${@d.getVarFlag('XILINX_LINUX_VERSION', d.getVar('XILINX_RELEASE_VERSION')) or 'undefined'}"
 
 # Add support to eSDK for gen-machine-conf if it exists
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc
index efd21a18..96c801f1 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-microblaze.inc
@@ -1,5 +1,4 @@
 SRC_URI += " \
-    file://mb-no-tree-loop-distribute-patterns.patch \
     file://microblaze_generic.cfg \
     "
 
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch
deleted file mode 100644
index 5a4d203d..00000000
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx/mb-no-tree-loop-distribute-patterns.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-Disable tree-loop-distribute-patterns CFLAG
-
-Issue: CR-1086247
-
-GCC 10.2.0 added -ftree-loop-distribute-patterns by default with -O2.  This
-is causing a condition where the kernel will no longer boot.
-
-This is a temporary workaround until we can identify the true cause of
-the boot failure.
-
-Symtoms:
-
-earlycon: uartlite_a0 at MMIO 0x40600000 (options '115200n8')
-printk: bootconsole [uartlite_a0] enabled
-cma: Reserved 16 MiB at 0xaec00000
-Linux version 5.10.0-xilinx-v2020.2 (oe-user@oe-host) (microblazeel-xilinx-linux-gcc (GCC) 10.2.0, GNU ld (GNU Binutils) 2.35.0.20200730) #1 Mon Mar 1 12:58:36 UTC 2021
-setup_memory: max_mapnr: 0x40000
-setup_memory: min_low_pfn: 0x80000
-setup_memory: max_low_pfn: 0xb0000
-setup_memory: max_pfn: 0xc0000
-Zone ranges:
-  DMA      [mem 0x0000000080000000-0x00000000afffffff]
-  Normal   empty
-  HighMem  [mem 0x00000000b0000000-0x00000000bfffffff]
-Movable zone start for each node
-Early memory node ranges
-  node   0: [mem 0x0000000080000000-0x00000000bfffffff]
-Initmem setup node 0 [mem 0x0000000080000000-0x00000000bfffffff]
-<hang>
-
-Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-
-diff --git a/arch/microblaze/Makefile b/arch/microblaze/Makefile
-index bb980891816d..e368c35ad21c 100644
---- a/arch/microblaze/Makefile
-+++ b/arch/microblaze/Makefile
-@@ -48,6 +48,10 @@ CPUFLAGS-1 += $(call cc-option,-mcpu=v$(CPU_VER))
- # r31 holds current when in kernel mode
- KBUILD_CFLAGS += -ffixed-r31 $(CPUFLAGS-y) $(CPUFLAGS-1) $(CPUFLAGS-2)
- 
-+# GCC 10.x now has -ftree-loop-distribute-patterns by default in -O2
-+# This causes a boot failure, so disable it
-+KBUILD_CFLAGS += -fno-tree-loop-distribute-patterns
-+
- head-y := arch/microblaze/kernel/head.o
- libs-y += arch/microblaze/lib/
- core-y += arch/microblaze/kernel/
diff --git a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
index 5a1a85db..3fc51ac1 100644
--- a/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
+++ b/meta-xilinx-core/recipes-kernel/linux/linux-xlnx_2023.1.bb
@@ -1,6 +1,8 @@
-LINUX_VERSION = "5.15.0"
+LINUX_VERSION = "6.1.0"
+YOCTO_META ?= "git://git.yoctoproject.org/yocto-kernel-cache;type=kmeta;name=meta;branch=yocto-6.1;destsuffix=yocto-kmeta"
 KBRANCH="master"
-SRCREV = "a876c5230ea6ad568ddf2443bdf0e05c655a0236"
+SRCREV = "bdf00302ed29141c201e9c05b7338db698b2dce9"
+SRCREV_meta = "185bcfcbe480c742247d9117011794c69682914f"
 
 KCONF_AUDIT_LEVEL="0"