Skip to content

Commit 7fde08b

Browse files
authored
Merge pull request #299 from TheSven73/rust-for-linux-ci-defconfig
Fix build errors due to merge of previous PR
2 parents 5d67b55 + d656610 commit 7fde08b

File tree

4 files changed

+240
-14
lines changed

4 files changed

+240
-14
lines changed

.github/workflows/kernel-arm-debug.config

+119-5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ CONFIG_GENERIC_IRQ_SHOW_LEVEL=y
5555
CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y
5656
CONFIG_GENERIC_IRQ_MIGRATION=y
5757
CONFIG_HARDIRQS_SW_RESEND=y
58+
CONFIG_GENERIC_IRQ_CHIP=y
5859
CONFIG_IRQ_DOMAIN=y
5960
CONFIG_IRQ_DOMAIN_HIERARCHY=y
6061
CONFIG_GENERIC_IRQ_IPI=y
@@ -215,6 +216,7 @@ CONFIG_TRACE_IRQFLAGS_SUPPORT=y
215216
CONFIG_FIX_EARLYCON_MEM=y
216217
CONFIG_GENERIC_HWEIGHT=y
217218
CONFIG_GENERIC_CALIBRATE_DELAY=y
219+
CONFIG_ZONE_DMA=y
218220
CONFIG_ARCH_SUPPORTS_UPROBES=y
219221
CONFIG_ARM_PATCH_PHYS_VIRT=y
220222
CONFIG_GENERIC_BUG=y
@@ -256,7 +258,30 @@ CONFIG_ARCH_VIRT=y
256258
# CONFIG_ARCH_ARTPEC is not set
257259
# CONFIG_ARCH_ASPEED is not set
258260
# CONFIG_ARCH_AT91 is not set
259-
# CONFIG_ARCH_BCM is not set
261+
CONFIG_ARCH_BCM=y
262+
263+
#
264+
# IPROC architected SoCs
265+
#
266+
# CONFIG_ARCH_BCM_CYGNUS is not set
267+
# CONFIG_ARCH_BCM_HR2 is not set
268+
# CONFIG_ARCH_BCM_NSP is not set
269+
# CONFIG_ARCH_BCM_5301X is not set
270+
271+
#
272+
# KONA architected SoCs
273+
#
274+
# CONFIG_ARCH_BCM_281XX is not set
275+
# CONFIG_ARCH_BCM_21664 is not set
276+
# CONFIG_ARCH_BCM_23550 is not set
277+
278+
#
279+
# Other Architectures
280+
#
281+
CONFIG_ARCH_BCM2835=y
282+
# CONFIG_ARCH_BCM_53573 is not set
283+
# CONFIG_ARCH_BCM_63XX is not set
284+
# CONFIG_ARCH_BRCMSTB is not set
260285
# CONFIG_ARCH_BERLIN is not set
261286
# CONFIG_ARCH_DIGICOLOR is not set
262287
# CONFIG_ARCH_EXYNOS is not set
@@ -485,7 +510,10 @@ CONFIG_PM=y
485510
# CONFIG_PM_DEBUG is not set
486511
# CONFIG_APM_EMULATION is not set
487512
CONFIG_PM_CLK=y
513+
CONFIG_PM_GENERIC_DOMAINS=y
488514
# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set
515+
CONFIG_PM_GENERIC_DOMAINS_SLEEP=y
516+
CONFIG_PM_GENERIC_DOMAINS_OF=y
489517
CONFIG_CPU_PM=y
490518
CONFIG_ARCH_SUSPEND_POSSIBLE=y
491519
CONFIG_ARM_CPU_SUSPEND=y
@@ -663,6 +691,7 @@ CONFIG_COMPACTION=y
663691
# CONFIG_PAGE_REPORTING is not set
664692
CONFIG_MIGRATION=y
665693
CONFIG_CONTIG_ALLOC=y
694+
CONFIG_BOUNCE=y
666695
# CONFIG_KSM is not set
667696
CONFIG_DEFAULT_MMAP_MIN_ADDR=4096
668697
# CONFIG_CLEANCACHE is not set
@@ -840,6 +869,7 @@ CONFIG_SERIO_LIBPS2=y
840869
# CONFIG_SERIO_PS2MULT is not set
841870
# CONFIG_SERIO_ARC_PS2 is not set
842871
# CONFIG_SERIO_APBPS2 is not set
872+
# CONFIG_SERIO_GPIO_PS2 is not set
843873
# CONFIG_USERIO is not set
844874
# CONFIG_GAMEPORT is not set
845875
# end of Hardware I/O ports
@@ -899,7 +929,14 @@ CONFIG_CONSOLE_POLL=y
899929
# CONFIG_SERIAL_DEV_BUS is not set
900930
# CONFIG_VIRTIO_CONSOLE is not set
901931
# CONFIG_IPMI_HANDLER is not set
902-
# CONFIG_HW_RANDOM is not set
932+
CONFIG_HW_RANDOM=y
933+
# CONFIG_HW_RANDOM_TIMERIOMEM is not set
934+
# CONFIG_HW_RANDOM_BA431 is not set
935+
# CONFIG_HW_RANDOM_BCM2835 is not set
936+
CONFIG_HW_RANDOM_BCM2835_RUST=y
937+
CONFIG_HW_RANDOM_IPROC_RNG200=y
938+
# CONFIG_HW_RANDOM_CCTRNG is not set
939+
# CONFIG_HW_RANDOM_XIPHERA is not set
903940
CONFIG_DEVMEM=y
904941
# CONFIG_DEVKMEM is not set
905942
# CONFIG_RAW_DRIVER is not set
@@ -930,13 +967,73 @@ CONFIG_DEVMEM=y
930967
#
931968
# end of PTP clock support
932969

933-
# CONFIG_PINCTRL is not set
970+
CONFIG_PINCTRL=y
971+
CONFIG_PINMUX=y
972+
CONFIG_PINCONF=y
973+
CONFIG_GENERIC_PINCONF=y
974+
# CONFIG_DEBUG_PINCTRL is not set
975+
# CONFIG_PINCTRL_SINGLE is not set
976+
# CONFIG_PINCTRL_OCELOT is not set
977+
# CONFIG_PINCTRL_MICROCHIP_SGPIO is not set
978+
CONFIG_PINCTRL_BCM2835=y
979+
980+
#
981+
# Renesas pinctrl drivers
982+
#
983+
# end of Renesas pinctrl drivers
984+
934985
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y
935-
# CONFIG_GPIOLIB is not set
986+
CONFIG_GPIOLIB=y
987+
CONFIG_GPIOLIB_FASTPATH_LIMIT=512
988+
CONFIG_OF_GPIO=y
989+
CONFIG_GPIOLIB_IRQCHIP=y
990+
# CONFIG_DEBUG_GPIO is not set
991+
CONFIG_GPIO_CDEV=y
992+
CONFIG_GPIO_CDEV_V1=y
993+
994+
#
995+
# Memory mapped GPIO drivers
996+
#
997+
# CONFIG_GPIO_74XX_MMIO is not set
998+
# CONFIG_GPIO_ALTERA is not set
999+
# CONFIG_GPIO_CADENCE is not set
1000+
# CONFIG_GPIO_DWAPB is not set
1001+
# CONFIG_GPIO_FTGPIO010 is not set
1002+
# CONFIG_GPIO_GENERIC_PLATFORM is not set
1003+
# CONFIG_GPIO_GRGPIO is not set
1004+
# CONFIG_GPIO_HLWD is not set
1005+
# CONFIG_GPIO_LOGICVC is not set
1006+
# CONFIG_GPIO_MB86S7X is not set
1007+
# CONFIG_GPIO_MPC8XXX is not set
1008+
# CONFIG_GPIO_PL061 is not set
1009+
# CONFIG_GPIO_SAMA5D2_PIOBU is not set
1010+
# CONFIG_GPIO_SIFIVE is not set
1011+
# CONFIG_GPIO_SYSCON is not set
1012+
# CONFIG_GPIO_XILINX is not set
1013+
# CONFIG_GPIO_ZEVIO is not set
1014+
# CONFIG_GPIO_AMD_FCH is not set
1015+
# end of Memory mapped GPIO drivers
1016+
1017+
#
1018+
# MFD GPIO expanders
1019+
#
1020+
# CONFIG_HTC_EGPIO is not set
1021+
# end of MFD GPIO expanders
1022+
1023+
#
1024+
# Virtual GPIO drivers
1025+
#
1026+
# CONFIG_GPIO_AGGREGATOR is not set
1027+
# CONFIG_GPIO_MOCKUP is not set
1028+
# end of Virtual GPIO drivers
1029+
9361030
# CONFIG_W1 is not set
9371031
CONFIG_POWER_RESET=y
9381032
# CONFIG_POWER_RESET_BRCMKONA is not set
9391033
# CONFIG_POWER_RESET_BRCMSTB is not set
1034+
# CONFIG_POWER_RESET_GPIO is not set
1035+
# CONFIG_POWER_RESET_GPIO_RESTART is not set
1036+
# CONFIG_POWER_RESET_LTC2952 is not set
9401037
# CONFIG_POWER_RESET_RESTART is not set
9411038
CONFIG_POWER_RESET_VERSATILE=y
9421039
# CONFIG_POWER_RESET_SYSCON is not set
@@ -951,6 +1048,8 @@ CONFIG_POWER_SUPPLY=y
9511048
# CONFIG_BATTERY_DS2781 is not set
9521049
# CONFIG_BATTERY_BQ27XXX is not set
9531050
# CONFIG_CHARGER_MAX8903 is not set
1051+
# CONFIG_CHARGER_GPIO is not set
1052+
# CONFIG_CHARGER_LT3651 is not set
9541053
# CONFIG_HWMON is not set
9551054
# CONFIG_THERMAL is not set
9561055
# CONFIG_WATCHDOG is not set
@@ -962,9 +1061,11 @@ CONFIG_BCMA_POSSIBLE=y
9621061
#
9631062
# Multifunction device drivers
9641063
#
1064+
CONFIG_MFD_CORE=y
9651065
# CONFIG_MFD_ATMEL_FLEXCOM is not set
9661066
# CONFIG_MFD_ATMEL_HLCDC is not set
9671067
# CONFIG_MFD_MADERA is not set
1068+
# CONFIG_MFD_ASIC3 is not set
9681069
# CONFIG_MFD_HI6421_PMIC is not set
9691070
# CONFIG_HTC_PASIC3 is not set
9701071
# CONFIG_MFD_KEMPLD is not set
@@ -1048,6 +1149,7 @@ CONFIG_SYNC_FILE=y
10481149
# end of DMABUF options
10491150

10501151
CONFIG_AUXDISPLAY=y
1152+
# CONFIG_HD44780 is not set
10511153
# CONFIG_IMG_ASCII_LCD is not set
10521154
# CONFIG_CHARLCD_BL_OFF is not set
10531155
# CONFIG_CHARLCD_BL_ON is not set
@@ -1076,6 +1178,8 @@ CONFIG_HAVE_CLK_PREPARE=y
10761178
CONFIG_COMMON_CLK=y
10771179
# CONFIG_COMMON_CLK_AXI_CLKGEN is not set
10781180
# CONFIG_COMMON_CLK_FIXED_MMIO is not set
1181+
CONFIG_CLK_BCM2711_DVP=y
1182+
CONFIG_CLK_BCM2835=y
10791183
# CONFIG_XILINX_VCU is not set
10801184
# CONFIG_HWSPINLOCK is not set
10811185

@@ -1084,8 +1188,11 @@ CONFIG_COMMON_CLK=y
10841188
#
10851189
CONFIG_TIMER_OF=y
10861190
CONFIG_TIMER_PROBE=y
1191+
CONFIG_CLKSRC_MMIO=y
1192+
CONFIG_BCM2835_TIMER=y
10871193
CONFIG_ARM_ARCH_TIMER=y
10881194
CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y
1195+
CONFIG_ARM_TIMER_SP804=y
10891196
# CONFIG_MICROCHIP_PIT64B is not set
10901197
# end of Clock Source drivers
10911198

@@ -1128,6 +1235,7 @@ CONFIG_IOMMU_SUPPORT=y
11281235
#
11291236
# Broadcom SoC drivers
11301237
#
1238+
CONFIG_BCM2835_POWER=y
11311239
# CONFIG_SOC_BRCMSTB is not set
11321240
# end of Broadcom SoC drivers
11331241

@@ -1177,11 +1285,16 @@ CONFIG_ARM_GIC_MAX_NR=1
11771285
CONFIG_ARM_GIC_V3=y
11781286
CONFIG_ARM_GIC_V3_ITS=y
11791287
# CONFIG_AL_FIC is not set
1288+
CONFIG_BRCMSTB_L2_IRQ=y
11801289
CONFIG_PARTITION_PERCPU=y
11811290
# end of IRQ chip support
11821291

11831292
# CONFIG_IPACK_BUS is not set
1184-
# CONFIG_RESET_CONTROLLER is not set
1293+
CONFIG_RESET_CONTROLLER=y
1294+
# CONFIG_RESET_BRCMSTB_RESCAL is not set
1295+
# CONFIG_RESET_INTEL_GW is not set
1296+
CONFIG_RESET_SIMPLE=y
1297+
# CONFIG_RESET_TI_SYSCON is not set
11851298

11861299
#
11871300
# PHY Subsystem
@@ -1190,6 +1303,7 @@ CONFIG_PARTITION_PERCPU=y
11901303
# CONFIG_BCM_KONA_USB2_PHY is not set
11911304
# CONFIG_PHY_CADENCE_TORRENT is not set
11921305
# CONFIG_PHY_CADENCE_DPHY is not set
1306+
# CONFIG_PHY_CADENCE_SIERRA is not set
11931307
# CONFIG_PHY_CADENCE_SALVO is not set
11941308
# CONFIG_PHY_FSL_IMX8MQ_USB is not set
11951309
# CONFIG_PHY_MIXEL_MIPI_DPHY is not set

0 commit comments

Comments
 (0)