[packages/kernel] update arm config for 6.3
atler
atler at pld-linux.org
Thu Apr 27 15:11:51 CEST 2023
commit e16a8910d3689a78c38f38be8ff27b04eacf28a0
Author: Jan Palus <jpalus at fastmail.com>
Date: Thu Apr 27 15:09:22 2023 +0200
update arm config for 6.3
due to lack of consensus for fix direction upstream decided to mark
mvebu pci controller as broken. revert the change as it works reasonably
well on turris omnia.
kernel-arm.config | 29 +----------------------------
kernel-multiarch.config | 13 +++++++------
kernel.spec | 2 ++
unbreak-pci-mvebu.patch | 10 ++++++++++
4 files changed, 20 insertions(+), 34 deletions(-)
---
diff --git a/kernel.spec b/kernel.spec
index 7b3e7373..257b8083 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -213,6 +213,7 @@ Patch7000: kernel-inittmpfs.patch
Patch8000: rpi-sound.patch
Patch8001: kernel-pinebook-pro.patch
Patch8002: atheros-disallow-retrain-nongen1-pcie.patch
+Patch8003: unbreak-pci-mvebu.patch
# Do not remove this line, please. It is easier for me to uncomment two lines, then patch
# kernel.spec every time.
@@ -664,6 +665,7 @@ cd linux-%{basever}
%patch8000 -p1
%patch8001 -p1
%patch8002 -p1
+%patch8003 -p1
%endif
%if %{with rt}
diff --git a/kernel-arm.config b/kernel-arm.config
index 4bb85de9..e57b8a54 100644
--- a/kernel-arm.config
+++ b/kernel-arm.config
@@ -20,7 +20,6 @@ ARCH_AIROHA arm=n
#- file arch/arm/mach-bcm/Kconfig goes here
#- file arch/arm/mach-berlin/Kconfig goes here
#- file arch/arm/mach-clps711x/Kconfig goes here
-#- file arch/arm/mach-cns3xxx/Kconfig goes here
#- file arch/arm/mach-davinci/Kconfig goes here
#- file arch/arm/mach-digicolor/Kconfig goes here
#- file arch/arm/mach-dove/Kconfig goes here
@@ -32,7 +31,6 @@ ARCH_AIROHA arm=n
#- file arch/arm/mach-hisi/Kconfig goes here
#- file arch/arm/mach-hpe/Kconfig goes here
#- file arch/arm/mach-imx/Kconfig goes here
-#- file arch/arm/mach-iop32x/Kconfig goes here
#- file arch/arm/mach-ixp4xx/Kconfig goes here
#- file arch/arm/mach-keystone/Kconfig goes here
#- file arch/arm/mach-lpc32xx/Kconfig goes here
@@ -128,7 +126,6 @@ XEN arm=y
STACKPROTECTOR_PER_TASK arm=y
USE_OF arm=y
ATAGS arm=y
-UNUSED_BOARD_FILES arm=n
DEPRECATED_PARAM_STRUCT arm=n
ZBOOT_ROM_TEXT arm=0x0
ZBOOT_ROM_BSS arm=0x0
@@ -199,11 +196,6 @@ ARCH_BCMBCA arm=n
#-
ARCH_BERLIN arm=n
-#-
-#- *** FILE: arch/arm/mach-cns3xxx/Kconfig ***
-#-
-ARCH_CNS3XXX arm=n
-
#-
#- *** FILE: arch/arm/mach-digicolor/Kconfig ***
#-
@@ -254,11 +246,6 @@ ARCH_MXC arm=n
#- Cortex-A platforms
#- Cortex-A/Cortex-M asymmetric multiprocessing platforms
-#-
-#- *** FILE: arch/arm/mach-iop32x/Kconfig ***
-#-
-ARCH_IOP32X arm=n
-
#-
#- *** FILE: arch/arm/mach-ixp4xx/Kconfig ***
#-
@@ -340,9 +327,7 @@ ARCH_OXNAS arm=n
#- *** FILE: arch/arm/mach-pxa/Kconfig ***
#-
ARCH_PXA arm=n
-#- Intel/Marvell Dev Platforms (sorted by hardware release time)
-#- Third Party Dev Platforms (sorted by vendor name)
-#- End-user Products (sorted by vendor name)
+#- Legacy board files
#-
#- *** FILE: arch/arm/mach-qcom/Kconfig ***
@@ -369,18 +354,6 @@ ARCH_ROCKCHIP arm=n
#-
ARCH_RPC arm=n
-#-
-#- *** FILE: arch/arm/mach-s3c/Kconfig.s3c24xx ***
-#-
-ARCH_S3C24XX arm=n
-#- S3C24XX SoCs
-#- S3C2410 Boards
-#- S3C2412 Boards
-#- S3C2416 Boards
-#- S3C2440 Boards
-#- S3C2442 Boards
-#- S3C2443 Boards
-
#-
#- *** FILE: arch/arm/mach-s3c/Kconfig.s3c64xx ***
#-
diff --git a/kernel-multiarch.config b/kernel-multiarch.config
index a0cef2e4..249a34d9 100644
--- a/kernel-multiarch.config
+++ b/kernel-multiarch.config
@@ -598,6 +598,7 @@ PATA_LEGACY all=m
#- Parallel IDE protocol modules
PATA_PARPORT_ATEN all=m
PATA_PARPORT_BPCK all=m
+PATA_PARPORT_BPCK6 arm=m i386=m ppc=m sparc=m
PATA_PARPORT_COMM all=m
PATA_PARPORT_DSTR all=m
PATA_PARPORT_FIT2 all=m
@@ -2071,7 +2072,7 @@ DRM_ANALOGIX_ANX7625 arm=m arm64=m
#- *** FILE: drivers/gpu/drm/bridge/cadence/Kconfig ***
#-
DRM_CDNS_DSI arm=m arm64=m
-DRM_CDNS_DSI_J721E arm64=y
+DRM_CDNS_DSI_J721E arm=y arm64=y
DRM_CDNS_MHDP8546 arm=m arm64=m
#-
@@ -2246,7 +2247,7 @@ DRM_PANEL_EBBG_FT8719 arm=m arm64=m
DRM_PANEL_ELIDA_KD35T133 arm=m arm64=m
DRM_PANEL_FEIXIN_K101_IM2BA02 arm=m arm64=m
DRM_PANEL_FEIYANG_FY07024DI26A30D arm=m arm64=m
-DRM_PANEL_HIMAX_HX8394 arm64=m
+DRM_PANEL_HIMAX_HX8394 arm=m arm64=m
DRM_PANEL_ILITEK_IL9322 arm=m arm64=m
DRM_PANEL_ILITEK_ILI9341 arm=m arm64=m
DRM_PANEL_ILITEK_ILI9881C arm=m arm64=m
@@ -2308,7 +2309,7 @@ DRM_PANEL_TPO_TD043MTEA1 arm=m arm64=m
DRM_PANEL_TPO_TPG110 arm=m arm64=m
DRM_PANEL_TRULY_NT35597_WQXGA arm=m arm64=m
DRM_PANEL_VISIONOX_RM69299 arm=m arm64=m
-DRM_PANEL_VISIONOX_VTDR6130 arm64=m
+DRM_PANEL_VISIONOX_VTDR6130 arm=m arm64=m
DRM_PANEL_WIDECHIPS_WS2401 all=m
DRM_PANEL_XINPENG_XPP055C272 arm=m arm64=m
@@ -4864,7 +4865,7 @@ VIDEO_IMX334 arm=m arm64=m
VIDEO_IMX335 arm=m arm64=m
VIDEO_IMX355 all=m
VIDEO_IMX412 arm=m arm64=m
-VIDEO_IMX415 arm64=m
+VIDEO_IMX415 arm=m arm64=m
VIDEO_MT9M001 all=m
VIDEO_MT9M032 all=m
VIDEO_MT9M111 all=m
@@ -9494,7 +9495,7 @@ BATTERY_DS2781 all=m
BATTERY_DS2782 all=m
BATTERY_LEGO_EV3 arm=m arm64=m
BATTERY_PMU ppc=m
-BATTERY_QCOM_BATTMGR arm64=m
+BATTERY_QCOM_BATTMGR arm=m arm64=m
BATTERY_SAMSUNG_SDI all=y
BATTERY_SBS all=m
CHARGER_SBS all=m
@@ -10311,7 +10312,7 @@ WPCM450_SOC all=m
#- *** FILE: drivers/soc/qcom/Kconfig ***
#-
QCOM_CPR all=m
-QCOM_PMIC_GLINK arm64=m
+QCOM_PMIC_GLINK arm=m arm64=m
#-
#- *** FILE: drivers/soc/rockchip/Kconfig ***
diff --git a/unbreak-pci-mvebu.patch b/unbreak-pci-mvebu.patch
new file mode 100644
index 00000000..e7dfd1e4
--- /dev/null
+++ b/unbreak-pci-mvebu.patch
@@ -0,0 +1,10 @@
+--- linux-6.3/drivers/pci/controller/Kconfig.orig 2023-04-23 21:02:52.000000000 +0200
++++ linux-6.3/drivers/pci/controller/Kconfig 2023-04-27 12:51:50.381600106 +0200
+@@ -9,7 +9,6 @@
+ depends on MVEBU_MBUS
+ depends on ARM
+ depends on OF
+- depends on BROKEN
+ select PCI_BRIDGE_EMUL
+ help
+ Add support for Marvell EBU PCIe controller. This PCIe controller
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/kernel.git/commitdiff/e16a8910d3689a78c38f38be8ff27b04eacf28a0
More information about the pld-cvs-commit
mailing list