@@ -37,7 +37,7 @@ IMAGE_CMD:wic[vardeps] += "GRUB_LINUX_APPEND"
# Linux kernel
PREFERRED_PROVIDER_virtual/kernel ?= "linux-yocto"
-PREFERRED_VERSION_linux-yocto ?= "6.12.%"
+PREFERRED_VERSION_linux-yocto ?= "6.18.%"
KERNEL_IMAGETYPE = "Image"
KERNEL_IMAGETYPE:firmware = "Image.gz"
# add FF-A support in the kernel
@@ -157,7 +157,7 @@ The provided distribution is based on `BusyBox <https://www.busybox.net/>`__ and
+-----------+------------------------------------------------------------------------------------------------+
| bbappend | ``${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-kernel/linux/linux-yocto_%.bbappend`` |
+-----------+------------------------------------------------------------------------------------------------+
-| Recipe | ``${WORKSPACE}/core/meta/recipes-kernel/linux/linux-yocto_6.12.bb`` |
+| Recipe | ``${WORKSPACE}/core/meta/recipes-kernel/linux/linux-yocto_6.18.bb`` |
+-----------+------------------------------------------------------------------------------------------------+
| defconfig | ``${WORKSPACE}/meta-arm/meta-arm-bsp/recipes-kernel/linux/files/corstone1000/defconfig`` |
+-----------+------------------------------------------------------------------------------------------------+
@@ -122,7 +122,7 @@ index b29ac74217e..7f75eae48cc 100644
&{/soc} {
extsys0: remoteproc@1a010310 {
compatible = "arm,corstone1000-extsys";
-@@ -37,3 +46,70 @@
+@@ -37,3 +46,72 @@
firmware-name = "es_flashfw.elf";
};
};
@@ -144,6 +144,8 @@ index b29ac74217e..7f75eae48cc 100644
+/ {
+ ethosu: ethosu@1A050000 {
+ compatible = "arm,ethosu-direct";
++ #address-cells = <1>;
++ #size-cells = <1>;
+
+ // Base address and size of NPU registers
+ reg = <0x1A050000 0x4000>;
@@ -472,7 +472,7 @@ index 000000000000..6afa78ae7ad3
+
+static struct platform_driver arm_rproc_driver = {
+ .probe = arm_rproc_probe,
-+ .remove_new = arm_rproc_remove,
++ .remove = arm_rproc_remove,
+ .driver = {
+ .name = "arm-rproc",
+ .of_match_table = arm_rproc_of_match,
@@ -85,7 +85,7 @@ CONFIG_NLS_CODEPAGE_860=y
CONFIG_NLS_ISO8859_1=y
CONFIG_NLS_ISO8859_15=y
CONFIG_NLS_UTF8=y
-CONFIG_LIBCRC32C=y
+CONFIG_CRC32=y
# CONFIG_SECTION_MISMATCH_WARN_ONLY is not set
CONFIG_DEBUG_FS=y
CONFIG_PANIC_TIMEOUT=5
@@ -117,7 +117,6 @@ CONFIG_MMC_ARMMMCI=y
# CONFIG_MMC_MTK is not set
CONFIG_EXT2_FS=y
# CONFIG_EXT2_FS_XATTR is not set
-CONFIG_EXT3_FS=y
CONFIG_EXT4_FS=y
# CONFIG_EXT4_FS_POSIX_ACL is not set
# CONFIG_EXT4_FS_SECURITY is not set
* Set Linux kernel preferred version for Corstone-1000 to 6.18 * Update Corstone-1000 user guide. * Recent kernel versions removed the deprecated CONFIG_LIBCRC32C Kconfig symbol as part of the CRC library cleanup. Replace CONFIG_LIBCRC32C with CONFIG_CRC32, which provides the generic CRC32/CRC32C library support used by in-kernel consumers. * The ext3 driver was removed historically and ext4 carries compatibility for ext3 on-disk format. * Amend External System patch to adhere to Kernel v6.18 RemoteProc API. * Add #address-cells and #size-cells parameters to ethosu dts node No functional change intended. Signed-off-by: Hugues KAMBA MPIANA <hugues.kambampiana@arm.com> --- meta-arm-bsp/conf/machine/include/corstone1000.inc | 2 +- meta-arm-bsp/documentation/corstone1000/user-guide.rst | 2 +- .../0039-corstone1000-Add-Cortex-A320-support-on-FVP.patch | 4 +++- .../0001-remoteproc-Add-Arm-remoteproc-driver.patch | 2 +- .../recipes-kernel/linux/files/corstone1000/defconfig | 3 +-- 5 files changed, 7 insertions(+), 6 deletions(-)