Page MenuHomeFreeBSD
Files F168026967

D48286.diff
No OneTemporary
Actions

D48286.diff
View Options

diff --git a/sys/arm64/conf/std.rockchip b/sys/arm64/conf/std.rockchip
--- a/sys/arm64/conf/std.rockchip
+++ b/sys/arm64/conf/std.rockchip
@@ -3,6 +3,7 @@
#
# SoC support
+options SOC_ROCKCHIP
options SOC_ROCKCHIP_RK3328
options SOC_ROCKCHIP_RK3399
options SOC_ROCKCHIP_RK3568
diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64
--- a/sys/conf/files.arm64
+++ b/sys/conf/files.arm64
@@ -720,18 +720,18 @@
arm64/rockchip/rk_i2s.c optional fdt sound soc_rockchip_rk3328 | fdt sound soc_rockchip_rk3399
arm64/rockchip/rk_otp.c optional fdt soc_rockchip_rk3568
arm64/rockchip/rk_otp_if.m optional fdt soc_rockchip_rk3568
-dev/iicbus/pmic/rockchip/rk8xx.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/iicbus/pmic/rockchip/rk8xx_clocks.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/iicbus/pmic/rockchip/rk8xx_regulators.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/iicbus/pmic/rockchip/rk8xx_rtc.c optional fdt rk805 soc_rockchip_rk3328 | fdt rk805 soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/iicbus/pmic/rockchip/rk8xx.c optional fdt rk805 soc_rockchip
+dev/iicbus/pmic/rockchip/rk8xx_clocks.c optional fdt rk805 soc_rockchip
+dev/iicbus/pmic/rockchip/rk8xx_regulators.c optional fdt rk805 soc_rockchip
+dev/iicbus/pmic/rockchip/rk8xx_rtc.c optional fdt rk805 soc_rockchip
dev/iicbus/pmic/rockchip/rk805.c optional fdt rk805 soc_rockchip_rk3328
dev/iicbus/pmic/rockchip/rk808.c optional fdt rk805 soc_rockchip_rk3399
dev/iicbus/pmic/rockchip/rk817.c optional fdt rk817 soc_rockchip_rk3568
-arm64/rockchip/rk_grf.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip_rk3328 | fdt rk_pinctrl soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip_rk3328 | fdt rk_gpio soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+arm64/rockchip/rk_grf.c optional fdt soc_rockchip
+arm64/rockchip/rk_pinctrl.c optional fdt rk_pinctrl soc_rockchip
+arm64/rockchip/rk_gpio.c optional fdt rk_gpio soc_rockchip
arm64/rockchip/rk_iodomain.c optional fdt rk_iodomain
-arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip_rk3328 | fdt rk_usb2phy soc_rockchip_rk3399 | fdt rk_usb2phy soc_rockchip_rk3568
+arm64/rockchip/rk_usb2phy.c optional fdt rk_usb2phy soc_rockchip
arm64/rockchip/rk_typec_phy.c optional fdt rk_typec_phy soc_rockchip_rk3399
arm64/rockchip/rk_tsadc_if.m optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
arm64/rockchip/rk_tsadc.c optional fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
@@ -739,13 +739,13 @@
arm64/rockchip/rk_pcie_phy.c optional fdt pci soc_rockchip_rk3399
# RockChip Clock support
-dev/clk/rockchip/rk_cru.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_armclk.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_composite.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_fract.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_gate.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_mux.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
-dev/clk/rockchip/rk_clk_pll.c optional fdt soc_rockchip_rk3328 | fdt soc_rockchip_rk3399 | fdt soc_rockchip_rk3568
+dev/clk/rockchip/rk_cru.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_armclk.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_composite.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_fract.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_gate.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_mux.c optional fdt soc_rockchip
+dev/clk/rockchip/rk_clk_pll.c optional fdt soc_rockchip
dev/clk/rockchip/rk3328_cru.c optional fdt soc_rockchip_rk3328
dev/clk/rockchip/rk3399_cru.c optional fdt soc_rockchip_rk3399
dev/clk/rockchip/rk3399_pmucru.c optional fdt soc_rockchip_rk3399
diff --git a/sys/conf/options.arm64 b/sys/conf/options.arm64
--- a/sys/conf/options.arm64
+++ b/sys/conf/options.arm64
@@ -37,7 +37,8 @@
SOC_MARVELL_8K opt_soc.h
SOC_NVIDIA_TEGRA210 opt_soc.h
SOC_NXP_LS opt_soc.h
-SOC_ROCKCHIP_RK3328 opt_soc.h
-SOC_ROCKCHIP_RK3399 opt_soc.h
-SOC_ROCKCHIP_RK3568 opt_soc.h
+SOC_ROCKCHIP opt_soc.h
+SOC_ROCKCHIP_RK3328 opt_soc.h # Depends on SOC_ROCKCHIP
+SOC_ROCKCHIP_RK3399 opt_soc.h # Depends on SOC_ROCKCHIP
+SOC_ROCKCHIP_RK3568 opt_soc.h # Depends on SOC_ROCKCHIP
SOC_XILINX_ZYNQ opt_soc.h

File Metadata

Mime Type
text/plain
Expires
Thu, Aug 27, 12:18 AM (18 h, 24 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
37337432
Default Alt Text
D48286.diff (4 KB)

Event Timeline