-
-
Notifications
You must be signed in to change notification settings - Fork 2.8k
Automatic kernel config rewrite
#8902
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,4 +1,4 @@ | ||
| # Armbian defconfig generated with 6.12 | ||
| # Armbian defconfig generated with 6.18 | ||
| # CONFIG_LOCALVERSION_AUTO is not set | ||
| CONFIG_SYSVIPC=y | ||
| CONFIG_POSIX_MQUEUE=y | ||
|
|
@@ -69,8 +69,6 @@ CONFIG_ARCH_K3=y | |
| # CONFIG_NVIDIA_CARMEL_CNP_ERRATUM is not set | ||
| # CONFIG_ROCKCHIP_ERRATUM_3588001 is not set | ||
| CONFIG_ARM64_VA_BITS_48=y | ||
| CONFIG_SCHED_MC=y | ||
| CONFIG_SCHED_SMT=y | ||
| CONFIG_PARAVIRT=y | ||
| CONFIG_COMPAT=y | ||
| # CONFIG_ARM64_SVE is not set | ||
|
|
@@ -89,14 +87,12 @@ CONFIG_CPU_FREQ_GOV_CONSERVATIVE=m | |
| CONFIG_CPUFREQ_DT=y | ||
| CONFIG_ARM_SCMI_CPUFREQ=y | ||
| CONFIG_VIRTUALIZATION=y | ||
| CONFIG_JUMP_LABEL=y | ||
| CONFIG_MODULES=y | ||
| CONFIG_MODULE_UNLOAD=y | ||
| CONFIG_BLK_DEV_INTEGRITY=y | ||
| CONFIG_BLK_DEV_THROTTLING=y | ||
| # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set | ||
| CONFIG_ZSWAP=y | ||
| CONFIG_ZSWAP_ZPOOL_DEFAULT_ZBUD=y | ||
| # CONFIG_COMPAT_BRK is not set | ||
| CONFIG_MEMORY_HOTPLUG=y | ||
| CONFIG_MEMORY_HOTREMOVE=y | ||
|
|
@@ -159,18 +155,22 @@ CONFIG_NETFILTER_XT_TARGET_AUDIT=m | |
| CONFIG_NETFILTER_XT_TARGET_CHECKSUM=m | ||
| CONFIG_NETFILTER_XT_TARGET_CLASSIFY=m | ||
| CONFIG_NETFILTER_XT_TARGET_CONNMARK=m | ||
| CONFIG_NETFILTER_XT_TARGET_CT=m | ||
| CONFIG_NETFILTER_XT_TARGET_DSCP=m | ||
| CONFIG_NETFILTER_XT_TARGET_HL=m | ||
| CONFIG_NETFILTER_XT_TARGET_HMARK=m | ||
| CONFIG_NETFILTER_XT_TARGET_IDLETIMER=m | ||
| CONFIG_NETFILTER_XT_TARGET_LED=m | ||
| CONFIG_NETFILTER_XT_TARGET_LOG=m | ||
| CONFIG_NETFILTER_XT_TARGET_MARK=m | ||
| CONFIG_NETFILTER_XT_NAT=m | ||
| CONFIG_NETFILTER_XT_TARGET_NETMAP=m | ||
| CONFIG_NETFILTER_XT_TARGET_NFLOG=m | ||
| CONFIG_NETFILTER_XT_TARGET_NFQUEUE=m | ||
| CONFIG_NETFILTER_XT_TARGET_NOTRACK=m | ||
| CONFIG_NETFILTER_XT_TARGET_REDIRECT=m | ||
| CONFIG_NETFILTER_XT_TARGET_MASQUERADE=m | ||
| CONFIG_NETFILTER_XT_TARGET_TEE=m | ||
| CONFIG_NETFILTER_XT_TARGET_TPROXY=m | ||
| CONFIG_NETFILTER_XT_TARGET_TRACE=m | ||
| CONFIG_NETFILTER_XT_TARGET_SECMARK=m | ||
| CONFIG_NETFILTER_XT_TARGET_TCPMSS=m | ||
| CONFIG_NETFILTER_XT_TARGET_TCPOPTSTRIP=m | ||
|
|
@@ -236,15 +236,7 @@ CONFIG_NFT_DUP_IPV4=m | |
| CONFIG_NFT_FIB_IPV4=m | ||
| CONFIG_NF_TABLES_ARP=y | ||
| CONFIG_IP_NF_IPTABLES=m | ||
| CONFIG_IP_NF_FILTER=m | ||
| CONFIG_IP_NF_TARGET_REJECT=m | ||
| CONFIG_IP_NF_NAT=m | ||
| CONFIG_IP_NF_TARGET_MASQUERADE=m | ||
| CONFIG_IP_NF_TARGET_NETMAP=m | ||
| CONFIG_IP_NF_TARGET_REDIRECT=m | ||
| CONFIG_IP_NF_MANGLE=m | ||
| CONFIG_IP_NF_RAW=m | ||
| CONFIG_IP_NF_SECURITY=m | ||
| CONFIG_NFT_DUP_IPV6=m | ||
| CONFIG_NFT_FIB_IPV6=m | ||
| CONFIG_IP6_NF_IPTABLES=m | ||
|
|
@@ -258,15 +250,8 @@ CONFIG_IP6_NF_MATCH_MH=m | |
| CONFIG_IP6_NF_MATCH_RPFILTER=m | ||
| CONFIG_IP6_NF_MATCH_RT=m | ||
| CONFIG_IP6_NF_MATCH_SRH=m | ||
| CONFIG_IP6_NF_TARGET_HL=m | ||
| CONFIG_IP6_NF_FILTER=m | ||
| CONFIG_IP6_NF_TARGET_REJECT=m | ||
| CONFIG_IP6_NF_TARGET_SYNPROXY=m | ||
| CONFIG_IP6_NF_MANGLE=m | ||
| CONFIG_IP6_NF_RAW=m | ||
| CONFIG_IP6_NF_SECURITY=m | ||
| CONFIG_IP6_NF_NAT=m | ||
| CONFIG_IP6_NF_TARGET_MASQUERADE=m | ||
| CONFIG_IP6_NF_TARGET_NPT=m | ||
| CONFIG_NF_TABLES_BRIDGE=m | ||
| CONFIG_NFT_BRIDGE_META=m | ||
|
|
@@ -316,7 +301,9 @@ CONFIG_BT_MRVL=m | |
| CONFIG_BT_MRVL_SDIO=m | ||
| CONFIG_BT_NXPUART=m | ||
| CONFIG_CFG80211=m | ||
| CONFIG_CFG80211_WEXT=y | ||
| CONFIG_MAC80211=m | ||
| CONFIG_MAC80211_MESH=y | ||
| CONFIG_RFKILL=m | ||
| CONFIG_NFC=m | ||
| CONFIG_NFC_NCI=m | ||
|
|
@@ -450,37 +437,31 @@ CONFIG_R8169=m | |
| # CONFIG_NET_VENDOR_SOCIONEXT is not set | ||
| # CONFIG_NET_VENDOR_STMICRO is not set | ||
| # CONFIG_NET_VENDOR_SYNOPSYS is not set | ||
| CONFIG_TI_K3_AM65_CPSW_NUSS=y | ||
| CONFIG_TI_K3_AM65_CPSW_SWITCHDEV=y | ||
| CONFIG_TI_K3_AM65_CPTS=y | ||
| CONFIG_TI_AM65_CPSW_QOS=y | ||
| CONFIG_TI_ICSSG_PRUETH=m | ||
| # CONFIG_NET_VENDOR_VERTEXCOM is not set | ||
| # CONFIG_NET_VENDOR_VIA is not set | ||
| # CONFIG_NET_VENDOR_WANGXUN is not set | ||
| # CONFIG_NET_VENDOR_WIZNET is not set | ||
| # CONFIG_NET_VENDOR_XILINX is not set | ||
| CONFIG_AQUANTIA_PHY=y | ||
| CONFIG_AQUANTIA_PHY=m | ||
| CONFIG_BCM7XXX_PHY=m | ||
| CONFIG_MARVELL_PHY=m | ||
| CONFIG_MARVELL_10G_PHY=y | ||
| CONFIG_MARVELL_88Q2XXX_PHY=y | ||
| CONFIG_MICREL_PHY=y | ||
| CONFIG_MICROSEMI_PHY=y | ||
| CONFIG_AT803X_PHY=y | ||
| CONFIG_REALTEK_PHY=y | ||
| CONFIG_DP83867_PHY=y | ||
| CONFIG_MARVELL_10G_PHY=m | ||
| CONFIG_MARVELL_88Q2XXX_PHY=m | ||
| CONFIG_MICREL_PHY=m | ||
| CONFIG_MICROSEMI_PHY=m | ||
| CONFIG_AT803X_PHY=m | ||
| CONFIG_DP83867_PHY=m | ||
| CONFIG_DP83869_PHY=m | ||
| CONFIG_DP83TD510_PHY=y | ||
| CONFIG_VITESSE_PHY=y | ||
| CONFIG_DP83TD510_PHY=m | ||
| CONFIG_VITESSE_PHY=m | ||
| CONFIG_CAN_M_CAN=m | ||
| CONFIG_CAN_M_CAN_PLATFORM=m | ||
| CONFIG_CAN_MCP251XFD=m | ||
| CONFIG_MDIO_BCM_UNIMAC=y | ||
| CONFIG_MDIO_GPIO=y | ||
| CONFIG_MDIO_THUNDER=y | ||
| CONFIG_MDIO_BUS_MUX_MULTIPLEXER=y | ||
| CONFIG_MDIO_BUS_MUX_MMIOREG=y | ||
| CONFIG_MDIO_BCM_UNIMAC=m | ||
| CONFIG_MDIO_THUNDER=m | ||
| CONFIG_MDIO_BUS_MUX_MULTIPLEXER=m | ||
| CONFIG_MDIO_BUS_MUX_MMIOREG=m | ||
| CONFIG_USB_PEGASUS=m | ||
| CONFIG_USB_RTL8150=m | ||
| CONFIG_USB_RTL8152=m | ||
|
|
@@ -692,9 +673,7 @@ CONFIG_IMG_ASCII_LCD=m | |
| CONFIG_HT16K33=m | ||
| CONFIG_DRM=y | ||
| CONFIG_DRM_LOAD_EDID_FIRMWARE=y | ||
| CONFIG_DRM_I2C_CH7006=m | ||
| CONFIG_DRM_I2C_SIL164=m | ||
| CONFIG_DRM_I2C_NXP_TDA998X=y | ||
| CONFIG_DRM_SIMPLEDRM=m | ||
| CONFIG_DRM_VGEM=m | ||
| CONFIG_DRM_PANEL_BOE_TV101WUM_NL6=m | ||
| CONFIG_DRM_PANEL_FEIYANG_FY07024DI26A30D=m | ||
|
|
@@ -714,6 +693,7 @@ CONFIG_DRM_PANEL_SIMPLE=m | |
| CONFIG_DRM_PANEL_TRULY_NT35597_WQXGA=m | ||
| CONFIG_DRM_PANEL_VISIONOX_VTDR6130=m | ||
| CONFIG_DRM_DISPLAY_CONNECTOR=y | ||
| CONFIG_DRM_I2C_NXP_TDA998X=y | ||
| CONFIG_DRM_LONTIUM_LT8912B=m | ||
| CONFIG_DRM_LONTIUM_LT9611=m | ||
| CONFIG_DRM_LONTIUM_LT9611UXC=m | ||
|
|
@@ -735,16 +715,13 @@ CONFIG_DRM_TI_TPD12S015=y | |
| CONFIG_DRM_ANALOGIX_ANX7625=m | ||
| CONFIG_DRM_CDNS_DSI=y | ||
| CONFIG_DRM_CDNS_MHDP8546=y | ||
| CONFIG_DRM_SIMPLEDRM=m | ||
| CONFIG_TINYDRM_HX8357D=m | ||
| CONFIG_TINYDRM_ILI9163=m | ||
| CONFIG_TINYDRM_ILI9225=m | ||
| CONFIG_TINYDRM_ILI9341=m | ||
| CONFIG_TINYDRM_ILI9486=m | ||
| CONFIG_TINYDRM_MI0283QT=m | ||
| CONFIG_TINYDRM_REPAPER=m | ||
| CONFIG_TINYDRM_ST7586=m | ||
| CONFIG_TINYDRM_ST7735R=m | ||
| CONFIG_DRM_PANTHOR=m | ||
| CONFIG_DRM_TIDSS=m | ||
| CONFIG_FB=y | ||
|
|
@@ -767,7 +744,6 @@ CONFIG_SND_SOC=y | |
| CONFIG_SND_SOC_SOF_TOPLEVEL=y | ||
| CONFIG_SND_SOC_SOF_OF=y | ||
| CONFIG_SND_SOC_SOF_MTK_TOPLEVEL=y | ||
| CONFIG_SND_SOC_J721E_EVM=m | ||
| CONFIG_SND_SOC_ADAU7002=m | ||
| CONFIG_SND_SOC_AK4619=m | ||
| CONFIG_SND_SOC_BT_SCO=m | ||
|
|
@@ -908,7 +884,6 @@ CONFIG_RTC_DRV_HYM8563=m | |
| CONFIG_RTC_DRV_MAX77686=y | ||
| CONFIG_RTC_DRV_RK808=m | ||
| CONFIG_RTC_DRV_ISL1208=m | ||
| CONFIG_RTC_DRV_PCF85063=m | ||
| CONFIG_RTC_DRV_PCF85363=m | ||
| CONFIG_RTC_DRV_PCF8563=m | ||
| CONFIG_RTC_DRV_M41T80=m | ||
|
|
@@ -918,17 +893,14 @@ CONFIG_RTC_DRV_RV3028=m | |
| CONFIG_RTC_DRV_RV8803=m | ||
| CONFIG_RTC_DRV_DS3232=y | ||
| CONFIG_RTC_DRV_PCF2127=m | ||
| CONFIG_RTC_DRV_PCF85063=m | ||
| CONFIG_RTC_DRV_DA9063=m | ||
| CONFIG_RTC_DRV_EFI=y | ||
| CONFIG_RTC_DRV_IMX_BBM_SCMI=y | ||
| CONFIG_RTC_DRV_MT6397=m | ||
| CONFIG_RTC_DRV_TI_K3=m | ||
| CONFIG_DMADEVICES=y | ||
| CONFIG_BCM_SBA_RAID=m | ||
| CONFIG_DW_EDMA=m | ||
| CONFIG_TI_K3_UDMA=y | ||
| CONFIG_TI_K3_UDMA_AM62L=y | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. This block is an issue K3_UDMA is needed.
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. these are technically overlays over top of defaults. have you checked, with
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. to be clear... all
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
so to enable
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So I validated that I could get But
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. So since the scripts only take the old defconfig, apply to new kernel, then save again, any changes to the ARM64 in-kernel defconfig get missed. In this case, since these symbols were broken out in upstream between 6.12 and 6.18 [0] they did not get applied even though they are default now. This probably isn't an issue for moving from one patch release to the next, but for a configuration that moves between versions (like our I think in this case for now we will have to just review the config and make a one time set of manual adjustments for this first move of our edge kernel from v6.12 to v6.18. [0] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=c7691aec5e991cec9c5c5fdab08c24856a1fc56f
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Okay, sent the manual defconfig update for these K3 boards here[0]. @Grippy98 , @jonaswood01 , Would be good to review that PR and get a test in on your set of boards. [0] #9019 |
||
| CONFIG_TI_K3_UDMA_GLUE_LAYER=y | ||
| CONFIG_DMABUF_HEAPS=y | ||
| CONFIG_DMABUF_HEAPS_SYSTEM=y | ||
| CONFIG_DMABUF_HEAPS_CMA=y | ||
|
|
@@ -946,29 +918,23 @@ CONFIG_COMMON_CLK_CS2000_CP=y | |
| CONFIG_COMMON_CLK_PWM=y | ||
| CONFIG_COMMON_CLK_RS9_PCIE=y | ||
| CONFIG_COMMON_CLK_VC3=y | ||
| CONFIG_TI_SCI_CLK=y | ||
| CONFIG_HWSPINLOCK=y | ||
| CONFIG_HWSPINLOCK_OMAP=m | ||
| # CONFIG_FSL_ERRATUM_A008585 is not set | ||
| # CONFIG_HISILICON_ERRATUM_161010101 is not set | ||
| CONFIG_OMAP2PLUS_MBOX=m | ||
| CONFIG_IOMMU_IO_PGTABLE_ARMV7S=y | ||
| CONFIG_IOMMU_IO_PGTABLE_DART=y | ||
| CONFIG_ARM_SMMU=y | ||
| CONFIG_ARM_SMMU_V3=y | ||
| CONFIG_REMOTEPROC=y | ||
| CONFIG_REMOTEPROC_CDEV=y | ||
| CONFIG_TI_K3_DSP_REMOTEPROC=m | ||
| CONFIG_TI_K3_M4_REMOTEPROC=m | ||
| CONFIG_TI_K3_R5_REMOTEPROC=m | ||
| CONFIG_RPMSG_CHAR=m | ||
| CONFIG_RPMSG_CTRL=m | ||
| CONFIG_RPMSG_VIRTIO=y | ||
| CONFIG_SOUNDWIRE=m | ||
| CONFIG_FSL_RCPM=y | ||
| CONFIG_QCOM_PMIC_GLINK=m | ||
| CONFIG_TI_PRUSS=m | ||
| CONFIG_TI_SCI_PM_DOMAINS=y | ||
| CONFIG_DEVFREQ_GOV_USERSPACE=y | ||
| CONFIG_DEVFREQ_GOV_PASSIVE=m | ||
| CONFIG_EXTCON_PTN5150=m | ||
|
|
@@ -991,7 +957,6 @@ CONFIG_PWM_TIECAP=m | |
| CONFIG_PWM_TIEHRPWM=m | ||
| CONFIG_RESET_CONTROLLER=y | ||
| CONFIG_RESET_GPIO=m | ||
| CONFIG_RESET_TI_SCI=y | ||
| CONFIG_PHY_CAN_TRANSCEIVER=m | ||
| CONFIG_PHY_CADENCE_TORRENT=y | ||
| CONFIG_PHY_CADENCE_DPHY=m | ||
|
|
@@ -1061,22 +1026,15 @@ CONFIG_SECURITY=y | |
| CONFIG_SECURITY_SELINUX=y | ||
| CONFIG_SECURITY_APPARMOR=y | ||
| CONFIG_CRYPTO_USER=y | ||
| CONFIG_CRYPTO_TEST=m | ||
| CONFIG_CRYPTO_CURVE25519=m | ||
| CONFIG_CRYPTO_ECHAINIV=y | ||
| CONFIG_CRYPTO_ANSI_CPRNG=y | ||
| CONFIG_CRYPTO_USER_API_HASH=m | ||
| CONFIG_CRYPTO_USER_API_RNG=m | ||
| CONFIG_CRYPTO_CHACHA20_NEON=m | ||
| CONFIG_CRYPTO_GHASH_ARM64_CE=y | ||
| CONFIG_CRYPTO_SHA1_ARM64_CE=y | ||
| CONFIG_CRYPTO_SHA2_ARM64_CE=y | ||
| CONFIG_CRYPTO_SHA512_ARM64_CE=m | ||
| CONFIG_CRYPTO_SHA3_ARM64=m | ||
| CONFIG_CRYPTO_SM3_ARM64_CE=m | ||
| CONFIG_CRYPTO_AES_ARM64_BS=m | ||
| CONFIG_CRYPTO_AES_ARM64_CE_CCM=y | ||
| CONFIG_CRYPTO_CRCT10DIF_ARM64_CE=m | ||
| CONFIG_CRYPTO_DEV_CCREE=m | ||
| CONFIG_CRYPTO_DEV_AMLOGIC_GXL=m | ||
| CONFIG_CRYPTO_DEV_SA2UL=m | ||
|
|
@@ -1089,7 +1047,6 @@ CONFIG_DEBUG_INFO_DWARF5=y | |
| CONFIG_DEBUG_INFO_REDUCED=y | ||
| CONFIG_MAGIC_SYSRQ=y | ||
| CONFIG_DEBUG_FS=y | ||
| # CONFIG_SCHED_DEBUG is not set | ||
| # CONFIG_FTRACE is not set | ||
| CONFIG_CORESIGHT=m | ||
| CONFIG_CORESIGHT_LINK_AND_SINK_TMC=m | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why would it drop this?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
for one... the current config claims to be against
6.12. this PR is re-running it against6.18.HOWEVER... I'm not clear that you ran
rewrite-kernel-configprior to submitting #8960 so that6.12notation could easily be incorrect as this PR did bump the version.Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Note that running

./compile.sh kernel-config foo bar baz, and chasing down the drivers menu underCONFIG_SND_SOC, I do not see a menu forTexas Instrumentscache/sources/linux-kernel-worktree/6.18__k3-beagle__arm64/sound/soc/ti/Kconfigthe menu appears to be dependent on things not present.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
TI_K3_UDMAbeing related to #8902 (comment)