From: Mathew McBride <matt@traverse.com.au>
Date: Sun, 17 Mar 2024 23:51:21 +0000 (+1100)
Subject: kernel/armsr: add config stubs and changes needed for 6.6
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=fb29f702af87715cd94a3e708b0ec1b493106b29;p=openwrt%2Fopenwrt.git

kernel/armsr: add config stubs and changes needed for 6.6

Introduce new configuration options prompted by 6.6 (relative to 6.1).
The kernel arm64 defconfig is used as guide for 'core' options, while
video/camera/other media drivers are turned off by default.

Signed-off-by: Mathew McBride <matt@traverse.com.au>
---

diff --git a/target/linux/armsr/armv7/config-6.6 b/target/linux/armsr/armv7/config-6.6
index 664ef2e05b..18f5cd7c79 100644
--- a/target/linux/armsr/armv7/config-6.6
+++ b/target/linux/armsr/armv7/config-6.6
@@ -1,10 +1,12 @@
 CONFIG_ALIGNMENT_TRAP=y
 CONFIG_ARCH_32BIT_OFF_T=y
 CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y
+CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_ARCH_MULTIPLATFORM=y
+# CONFIG_ARCH_MULTI_V4 is not set
+# CONFIG_ARCH_MULTI_V4T is not set
 CONFIG_ARCH_MULTI_V6_V7=y
 CONFIG_ARCH_MULTI_V7=y
-CONFIG_ARCH_MMAP_RND_BITS=8
 CONFIG_ARCH_NR_GPIO=0
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y
 CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y
@@ -36,6 +38,7 @@ CONFIG_CPU_CACHE_VIPT=y
 CONFIG_CPU_COPY_V6=y
 CONFIG_CPU_CP15=y
 CONFIG_CPU_CP15_MMU=y
+# CONFIG_CPU_DCACHE_WRITETHROUGH is not set
 CONFIG_CPU_HAS_ASID=y
 CONFIG_CPU_PABRT_V7=y
 CONFIG_CPU_SPECTRE=y
@@ -62,6 +65,7 @@ CONFIG_OUTER_CACHE=y
 CONFIG_OUTER_CACHE_SYNC=y
 CONFIG_PAGE_OFFSET=0xC0000000
 CONFIG_PERF_USE_VMALLOC=y
+CONFIG_PHYS_OFFSET=0
 CONFIG_RTC_MC146818_LIB=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SMP_ON_UP=y
@@ -69,10 +73,11 @@ CONFIG_SWP_EMULATE=y
 CONFIG_SYS_SUPPORTS_APM_EMULATION=y
 CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h"
 CONFIG_UNWINDER_ARM=y
+# CONFIG_UNWINDER_FRAME_POINTER is not set
 CONFIG_USE_OF=y
 CONFIG_VFP=y
 CONFIG_VFPv3=y
 CONFIG_XZ_DEC_ARM=y
 CONFIG_XZ_DEC_BCJ=y
-CONFIG_ZBOOT_ROM_BSS=0
-CONFIG_ZBOOT_ROM_TEXT=0
+CONFIG_ZBOOT_ROM_BSS=0x0
+CONFIG_ZBOOT_ROM_TEXT=0x0
diff --git a/target/linux/armsr/armv8/config-6.6 b/target/linux/armsr/armv8/config-6.6
index 0ead973064..7b50fced91 100644
--- a/target/linux/armsr/armv8/config-6.6
+++ b/target/linux/armsr/armv8/config-6.6
@@ -1,5 +1,7 @@
 CONFIG_64BIT=y
 CONFIG_ACPI_APEI=y
+# CONFIG_ACPI_FFH is not set
+# CONFIG_ACPI_FPDT is not set
 CONFIG_ACPI_HMAT=y
 CONFIG_ACPI_PCC=y
 CONFIG_AHCI_IMX=y
@@ -136,6 +138,7 @@ CONFIG_BCM2835_POWER=y
 # CONFIG_BCM2835_THERMAL is not set
 # CONFIG_BCM2835_VCHIQ is not set
 CONFIG_BCM2835_WDT=y
+# CONFIG_BCMASP is not set
 # CONFIG_BCMGENET is not set
 # CONFIG_BCM_CYGNUS_PHY is not set
 # CONFIG_BCM_FLEXRM_MBOX is not set
@@ -179,6 +182,7 @@ CONFIG_CLK_RK3328=y
 CONFIG_CLK_RK3368=y
 CONFIG_CLK_RK3399=y
 CONFIG_CLK_RK3568=y
+CONFIG_CLK_RK3588=y
 CONFIG_CLK_SP810=y
 CONFIG_CLK_SUNXI=y
 CONFIG_CLK_SUNXI_CLOCKS=y
@@ -248,11 +252,14 @@ CONFIG_CRYPTO_SHA2_ARM64_CE=y
 CONFIG_CRYPTO_SHA512_ARM64=y
 CONFIG_CRYPTO_SIMD=y
 # CONFIG_CRYPTO_SM4_ARM64_CE_BLK is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE_CCM is not set
+# CONFIG_CRYPTO_SM4_ARM64_CE_GCM is not set
 # CONFIG_CRYPTO_SM4_ARM64_NEON_BLK is not set
 # CONFIG_DEV_DAX_HMEM is not set
 CONFIG_DMA_BCM2835=y
 CONFIG_DMA_CMA=y
 CONFIG_DMA_DIRECT_REMAP=y
+# CONFIG_DMA_NUMA_CMA is not set
 CONFIG_DMA_SHARED_BUFFER=y
 CONFIG_DMA_SUN6I=y
 CONFIG_DRM=y
@@ -266,17 +273,29 @@ CONFIG_DRM_GEM_SHMEM_HELPER=y
 # CONFIG_DRM_IMX8QXP_PIXEL_LINK is not set
 # CONFIG_DRM_IMX8QXP_PIXEL_LINK_TO_DPI is not set
 # CONFIG_DRM_IMX_DCSS is not set
+# CONFIG_DRM_IMX_LCDC is not set
 CONFIG_DRM_KMS_HELPER=y
 CONFIG_DRM_PANEL=y
 CONFIG_DRM_PANEL_BRIDGE=y
+# CONFIG_DRM_PANEL_HIMAX_HX8394 is not set
+# CONFIG_DRM_PANEL_JADARD_JD9365DA_H3 is not set
+# CONFIG_DRM_PANEL_NEWVISION_NV3051D is not set
+# CONFIG_DRM_PANEL_NOVATEK_NT36523 is not set
 CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y
+# CONFIG_DRM_PANEL_SONY_TD4353_JDI is not set
+# CONFIG_DRM_PANEL_STARTEK_KD070FHFID015 is not set
+# CONFIG_DRM_PANEL_VISIONOX_R66451 is not set
+# CONFIG_DRM_PANEL_VISIONOX_VTDR6130 is not set
 CONFIG_DRM_QXL=y
 # CONFIG_DRM_RCAR_DU is not set
 # CONFIG_DRM_ROCKCHIP is not set
+# CONFIG_DRM_RZG2L_MIPI_DSI is not set
+# CONFIG_DRM_SHMOBILE is not set
 CONFIG_DRM_TTM=y
 CONFIG_DRM_TTM_HELPER=y
 # CONFIG_DRM_V3D is not set
 CONFIG_DRM_VIRTIO_GPU=y
+CONFIG_DRM_VIRTIO_GPU_KMS=y
 CONFIG_DRM_VRAM_HELPER=y
 # CONFIG_DWMAC_SUN8I is not set
 # CONFIG_DWMAC_SUNXI is not set
@@ -335,6 +354,7 @@ CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HW_RANDOM=y
 CONFIG_HW_RANDOM_ARM_SMCCC_TRNG=y
 # CONFIG_HW_RANDOM_HISI is not set
+# CONFIG_HW_RANDOM_HISTB is not set
 CONFIG_HW_RANDOM_VIRTIO=y
 CONFIG_I2C=y
 CONFIG_I2C_ALGOBIT=y
@@ -354,6 +374,7 @@ CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000
 # CONFIG_IMX2_WDT is not set
 # CONFIG_IMX8MM_THERMAL is not set
 # CONFIG_IMX8QXP_ADC is not set
+# CONFIG_IMX93_ADC is not set
 # CONFIG_IMX_DMA is not set
 # CONFIG_IMX_DSP is not set
 CONFIG_IMX_INTMUX=y
@@ -366,6 +387,7 @@ CONFIG_IMX_SCU_PD=y
 # CONFIG_IMX_SC_WDT is not set
 # CONFIG_IMX_SDMA is not set
 # CONFIG_IMX_WEIM is not set
+# CONFIG_INPUT_BBNSM_PWRKEY is not set
 # CONFIG_INPUT_HISI_POWERKEY is not set
 # CONFIG_INPUT_IBM_PANEL is not set
 # CONFIG_INTEL_STRATIX10_RSU is not set
@@ -376,6 +398,7 @@ CONFIG_INTERCONNECT_IMX8MM=y
 CONFIG_INTERCONNECT_IMX8MN=y
 CONFIG_INTERCONNECT_IMX8MP=y
 CONFIG_INTERCONNECT_IMX8MQ=y
+# CONFIG_IOMMUFD is not set
 # CONFIG_IOMMU_DEBUGFS is not set
 # CONFIG_IOMMU_DEFAULT_DMA_LAZY is not set
 CONFIG_IOMMU_DEFAULT_DMA_STRICT=y
@@ -390,6 +413,7 @@ CONFIG_KCMP=y
 # CONFIG_KEYBOARD_IMX_SC_KEY is not set
 # CONFIG_KEYBOARD_SUN4I_LRADC is not set
 CONFIG_KSM=y
+# CONFIG_KUNPENG_HCCS is not set
 CONFIG_KVM=y
 CONFIG_LCD_CLASS_DEVICE=m
 # CONFIG_LCD_PLATFORM is not set
@@ -397,6 +421,7 @@ CONFIG_LCD_CLASS_DEVICE=m
 CONFIG_MARVELL_10G_PHY=y
 # CONFIG_MARVELL_CN10K_DDR_PMU is not set
 # CONFIG_MARVELL_CN10K_TAD_PMU is not set
+# CONFIG_MARVELL_GTI_WDT is not set
 CONFIG_MDIO_BCM_IPROC=y
 CONFIG_MDIO_BUS_MUX_BCM_IPROC=y
 CONFIG_MDIO_SUN4I=y
@@ -495,6 +520,7 @@ CONFIG_PCI_HISI=y
 CONFIG_PCI_HOST_THUNDER_ECAM=y
 CONFIG_PCI_HOST_THUNDER_PEM=y
 CONFIG_PCI_IMX6=y
+CONFIG_PCI_IMX6_HOST=y
 CONFIG_PCI_IOV=y
 CONFIG_PCI_LAYERSCAPE=y
 CONFIG_PCI_PASID=y
@@ -518,6 +544,7 @@ CONFIG_PHY_MVEBU_A38X_COMPHY=y
 CONFIG_PHY_MVEBU_CP110_COMPHY=y
 CONFIG_PHY_NS2_PCIE=y
 CONFIG_PHY_NS2_USB_DRD=y
+# CONFIG_PHY_R8A779F0_ETHERNET_SERDES is not set
 # CONFIG_PHY_RCAR_GEN2 is not set
 CONFIG_PHY_RCAR_GEN3_PCIE=y
 CONFIG_PHY_RCAR_GEN3_USB2=y
@@ -597,12 +624,11 @@ CONFIG_QCOM_QDF2400_ERRATUM_0065=y
 CONFIG_QORIQ_THERMAL=y
 CONFIG_QUEUED_RWLOCKS=y
 CONFIG_QUEUED_SPINLOCKS=y
-CONFIG_RASPBERRYPI_FIRMWARE=y
-CONFIG_RASPBERRYPI_POWER=y
 CONFIG_RANDOMIZE_BASE=y
 CONFIG_RANDOMIZE_MODULE_REGION_FULL=y
 CONFIG_RANDSTRUCT_NONE=y
-CONFIG_RELOCATABLE=y
+CONFIG_RASPBERRYPI_FIRMWARE=y
+CONFIG_RASPBERRYPI_POWER=y
 # CONFIG_RAVB is not set
 CONFIG_RCAR_DMAC=y
 # CONFIG_RCAR_GEN3_THERMAL is not set
@@ -616,6 +642,8 @@ CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_REGULATOR_HI655X=y
 CONFIG_REGULATOR_PFUZE100=y
 # CONFIG_REGULATOR_VEXPRESS is not set
+CONFIG_RELOCATABLE=y
+# CONFIG_RENESAS_ETHER_SWITCH is not set
 CONFIG_RENESAS_OSTM=y
 # CONFIG_RENESAS_RZAWDT is not set
 # CONFIG_RENESAS_RZG2LWDT is not set
@@ -633,6 +661,7 @@ CONFIG_ROCKCHIP_PM_DOMAINS=y
 # CONFIG_ROCKCHIP_SARADC is not set
 # CONFIG_ROCKCHIP_THERMAL is not set
 CONFIG_RODATA_FULL_DEFAULT_ENABLED=y
+# CONFIG_RTC_DRV_BBNSM is not set
 # CONFIG_RTC_DRV_BRCMSTB is not set
 # CONFIG_RTC_DRV_FSL_FTM_ALARM is not set
 # CONFIG_RTC_DRV_IMXDI is not set
@@ -645,6 +674,7 @@ CONFIG_RTC_I2C_AND_SPI=y
 # CONFIG_RZG2L_ADC is not set
 # CONFIG_RZG2L_THERMAL is not set
 CONFIG_RZ_DMAC=y
+CONFIG_RZ_MTU3=y
 CONFIG_SATA_SIL24=y
 # CONFIG_SCHED_CORE is not set
 CONFIG_SCHED_MC=y
@@ -693,6 +723,7 @@ CONFIG_SPI_FSL_LPSPI=y
 CONFIG_SPI_IMX=y
 # CONFIG_SPI_ROCKCHIP_SFC is not set
 # CONFIG_SPI_RSPI is not set
+# CONFIG_SPI_RZV2M_CSI is not set
 # CONFIG_SPI_SH_HSPI is not set
 # CONFIG_SPI_SH_MSIOF is not set
 # CONFIG_SPI_SUN4I is not set
@@ -700,8 +731,11 @@ CONFIG_SPI_IMX=y
 # CONFIG_SPI_SYNQUACER is not set
 CONFIG_SPI_THUNDERX=y
 # CONFIG_SPI_XLP is not set
+# CONFIG_SSIF_IPMI_BMC is not set
 CONFIG_STUB_CLK_HI3660=y
 CONFIG_STUB_CLK_HI6220=y
+# CONFIG_SUN20I_GPADC is not set
+# CONFIG_SUN20I_PPU is not set
 CONFIG_SUN50I_A100_CCU=y
 CONFIG_SUN50I_A100_R_CCU=y
 CONFIG_SUN50I_A64_CCU=y
@@ -734,6 +768,8 @@ CONFIG_TYPEC=y
 # CONFIG_TYPEC_FUSB302 is not set
 # CONFIG_TYPEC_HD3SS3220 is not set
 # CONFIG_TYPEC_MUX_FSA4480 is not set
+# CONFIG_TYPEC_MUX_GPIO_SBU is not set
+# CONFIG_TYPEC_MUX_NB7VPQ904M is not set
 # CONFIG_TYPEC_MUX_PI3USB30532 is not set
 # CONFIG_TYPEC_RT1711H is not set
 # CONFIG_TYPEC_RT1719 is not set
@@ -746,6 +782,7 @@ CONFIG_TYPEC_TCPM=y
 # CONFIG_UACCE is not set
 CONFIG_UNMAP_KERNEL_AT_EL0=y
 # CONFIG_USB_BRCMSTB is not set
+# CONFIG_USB_CDNS2_UDC is not set
 CONFIG_USB_CHIPIDEA=y
 CONFIG_USB_CHIPIDEA_GENERIC=y
 CONFIG_USB_CHIPIDEA_HOST=y
@@ -776,15 +813,25 @@ CONFIG_USB_OHCI_HCD_PLATFORM=y
 CONFIG_USB_OTG=y
 CONFIG_USB_OTG_FSM=y
 CONFIG_USB_RENESAS_USB3=y
+CONFIG_USB_RENESAS_USBF=y
 CONFIG_USB_RENESAS_USBHS=y
 CONFIG_USB_RENESAS_USBHS_HCD=y
 CONFIG_USB_RENESAS_USBHS_UDC=y
+CONFIG_USB_RZV2M_USB3DRD=y
 CONFIG_USB_XHCI_HCD=y
 CONFIG_USB_XHCI_HISTB=y
 CONFIG_USB_XHCI_MVEBU=y
 CONFIG_USB_XHCI_PLATFORM=y
+# CONFIG_USB_XHCI_RCAR is not set
+CONFIG_USB_XHCI_RZV2M=y
 CONFIG_VEXPRESS_CONFIG=y
+# CONFIG_VFIO_AMBA is not set
 CONFIG_VIDEOMODE_HELPERS=y
+# CONFIG_VIDEO_IMX7_CSI is not set
+# CONFIG_VIDEO_IMX8MQ_MIPI_CSI2 is not set
+# CONFIG_VIDEO_IMX8_ISI is not set
+# CONFIG_VIDEO_RZG2L_CRU is not set
+# CONFIG_VIDEO_RZG2L_CSI2 is not set
 CONFIG_VIRTIO_DMA_SHARED_BUFFER=y
 # CONFIG_VIRTIO_IOMMU is not set
 CONFIG_VIRTUALIZATION=y
diff --git a/target/linux/armsr/config-6.6 b/target/linux/armsr/config-6.6
index d1dac69da4..8b4f291c9f 100644
--- a/target/linux/armsr/config-6.6
+++ b/target/linux/armsr/config-6.6
@@ -171,6 +171,7 @@ CONFIG_GPIO_ACPI=y
 CONFIG_GPIO_CDEV=y
 # CONFIG_GPIO_HISI is not set
 CONFIG_GPIO_PL061=y
+# CONFIG_GPIO_VF610 is not set
 CONFIG_HANDLE_DOMAIN_IRQ=y
 CONFIG_HARDIRQS_SW_RESEND=y
 CONFIG_HAS_DMA=y
@@ -178,6 +179,7 @@ CONFIG_HAS_IOMEM=y
 CONFIG_HAS_IOPORT_MAP=y
 CONFIG_HID=y
 CONFIG_HID_GENERIC=y
+CONFIG_HID_SUPPORT=y
 CONFIG_HOTPLUG_CPU=y
 CONFIG_HOTPLUG_PCI_ACPI=y
 CONFIG_HVC_DRIVER=y
@@ -328,9 +330,9 @@ CONFIG_VIRTIO_PCI=y
 CONFIG_VIRTIO_PCI_LEGACY=y
 CONFIG_VIRTIO_PCI_LIB=y
 CONFIG_VMAP_STACK=y
-CONFIG_WATCHDOG_CORE=y
 CONFIG_VT=y
 CONFIG_VT_CONSOLE=y
 # CONFIG_VT_HW_CONSOLE_BINDING is not set
+CONFIG_WATCHDOG_CORE=y
 CONFIG_XPS=y
 CONFIG_ZONE_DMA32=y