[as4224/as5114/as4564] Upgrade kernel to 5.15

- Modify Makefile/yml files to use kernel 5.15 - Port peripheral drivers from kernel 5.10 to 5.15 Signed-off-by: Brandon Chuang <[email protected]>
dentproject · Feb 16, 2022 · c3e7db2 · c3e7db2
1 parent 0c04219
commit c3e7db2
Show file tree

Hide file tree

Showing 27 changed files with 20 additions and 3,870 deletions.
diff --git a/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile b/packages/base/any/kernels/5.15-lts/configs/arm64-all/Makefile
@@ -15,7 +15,7 @@ K_PATCH_SERIES=series.arm64
 
 include ../../kconfig.mk
 K_CONFIG := arm64-all.config
-K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb.dtb  freescale/fsl-ls1046a-rdb-sdk.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb
+K_BUILD_TARGET := Image Image.gz freescale/fsl-ls1043a-rdb.dtb  freescale/fsl-ls1046a-rdb-sdk.dtb freescale/fsl-ls2080a-rdb.dtb freescale/fsl-ls2088a-rdb.dtb freescale/fsl-ls1088a-rdb.dtb marvell/accton-as4224.dtb marvell/accton-as5114.dtb marvell/accton-as4564-26p.dtb
 K_COPY_SRC := arch/arm64/boot/Image
 K_COPY_GZIP := 1
 ifndef K_COPY_DST

diff --git a/packages/platforms/accton/arm64/as4224/as4224-52p/modules/PKG.yml b/packages/platforms/accton/arm64/as4224/as4224-52p/modules/PKG.yml
@@ -1 +1 @@
-!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.10-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.15-lts-arm64-all:arm64"
diff --git a/packages/platforms/accton/arm64/as4224/as4224-52p/modules/builds/Makefile b/packages/platforms/accton/arm64/as4224/as4224-52p/modules/builds/Makefile
@@ -1,5 +1,5 @@
-KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
+KERNELS := onl-kernel-5.15-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
 VENDOR := accton
 BASENAME := arm64-accton-as4224-52p
 ARCH := arm64

diff --git a/.../accton/arm64/as4224/as4224-52p/platform-config/r0/src/lib/arm64-accton-as4224-52p-r0.yml b/.../accton/arm64/as4224/as4224-52p/platform-config/r0/src/lib/arm64-accton-as4224-52p-r0.yml
@@ -9,10 +9,10 @@
 arm64-accton-as4224-52p-r0:
   flat_image_tree:
     kernel:
-      <<: *arm64-kernel-5-10
+      <<: *arm64-kernel-5-15
     dtb:
       =: accton-as4224.dtb
-      <<: *arm64-kernel-5-10-package
+      <<: *arm64-kernel-5-15-package
     itb:
       <<: *arm64-itb
 

diff --git a/packages/platforms/accton/arm64/as4224/as4224-52t/modules/PKG.yml b/packages/platforms/accton/arm64/as4224/as4224-52t/modules/PKG.yml
@@ -1 +1 @@
-!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52t KERNELS="onl-kernel-5.10-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52t KERNELS="onl-kernel-5.15-lts-arm64-all:arm64"
diff --git a/packages/platforms/accton/arm64/as4224/as4224-52t/modules/builds/Makefile b/packages/platforms/accton/arm64/as4224/as4224-52t/modules/builds/Makefile
@@ -1,5 +1,5 @@
-KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
+KERNELS := onl-kernel-5.15-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
 VENDOR := accton
 BASENAME := arm64-accton-as4224-52t
 ARCH := arm64

diff --git a/.../accton/arm64/as4224/as4224-52t/platform-config/r0/src/lib/arm64-accton-as4224-52t-r0.yml b/.../accton/arm64/as4224/as4224-52t/platform-config/r0/src/lib/arm64-accton-as4224-52t-r0.yml
@@ -9,10 +9,10 @@
 arm64-accton-as4224-52t-r0:
   flat_image_tree:
     kernel:
-      <<: *arm64-kernel-5-10
+      <<: *arm64-kernel-5-15
     dtb:
       =: accton-as4224.dtb
-      <<: *arm64-kernel-5-10-package
+      <<: *arm64-kernel-5-15-package
     itb:
       <<: *arm64-itb
 

diff --git a/packages/platforms/accton/arm64/as4224/as5114-48x/modules/PKG.yml b/packages/platforms/accton/arm64/as4224/as5114-48x/modules/PKG.yml
@@ -1 +1 @@
-!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as5114-48x KERNELS="onl-kernel-5.10-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as5114-48x KERNELS="onl-kernel-5.15-lts-arm64-all:arm64"
diff --git a/packages/platforms/accton/arm64/as4224/as5114-48x/modules/builds/Makefile b/packages/platforms/accton/arm64/as4224/as5114-48x/modules/builds/Makefile
@@ -1,5 +1,5 @@
-KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
+KERNELS := onl-kernel-5.15-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
 VENDOR := accton
 BASENAME := arm64-accton-as5114-48x
 ARCH := arm64

diff --git a/.../accton/arm64/as4224/as5114-48x/platform-config/r0/src/lib/arm64-accton-as5114-48x-r0.yml b/.../accton/arm64/as4224/as5114-48x/platform-config/r0/src/lib/arm64-accton-as5114-48x-r0.yml
@@ -9,10 +9,10 @@
 arm64-accton-as5114-48x-r0:
   flat_image_tree:
     kernel:
-      <<: *arm64-kernel-5-10
+      <<: *arm64-kernel-5-15
     dtb:
       =: accton-as5114.dtb
-      <<: *arm64-kernel-5-10-package
+      <<: *arm64-kernel-5-15-package
     itb:
       <<: *arm64-itb
 

diff --git a/packages/platforms/accton/arm64/as4224/src/modules-5_6/.gitignore b/packages/platforms/accton/arm64/as4224/src/modules-5_6/.gitignore
diff --git a/packages/platforms/accton/arm64/as4224/src/modules-5_6/Makefile b/packages/platforms/accton/arm64/as4224/src/modules-5_6/Makefile
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.10-lts-arm64-all:arm64"
		!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.15-lts-arm64-all:arm64"