The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=85b3794ceef5f3591e21759f592f09afb4b7a1dd
commit 85b3794ceef5f3591e21759f592f09afb4b7a1dd Author: Emmanuel Vadot <[email protected]> AuthorDate: 2022-01-11 10:03:05 +0000 Commit: Emmanuel Vadot <[email protected]> CommitDate: 2022-02-21 16:29:06 +0000 files: Make ext_resources non-optional EXT_RESOURCES have been introduced in 12-CURRENT and all supported releases have it enabled in their kernel config. MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D33834 --- sys/conf/files | 76 ++++++++++++++++++++++++++-------------------------- sys/conf/files.arm64 | 6 ++--- sys/conf/files.riscv | 2 +- 3 files changed, 42 insertions(+), 42 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index fb57567d3e87..1f154e7e9191 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1707,33 +1707,33 @@ dev/evdev/evdev_mt.c optional evdev dev/evdev/evdev_utils.c optional evdev dev/evdev/uinput.c optional evdev uinput dev/exca/exca.c optional cbb -dev/extres/clk/clk.c optional ext_resources clk fdt -dev/extres/clk/clkdev_if.m optional ext_resources clk fdt -dev/extres/clk/clknode_if.m optional ext_resources clk fdt -dev/extres/clk/clk_bus.c optional ext_resources clk fdt -dev/extres/clk/clk_div.c optional ext_resources clk fdt -dev/extres/clk/clk_fixed.c optional ext_resources clk fdt -dev/extres/clk/clk_gate.c optional ext_resources clk fdt -dev/extres/clk/clk_link.c optional ext_resources clk fdt -dev/extres/clk/clk_mux.c optional ext_resources clk fdt -dev/extres/phy/phy.c optional ext_resources phy fdt -dev/extres/phy/phydev_if.m optional ext_resources phy fdt -dev/extres/phy/phynode_if.m optional ext_resources phy fdt -dev/extres/phy/phy_usb.c optional ext_resources phy fdt -dev/extres/phy/phynode_usb_if.m optional ext_resources phy fdt -dev/extres/hwreset/hwreset.c optional ext_resources hwreset fdt -dev/extres/hwreset/hwreset_if.m optional ext_resources hwreset fdt -dev/extres/nvmem/nvmem.c optional ext_resources nvmem fdt -dev/extres/nvmem/nvmem_if.m optional ext_resources nvmem fdt -dev/extres/regulator/regdev_if.m optional ext_resources regulator fdt -dev/extres/regulator/regnode_if.m optional ext_resources regulator fdt -dev/extres/regulator/regulator.c optional ext_resources regulator fdt -dev/extres/regulator/regulator_bus.c optional ext_resources regulator fdt -dev/extres/regulator/regulator_fixed.c optional ext_resources regulator fdt -dev/extres/syscon/syscon.c optional ext_resources syscon -dev/extres/syscon/syscon_generic.c optional ext_resources syscon fdt -dev/extres/syscon/syscon_if.m optional ext_resources syscon -dev/extres/syscon/syscon_power.c optional ext_resources syscon syscon_power fdt +dev/extres/clk/clk.c optional clk fdt +dev/extres/clk/clkdev_if.m optional clk fdt +dev/extres/clk/clknode_if.m optional clk fdt +dev/extres/clk/clk_bus.c optional clk fdt +dev/extres/clk/clk_div.c optional clk fdt +dev/extres/clk/clk_fixed.c optional clk fdt +dev/extres/clk/clk_gate.c optional clk fdt +dev/extres/clk/clk_link.c optional clk fdt +dev/extres/clk/clk_mux.c optional clk fdt +dev/extres/phy/phy.c optional phy fdt +dev/extres/phy/phydev_if.m optional phy fdt +dev/extres/phy/phynode_if.m optional phy fdt +dev/extres/phy/phy_usb.c optional phy fdt +dev/extres/phy/phynode_usb_if.m optional phy fdt +dev/extres/hwreset/hwreset.c optional hwreset fdt +dev/extres/hwreset/hwreset_if.m optional hwreset fdt +dev/extres/nvmem/nvmem.c optional nvmem fdt +dev/extres/nvmem/nvmem_if.m optional nvmem fdt +dev/extres/regulator/regdev_if.m optional regulator fdt +dev/extres/regulator/regnode_if.m optional regulator fdt +dev/extres/regulator/regulator.c optional regulator fdt +dev/extres/regulator/regulator_bus.c optional regulator fdt +dev/extres/regulator/regulator_fixed.c optional regulator fdt +dev/extres/syscon/syscon.c optional syscon +dev/extres/syscon/syscon_generic.c optional syscon fdt +dev/extres/syscon/syscon_if.m optional syscon +dev/extres/syscon/syscon_power.c optional syscon syscon_power fdt dev/fb/fbd.c optional fbd | vt dev/fb/fb_if.m standard dev/fb/splash.c optional sc splash @@ -1784,7 +1784,7 @@ dev/gpio/gpioled.c optional gpioled !fdt dev/gpio/gpioled_fdt.c optional gpioled fdt dev/gpio/gpiomdio.c optional gpiomdio mii_bitbang dev/gpio/gpiopower.c optional gpiopower fdt -dev/gpio/gpioregulator.c optional gpioregulator fdt ext_resources +dev/gpio/gpioregulator.c optional gpioregulator fdt dev/gpio/gpiospi.c optional gpiospi dev/gpio/gpioths.c optional gpioths dev/gpio/gpio_if.m optional gpio @@ -1841,7 +1841,7 @@ dev/iicbus/iiconf.c optional iicbus | compat_linuxkpi dev/iicbus/iicsmb.c optional iicsmb \ dependency "iicbus_if.h" dev/iicbus/iicoc.c optional iicoc -dev/iicbus/iicoc_fdt.c optional iicoc ext_resources fdt +dev/iicbus/iicoc_fdt.c optional iicoc fdt dev/iicbus/iicoc_pci.c optional iicoc pci dev/iicbus/isl12xx.c optional isl12xx dev/iicbus/lm75.c optional lm75 @@ -1861,11 +1861,11 @@ dev/iicbus/rtc8583.c optional rtc8583 dev/iicbus/rtc/pcf85063.c optional pcf85063 iicbus fdt dev/iicbus/rtc/rx8803.c optional rx8803 iicbus fdt dev/iicbus/s35390a.c optional s35390a -dev/iicbus/sy8106a.c optional sy8106a ext_resources fdt -dev/iicbus/syr827.c optional syr827 ext_resources fdt +dev/iicbus/sy8106a.c optional sy8106a fdt +dev/iicbus/syr827.c optional syr827 fdt dev/iicbus/gpio/tca6408.c optional tca6408 fdt gpio dev/iicbus/gpio/tca6416.c optional tca6416 fdt -dev/iicbus/pmic/fan53555.c optional fan53555 ext_resources fdt +dev/iicbus/pmic/fan53555.c optional fan53555 fdt dev/igc/if_igc.c optional igc iflib pci dev/igc/igc_api.c optional igc iflib pci dev/igc/igc_base.c optional igc iflib pci @@ -2453,10 +2453,10 @@ dev/mmc/mmc.c optional mmc !mmccam dev/mmc/mmcbr_if.m standard dev/mmc/mmcbus_if.m standard dev/mmc/mmcsd.c optional mmcsd !mmccam -dev/mmc/mmc_fdt_helpers.c optional ext_resources mmc fdt | ext_resources mmccam fdt -dev/mmc/mmc_helpers.c optional ext_resources mmc | ext_resources mmccam -dev/mmc/mmc_pwrseq.c optional ext_resources mmc fdt | ext_resources mmccam fdt -dev/mmc/mmc_pwrseq_if.m optional ext_resources mmc fdt | ext_resources mmccam fdt +dev/mmc/mmc_fdt_helpers.c optional mmc fdt | mmccam fdt +dev/mmc/mmc_helpers.c optional mmc | mmccam +dev/mmc/mmc_pwrseq.c optional mmc fdt | mmccam fdt +dev/mmc/mmc_pwrseq_if.m optional mmc fdt | mmccam fdt dev/mmcnull/mmcnull.c optional mmcnull dev/mpr/mpr.c optional mpr dev/mpr/mpr_config.c optional mpr @@ -2751,7 +2751,7 @@ dev/pwm/pwmbus.c optional pwm | pwmbus dev/pwm/pwmbus_if.m optional pwm | pwmbus dev/pwm/ofw_pwm.c optional pwm fdt | pwmbus fdt dev/pwm/ofw_pwmbus.c optional pwm fdt | pwmbus fdt -dev/pwm/pwm_backlight.c optional pwm pwm_backlight ext_resources fdt +dev/pwm/pwm_backlight.c optional pwm pwm_backlight fdt dev/quicc/quicc_core.c optional quicc dev/ral/rt2560.c optional ral dev/ral/rt2661.c optional ral @@ -3065,7 +3065,7 @@ dev/scc/scc_dev_z8530.c optional scc dev/sdhci/sdhci.c optional sdhci dev/sdhci/sdhci_fdt.c optional sdhci fdt dev/sdhci/sdhci_fdt_gpio.c optional sdhci fdt gpio -dev/sdhci/sdhci_fsl_fdt.c optional sdhci ext_resources fdt gpio +dev/sdhci/sdhci_fsl_fdt.c optional sdhci fdt gpio dev/sdhci/sdhci_if.m optional sdhci dev/sdhci/sdhci_acpi.c optional sdhci acpi dev/sdhci/sdhci_pci.c optional sdhci pci diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index ab7b5eb3a2d6..46b3b602f024 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -298,7 +298,7 @@ dev/usb/controller/generic_ehci_fdt.c optional ehci fdt dev/usb/controller/generic_ohci.c optional ohci fdt dev/usb/controller/generic_usb_if.m optional ohci fdt dev/usb/controller/musb_otg_allwinner.c optional musb fdt soc_allwinner_a64 -dev/usb/controller/usb_nop_xceiv.c optional fdt ext_resources +dev/usb/controller/usb_nop_xceiv.c optional fdt dev/usb/controller/generic_xhci.c optional xhci dev/usb/controller/generic_xhci_acpi.c optional xhci acpi dev/usb/controller/generic_xhci_fdt.c optional xhci fdt @@ -337,13 +337,13 @@ arm/allwinner/aw_rsb.c optional aw_rsb fdt arm/allwinner/aw_rtc.c optional aw_rtc fdt arm/allwinner/aw_sid.c optional aw_sid nvmem fdt arm/allwinner/aw_spi.c optional aw_spi fdt -arm/allwinner/aw_syscon.c optional aw_syscon ext_resources syscon fdt +arm/allwinner/aw_syscon.c optional aw_syscon syscon fdt arm/allwinner/aw_thermal.c optional aw_thermal nvmem fdt arm/allwinner/aw_usbphy.c optional ehci aw_usbphy fdt arm/allwinner/aw_usb3phy.c optional xhci aw_usbphy fdt arm/allwinner/aw_wdog.c optional aw_wdog fdt arm/allwinner/axp81x.c optional axp81x fdt -arm/allwinner/if_awg.c optional awg ext_resources syscon aw_sid nvmem fdt +arm/allwinner/if_awg.c optional awg syscon aw_sid nvmem fdt # Allwinner clock driver arm/allwinner/clkng/aw_ccung.c optional aw_ccu fdt diff --git a/sys/conf/files.riscv b/sys/conf/files.riscv index 4a2d4efad137..f7272a6f5785 100644 --- a/sys/conf/files.riscv +++ b/sys/conf/files.riscv @@ -60,7 +60,7 @@ riscv/riscv/plic.c standard riscv/riscv/pmap.c standard riscv/riscv/ptrace_machdep.c standard riscv/riscv/riscv_console.c optional rcons -riscv/riscv/riscv_syscon.c optional ext_resources syscon riscv_syscon fdt +riscv/riscv/riscv_syscon.c optional syscon riscv_syscon fdt riscv/riscv/sbi.c standard riscv/riscv/stack_machdep.c optional ddb | stack riscv/riscv/support.S standard
