Author: manu
Date: Sun Feb 10 08:14:06 2019
New Revision: 343950
URL: https://svnweb.freebsd.org/changeset/base/343950
Log:
arm64: Fix compile when removing SOC_ROCKCHIP_* options
Make every rockchip file depend on the multiple soc_rockchip options
While here make rk_i2c and rk_gpio depend on their device options.
Reported by: sbruno
Modified:
head/sys/arm64/conf/GENERIC
head/sys/conf/files.arm64
Modified: head/sys/arm64/conf/GENERIC
==============================================================================
--- head/sys/arm64/conf/GENERIC Sun Feb 10 07:54:46 2019 (r343949)
+++ head/sys/arm64/conf/GENERIC Sun Feb 10 08:14:06 2019 (r343950)
@@ -213,6 +213,8 @@ device gpioled
device fdt_pinctrl
device mv_gpio # Marvell GPIO controller
device mvebu_pinctrl # Marvell Pinmux Controller
+device rk_gpio # RockChip GPIO Controller
+device rk_pinctrl # RockChip Pinmux Controller
# I2C
device aw_rsb # Allwinner Reduced Serial Bus
Modified: head/sys/conf/files.arm64
==============================================================================
--- head/sys/conf/files.arm64 Sun Feb 10 07:54:46 2019 (r343949)
+++ head/sys/conf/files.arm64 Sun Feb 10 08:14:06 2019 (r343950)
@@ -263,20 +263,23 @@ cddl/dev/dtrace/aarch64/dtrace_asm.S
optional dtrace
cddl/dev/dtrace/aarch64/dtrace_subr.c optional dtrace
compile-with "${DTRACE_C}"
cddl/dev/fbt/aarch64/fbt_isa.c optional dtrace_fbt |
dtraceall compile-with "${FBT_C}"
-arm64/rockchip/rk_i2c.c optional rk_i2c fdt
soc_rockchip_rk3328 soc_rockchip_rk3399
-arm64/rockchip/rk805.c optional rk805 fdt soc_rockchip_rk3328
-arm64/rockchip/rk_grf.c optional fdt
soc_rockchip_rk3328 soc_rockchip_rk3399
-arm64/rockchip/rk_pinctrl.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/rk_gpio.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/clk/rk_cru.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/clk/rk_clk_armclk.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/clk/rk_clk_composite.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/clk/rk_clk_gate.c optional fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-arm64/rockchip/clk/rk_clk_mux.c optional fdt
soc_rockchip_rk3328 soc_rockchip_rk3399
-arm64/rockchip/clk/rk_clk_pll.c optional fdt
soc_rockchip_rk3328 soc_rockchip_rk3399
+# RockChip Drivers
+arm64/rockchip/rk_i2c.c optional fdt rk_i2c
soc_rockchip_rk3328 | fdt rk_i2c soc_rockchip_rk3399
+arm64/rockchip/rk805.c optional fdt rk805 soc_rockchip_rk3328
| fdt rk805 soc_rockchip_rk3399
+arm64/rockchip/rk_grf.c optional fdt
soc_rockchip_rk3328 | fdt soc_rockchip_rk3399
+arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl
soc_rockchip_rk3328 | fdt rk_pinctrl soc_rockchip_rk3399
+arm64/rockchip/rk_gpio.c optional fdt rk_gpio
soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399
+arm64/rockchip/if_dwc_rk.c optional fdt dwc_rk soc_rockchip_rk3328
| fdt dwc_rk soc_rockchip_rk3399
+dev/dwc/if_dwc.c optional fdt dwc_rk soc_rockchip_rk3328
| fdt dwc_rk soc_rockchip_rk3399
+dev/dwc/if_dwc_if.m optional fdt dwc_rk soc_rockchip_rk3328
| fdt dwc_rk soc_rockchip_rk3399
+
+# RockChip Clock support
+arm64/rockchip/clk/rk_cru.c optional fdt soc_rockchip_rk3328 | fdt
soc_rockchip_rk3399
+arm64/rockchip/clk/rk_clk_armclk.c optional fdt soc_rockchip_rk3328 | fdt
soc_rockchip_rk3399
+arm64/rockchip/clk/rk_clk_composite.c optional fdt soc_rockchip_rk3328 | fdt
soc_rockchip_rk3399
+arm64/rockchip/clk/rk_clk_gate.c optional fdt soc_rockchip_rk3328 | fdt
soc_rockchip_rk3399
+arm64/rockchip/clk/rk_clk_mux.c optional fdt
soc_rockchip_rk3328 | fdt soc_rockchip_rk3399
+arm64/rockchip/clk/rk_clk_pll.c optional fdt
soc_rockchip_rk3328 | fdt soc_rockchip_rk3399
arm64/rockchip/clk/rk3328_cru.c optional fdt soc_rockchip_rk3328
arm64/rockchip/clk/rk3399_cru.c optional fdt soc_rockchip_rk3399
arm64/rockchip/clk/rk3399_pmucru.c optional fdt soc_rockchip_rk3399
-arm64/rockchip/if_dwc_rk.c optional dwc_rk fdt soc_rockchip_rk3328
soc_rockchip_rk3399
-dev/dwc/if_dwc.c optional dwc_rk
-dev/dwc/if_dwc_if.m optional dwc_rk
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
