Revert "[as4224/as5114/as4564] Upgrade kernel to 5.15"

This reverts commit c3e7db2.
dentproject · Feb 23, 2022 · 649a8bb · 649a8bb
1 parent c3e7db2
commit 649a8bb
Show file tree

Hide file tree

Showing 27 changed files with 3,870 additions and 20 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 marvell/accton-as4224.dtb marvell/accton-as5114.dtb marvell/accton-as4564-26p.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
 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.15-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.10-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.15-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
+KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
 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-15
+      <<: *arm64-kernel-5-10
     dtb:
       =: accton-as4224.dtb
-      <<: *arm64-kernel-5-15-package
+      <<: *arm64-kernel-5-10-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.15-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52t KERNELS="onl-kernel-5.10-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.15-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
+KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
 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-15
+      <<: *arm64-kernel-5-10
     dtb:
       =: accton-as4224.dtb
-      <<: *arm64-kernel-5-15-package
+      <<: *arm64-kernel-5-10-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.15-lts-arm64-all:arm64"
+!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as5114-48x KERNELS="onl-kernel-5.10-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.15-lts-arm64-all:arm64
-KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules/
+KERNELS := onl-kernel-5.10-lts-arm64-all:arm64
+KMODULES := $(ONL)/packages/platforms/accton/arm64/as4224/src/modules-5_10/
 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-15
+      <<: *arm64-kernel-5-10
     dtb:
       =: accton-as5114.dtb
-      <<: *arm64-kernel-5-15-package
+      <<: *arm64-kernel-5-10-package
     itb:
       <<: *arm64-itb
 

diff --git a/...ccton/arm64/as4224/src/modules/.gitignore → .../arm64/as4224/src/modules-5_10/.gitignore b/...ccton/arm64/as4224/src/modules/.gitignore → .../arm64/as4224/src/modules-5_10/.gitignore
diff --git a/.../accton/arm64/as4224/src/modules/Makefile → ...on/arm64/as4224/src/modules-5_10/Makefile b/.../accton/arm64/as4224/src/modules/Makefile → ...on/arm64/as4224/src/modules-5_10/Makefile
diff --git a/...24/src/modules/arm64-accton-as4224-cpld.c → ...c/modules-5_10/arm64-accton-as4224-cpld.c b/...24/src/modules/arm64-accton-as4224-cpld.c → ...c/modules-5_10/arm64-accton-as4224-cpld.c
diff --git a/...224/src/modules/arm64-accton-as4224-fan.c → ...rc/modules-5_10/arm64-accton-as4224-fan.c b/...224/src/modules/arm64-accton-as4224-fan.c → ...rc/modules-5_10/arm64-accton-as4224-fan.c
diff --git a/...rc/modules/arm64-accton-as4224-gpio-i2c.c → ...dules-5_10/arm64-accton-as4224-gpio-i2c.c b/...rc/modules/arm64-accton-as4224-gpio-i2c.c → ...dules-5_10/arm64-accton-as4224-gpio-i2c.c
diff --git a/...224/src/modules/arm64-accton-as4224-psu.c → ...rc/modules-5_10/arm64-accton-as4224-psu.c b/...224/src/modules/arm64-accton-as4224-psu.c → ...rc/modules-5_10/arm64-accton-as4224-psu.c
diff --git a/...s/accton/arm64/as4224/src/modules/optoe.c → ...ton/arm64/as4224/src/modules-5_10/optoe.c b/...s/accton/arm64/as4224/src/modules/optoe.c → ...ton/arm64/as4224/src/modules-5_10/optoe.c
diff --git a/packages/platforms/accton/arm64/as4224/src/modules-5_6/.gitignore b/packages/platforms/accton/arm64/as4224/src/modules-5_6/.gitignore
@@ -0,0 +1,6 @@
+*.ko
+*.mod*
+*.o
+*.a
+Module.*
+modules.order
diff --git a/packages/platforms/accton/arm64/as4224/src/modules-5_6/Makefile b/packages/platforms/accton/arm64/as4224/src/modules-5_6/Makefile
@@ -0,0 +1,5 @@
+obj-m += arm64-accton-as4224-cpld.o
+obj-m += arm64-accton-as4224-fan.o
+obj-m += arm64-accton-as4224-psu.o
+obj-m += arm64-accton-as4224-gpio-i2c.o
+obj-m += optoe.o
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.15-lts-arm64-all:arm64"
		!include $ONL_TEMPLATES/platform-modules.yml ARCH=arm64 VENDOR=accton BASENAME=arm64-accton-as4224-52p KERNELS="onl-kernel-5.10-lts-arm64-all:arm64"