The branch main has been updated by andrew:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=7446569bbcb42c08c650a5e1015f544f13066d7f

commit 7446569bbcb42c08c650a5e1015f544f13066d7f
Author:     Andrew Turner <[email protected]>
AuthorDate: 2025-11-18 18:00:33 +0000
Commit:     Andrew Turner <[email protected]>
CommitDate: 2025-11-18 18:00:33 +0000

    conf: Mark vchiq as depending on fdt
    
    Fix an ACPI only kernel by only building the vchiq files when FDT is
    enabled.
    
    Fixes:  745c4aa5e8f0 ("Make BRCM2837 port conform FreeBSD/ARM64 guidelines")
    Sponsored by:   Arm Ltd
---
 sys/conf/files.arm64 | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
index 938ef2ac15ea..886980de754b 100644
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -594,23 +594,23 @@ arm/broadcom/bcm2835/bcm283x_dwc_fdt.c                    
optional dwcotg fdt soc_brcm_bcm2837 |
 arm/broadcom/bcm2835/bcm2838_pci.c                     optional 
soc_brcm_bcm2838 fdt pci
 arm/broadcom/bcm2835/bcm2838_xhci.c                    optional 
soc_brcm_bcm2838 fdt pci xhci
 arm/broadcom/bcm2835/raspberrypi_gpio.c                        optional 
soc_brcm_bcm2837 gpio fdt | soc_brcm_bcm2838 gpio fdt
-contrib/vchiq/interface/compat/vchi_bsd.c              optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/compat/vchi_bsd.c              optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c     optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_2835_arm.c     optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM 
-D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_arm.c          optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_arm.c          optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -Wno-unused -DUSE_VCHIQ_ARM 
-D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_connected.c    optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_connected.c    optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_core.c         optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_core.c         optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c     optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_kern_lib.c     optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c         optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_kmod.c         optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_shim.c         optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_shim.c         optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
-contrib/vchiq/interface/vchiq_arm/vchiq_util.c         optional vchiq 
soc_brcm_bcm2837 \
+contrib/vchiq/interface/vchiq_arm/vchiq_util.c         optional vchiq 
soc_brcm_bcm2837 fdt \
        compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 
-I$S/contrib/vchiq"
 
 # Cavium

Reply via email to