Changeset View
Changeset View
Standalone View
Standalone View
sys/conf/files.arm64
Show First 20 Lines • Show All 97 Lines • ▼ Show 20 Lines | |||||
arm64/coresight/coresight_tmc_acpi.c optional acpi | arm64/coresight/coresight_tmc_acpi.c optional acpi | ||||
arm64/coresight/coresight_tmc_fdt.c optional fdt | arm64/coresight/coresight_tmc_fdt.c optional fdt | ||||
arm64/iommu/iommu.c optional iommu | arm64/iommu/iommu.c optional iommu | ||||
arm64/iommu/iommu_if.m optional iommu | arm64/iommu/iommu_if.m optional iommu | ||||
arm64/iommu/smmu.c optional iommu | arm64/iommu/smmu.c optional iommu | ||||
arm64/iommu/smmu_acpi.c optional acpi iommu | arm64/iommu/smmu_acpi.c optional acpi iommu | ||||
arm64/iommu/smmu_quirks.c optional iommu | arm64/iommu/smmu_quirks.c optional iommu | ||||
<<<<<<< HEAD | |||||
mw: It looks like some conflict resolution remainings slipped into the patch. | |||||
jhibbitsAuthorUnsubmitted Done Inline ActionsOops. Must've snuck in during a rebase. jhibbits: Oops. Must've snuck in during a rebase. | |||||
dev/iommu/busdma_iommu.c optional iommu | dev/iommu/busdma_iommu.c optional iommu | ||||
dev/iommu/iommu_gas.c optional iommu | dev/iommu/iommu_gas.c optional iommu | ||||
crypto/armv8/armv8_crypto.c optional armv8crypto | crypto/armv8/armv8_crypto.c optional armv8crypto | ||||
armv8_crypto_wrap.o optional armv8crypto \ | armv8_crypto_wrap.o optional armv8crypto \ | ||||
======= | |||||
arm64/nvidia/tegra210/max77620.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/max77620_gpio.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/max77620_regulators.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/max77620_rtc.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_car.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_clk_per.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_clk_pll.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_clk_super.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_coretemp.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_cpufreq.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_pinmux.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_pmc.c optional fdt soc_nvidia_tegra210 | |||||
arm64/nvidia/tegra210/tegra210_xusbpadctl.c optional fdt soc_nvidia_tegra210 | |||||
arm64/qoriq/qoriq_dw_pci.c optional pci fdt SOC_NXP_LS | |||||
arm64/qoriq/qoriq_therm.c optional pci fdt SOC_NXP_LS | |||||
arm64/qoriq/qoriq_therm_if.m optional pci fdt SOC_NXP_LS | |||||
arm64/qoriq/clk/ls1046a_clkgen.c optional clk SOC_NXP_LS | |||||
arm64/qoriq/clk/lx2160a_clkgen.c optional clk SOC_NXP_LS | |||||
arm64/qoriq/clk/qoriq_clk_pll.c optional clk SOC_NXP_LS | |||||
arm64/qoriq/clk/qoriq_clkgen.c optional clk SOC_NXP_LS | |||||
arm64/qualcomm/qcom_gcc.c optional qcom_gcc fdt | |||||
contrib/vchiq/interface/compat/vchi_bsd.c optional vchiq soc_brcm_bcm2837 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
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 \ | |||||
compile-with "${NORMAL_C} -DUSE_VCHIQ_ARM -D__VCCOREVER__=0x04000000 -I$S/contrib/vchiq" | |||||
crypto/armv8/armv8_crypto.c optional armv8crypto | |||||
armv8_crypto_wrap.o optional armv8crypto \ | |||||
>>>>>>> 7c5cb3948571 (Merge the QorIQ GPIO drivers between arm and powerpc) | |||||
dependency "$S/crypto/armv8/armv8_crypto_wrap.c" \ | dependency "$S/crypto/armv8/armv8_crypto_wrap.c" \ | ||||
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ | compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ | ||||
no-implicit-rule \ | no-implicit-rule \ | ||||
clean "armv8_crypto_wrap.o" | clean "armv8_crypto_wrap.o" | ||||
aesv8-armx.o optional armv8crypto \ | aesv8-armx.o optional armv8crypto \ | ||||
dependency "$S/crypto/openssl/aarch64/aesv8-armx.S" \ | dependency "$S/crypto/openssl/aarch64/aesv8-armx.S" \ | ||||
compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ | compile-with "${CC} -c ${CFLAGS:C/^-O2$/-O3/:N-nostdinc:N-mgeneral-regs-only} -I$S/crypto/armv8/ -I$S/crypto/openssl/crypto ${WERROR} ${NO_WCAST_QUAL} ${PROF} -march=armv8-a+crypto ${.IMPSRC}" \ | ||||
no-implicit-rule \ | no-implicit-rule \ | ||||
▲ Show 20 Lines • Show All 45 Lines • ▼ Show 20 Lines | |||||
dev/cpufreq/cpufreq_dt.c optional cpufreq fdt | dev/cpufreq/cpufreq_dt.c optional cpufreq fdt | ||||
dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 | dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 | ||||
dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 | dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328 | fdt dwc_rk soc_rockchip_rk3399 | fdt dwc_socfpga soc_intel_stratix10 | ||||
dev/gpio/pl061.c optional pl061 gpio | dev/gpio/pl061.c optional pl061 gpio | ||||
dev/gpio/pl061_acpi.c optional pl061 gpio acpi | dev/gpio/pl061_acpi.c optional pl061 gpio acpi | ||||
dev/gpio/pl061_fdt.c optional pl061 gpio fdt | dev/gpio/pl061_fdt.c optional pl061 gpio fdt | ||||
dev/gpio/qoriq_gpio.c optional SOC_NXP_LS gpio fdt | |||||
mwUnsubmitted Not Done Inline ActionsPlease align 'optional' and the actual options with the entries above. mw: Please align 'optional' and the actual options with the entries above. | |||||
dev/hwpmc/hwpmc_arm64.c optional hwpmc | dev/hwpmc/hwpmc_arm64.c optional hwpmc | ||||
dev/hwpmc/hwpmc_arm64_md.c optional hwpmc | dev/hwpmc/hwpmc_arm64_md.c optional hwpmc | ||||
dev/ice/if_ice_iflib.c optional ice pci \ | dev/ice/if_ice_iflib.c optional ice pci \ | ||||
compile-with "${NORMAL_C} -I$S/dev/ice" | compile-with "${NORMAL_C} -I$S/dev/ice" | ||||
dev/ice/ice_lib.c optional ice pci \ | dev/ice/ice_lib.c optional ice pci \ | ||||
compile-with "${NORMAL_C} -I$S/dev/ice" | compile-with "${NORMAL_C} -I$S/dev/ice" | ||||
▲ Show 20 Lines • Show All 309 Lines • ▼ Show 20 Lines | |||||
tegra210_xusb.fw optional tegra210_xusb_fw \ | tegra210_xusb.fw optional tegra210_xusb_fw \ | ||||
dependency "$S/contrib/dev/nvidia/tegra210_xusb.bin.uu" \ | dependency "$S/contrib/dev/nvidia/tegra210_xusb.bin.uu" \ | ||||
compile-with "${NORMAL_FW}" \ | compile-with "${NORMAL_FW}" \ | ||||
no-obj no-implicit-rule \ | no-obj no-implicit-rule \ | ||||
clean "tegra210_xusb.fw" | clean "tegra210_xusb.fw" | ||||
# NXP | # NXP | ||||
arm/freescale/vybrid/vf_i2c.c optional vf_i2c iicbus SOC_NXP_LS | arm/freescale/vybrid/vf_i2c.c optional vf_i2c iicbus SOC_NXP_LS | ||||
arm64/qoriq/ls1046_gpio.c optional ls1046_gpio gpio fdt SOC_NXP_LS | |||||
arm64/qoriq/qoriq_dw_pci.c optional pci fdt SOC_NXP_LS | arm64/qoriq/qoriq_dw_pci.c optional pci fdt SOC_NXP_LS | ||||
arm64/qoriq/qoriq_therm.c optional pci fdt SOC_NXP_LS | arm64/qoriq/qoriq_therm.c optional pci fdt SOC_NXP_LS | ||||
arm64/qoriq/qoriq_therm_if.m optional pci fdt SOC_NXP_LS | arm64/qoriq/qoriq_therm_if.m optional pci fdt SOC_NXP_LS | ||||
arm64/qoriq/clk/ls1046a_clkgen.c optional clk SOC_NXP_LS | arm64/qoriq/clk/ls1046a_clkgen.c optional clk SOC_NXP_LS | ||||
arm64/qoriq/clk/lx2160a_clkgen.c optional clk SOC_NXP_LS | arm64/qoriq/clk/lx2160a_clkgen.c optional clk SOC_NXP_LS | ||||
arm64/qoriq/clk/qoriq_clk_pll.c optional clk SOC_NXP_LS | arm64/qoriq/clk/qoriq_clk_pll.c optional clk SOC_NXP_LS | ||||
arm64/qoriq/clk/qoriq_clkgen.c optional clk SOC_NXP_LS | arm64/qoriq/clk/qoriq_clkgen.c optional clk SOC_NXP_LS | ||||
dev/ahci/ahci_fsl_fdt.c optional SOC_NXP_LS ahci fdt | dev/ahci/ahci_fsl_fdt.c optional SOC_NXP_LS ahci fdt | ||||
▲ Show 20 Lines • Show All 66 Lines • Show Last 20 Lines |
It looks like some conflict resolution remainings slipped into the patch.