diff options
-rw-r--r-- | sys/arm/altera/socfpga/files.socfpga | 1 | ||||
-rw-r--r-- | sys/arm/amlogic/aml8726/files.aml8726 | 1 | ||||
-rw-r--r-- | sys/arm/conf/AML8726 | 3 | ||||
-rw-r--r-- | sys/arm/conf/EXYNOS5.common | 3 | ||||
-rw-r--r-- | sys/arm/conf/IMX6 | 3 | ||||
-rw-r--r-- | sys/arm/conf/PANDABOARD | 3 | ||||
-rw-r--r-- | sys/arm/conf/RK3188 | 3 | ||||
-rw-r--r-- | sys/arm/conf/SOCKIT.common | 3 | ||||
-rw-r--r-- | sys/arm/conf/VYBRID | 3 | ||||
-rw-r--r-- | sys/arm/conf/ZEDBOARD | 3 | ||||
-rw-r--r-- | sys/arm/freescale/imx/files.imx6 | 1 | ||||
-rw-r--r-- | sys/arm/freescale/vybrid/files.vybrid | 1 | ||||
-rw-r--r-- | sys/arm/rockchip/files.rk30xx | 1 | ||||
-rw-r--r-- | sys/arm/samsung/exynos/files.exynos5 | 1 | ||||
-rw-r--r-- | sys/arm/ti/omap4/files.omap4 | 1 | ||||
-rw-r--r-- | sys/arm/xilinx/files.zynq7 | 1 |
16 files changed, 24 insertions, 8 deletions
diff --git a/sys/arm/altera/socfpga/files.socfpga b/sys/arm/altera/socfpga/files.socfpga index 7f425ec..901069b 100644 --- a/sys/arm/altera/socfpga/files.socfpga +++ b/sys/arm/altera/socfpga/files.socfpga @@ -6,7 +6,6 @@ arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c standard -arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/altera/socfpga/socfpga_common.c standard diff --git a/sys/arm/amlogic/aml8726/files.aml8726 b/sys/arm/amlogic/aml8726/files.aml8726 index ca058a5..0ede79f 100644 --- a/sys/arm/amlogic/aml8726/files.aml8726 +++ b/sys/arm/amlogic/aml8726/files.aml8726 @@ -5,7 +5,6 @@ kern/kern_clocksource.c standard arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard -arm/arm/gic.c standard arm/arm/pl310.c standard arm/amlogic/aml8726/aml8726_l2cache.c standard diff --git a/sys/arm/conf/AML8726 b/sys/arm/conf/AML8726 index 125a53d..c5ab6bd 100644 --- a/sys/arm/conf/AML8726 +++ b/sys/arm/conf/AML8726 @@ -59,6 +59,9 @@ device mmcsd # mmc/sd flash cards # Boot device is 2nd slice on MMC/SD card options ROOTDEVNAME=\"ufs:mmcsd0s2\" +# Interrupt controller +device gic + # GPIO device gpio device gpioled diff --git a/sys/arm/conf/EXYNOS5.common b/sys/arm/conf/EXYNOS5.common index 0bd6ad6..446d272 100644 --- a/sys/arm/conf/EXYNOS5.common +++ b/sys/arm/conf/EXYNOS5.common @@ -85,6 +85,9 @@ device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards device dwmmc +# Interrupt controller +device gic + # Pseudo devices device loop diff --git a/sys/arm/conf/IMX6 b/sys/arm/conf/IMX6 index 332681a..f670336 100644 --- a/sys/arm/conf/IMX6 +++ b/sys/arm/conf/IMX6 @@ -58,6 +58,9 @@ options ALT_BREAK_TO_DEBUGGER # Use <CR><tilde><ctrl-b> to enter debugger. # U-Boot stuff lives on slice 1, FreeBSD on slice 2. options ROOTDEVNAME=\"ufs:mmcsd0s2a\" +# Interrupt controller +device gic + # Pseudo devices. device loop # Network loopback device random # Entropy device diff --git a/sys/arm/conf/PANDABOARD b/sys/arm/conf/PANDABOARD index 41e2900..866b956 100644 --- a/sys/arm/conf/PANDABOARD +++ b/sys/arm/conf/PANDABOARD @@ -57,6 +57,9 @@ options DDB # Enable the kernel debugger #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=ue0 +# Interrupt controller +device gic + # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards diff --git a/sys/arm/conf/RK3188 b/sys/arm/conf/RK3188 index 9afa7ab..540b49e 100644 --- a/sys/arm/conf/RK3188 +++ b/sys/arm/conf/RK3188 @@ -45,6 +45,9 @@ options DIAGNOSTIC # Root mount from MMC/SD card options ROOTDEVNAME=\"ufs:/dev/mmcsd0\" +# Interrupt controller +device gic + # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards diff --git a/sys/arm/conf/SOCKIT.common b/sys/arm/conf/SOCKIT.common index ff817f8..8c6e475 100644 --- a/sys/arm/conf/SOCKIT.common +++ b/sys/arm/conf/SOCKIT.common @@ -51,6 +51,9 @@ options INVARIANT_SUPPORT # Extra sanity checks of internal structures, require #options BOOTP_NFSV3 #options BOOTP_WIRED_TO=ue0 +# Interrupt controller +device gic + # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards diff --git a/sys/arm/conf/VYBRID b/sys/arm/conf/VYBRID index 7e01756..a31ef07 100644 --- a/sys/arm/conf/VYBRID +++ b/sys/arm/conf/VYBRID @@ -60,6 +60,9 @@ options RWLOCK_NOINLINE options NO_FFS_SNAPSHOT options NO_SWAPPING +# Interrupt controller +device gic + # MMC/SD/SDIO Card slot support device mmc # mmc/sd bus device mmcsd # mmc/sd flash cards diff --git a/sys/arm/conf/ZEDBOARD b/sys/arm/conf/ZEDBOARD index 3c31b74..a0fe66a 100644 --- a/sys/arm/conf/ZEDBOARD +++ b/sys/arm/conf/ZEDBOARD @@ -50,6 +50,9 @@ options DDB # Enable the kernel debugger options ROOTDEVNAME=\"ufs:mmcsd0s2a\" +# Interrupt controller +device gic + device loop device random device ether diff --git a/sys/arm/freescale/imx/files.imx6 b/sys/arm/freescale/imx/files.imx6 index f38eca4..0a67ea1 100644 --- a/sys/arm/freescale/imx/files.imx6 +++ b/sys/arm/freescale/imx/files.imx6 @@ -10,7 +10,6 @@ kern/kern_clocksource.c standard # # Standard imx6 devices and support. # -arm/arm/gic.c standard arm/arm/pl310.c standard arm/arm/bus_space_base.c standard arm/arm/mpcore_timer.c standard diff --git a/sys/arm/freescale/vybrid/files.vybrid b/sys/arm/freescale/vybrid/files.vybrid index 194a975..23617a4 100644 --- a/sys/arm/freescale/vybrid/files.vybrid +++ b/sys/arm/freescale/vybrid/files.vybrid @@ -6,7 +6,6 @@ arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c standard -arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/freescale/vybrid/vf_machdep.c standard diff --git a/sys/arm/rockchip/files.rk30xx b/sys/arm/rockchip/files.rk30xx index bfce36c..de2fe9e 100644 --- a/sys/arm/rockchip/files.rk30xx +++ b/sys/arm/rockchip/files.rk30xx @@ -4,7 +4,6 @@ kern/kern_clocksource.c standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_generic.c standard -arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/arm/bus_space_base.c standard diff --git a/sys/arm/samsung/exynos/files.exynos5 b/sys/arm/samsung/exynos/files.exynos5 index 2e84f6c..347f3e5 100644 --- a/sys/arm/samsung/exynos/files.exynos5 +++ b/sys/arm/samsung/exynos/files.exynos5 @@ -6,7 +6,6 @@ arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c standard -arm/arm/gic.c standard arm/arm/generic_timer.c standard arm/samsung/exynos/exynos5_mct.c standard diff --git a/sys/arm/ti/omap4/files.omap4 b/sys/arm/ti/omap4/files.omap4 index 22d7aeb..0b44534 100644 --- a/sys/arm/ti/omap4/files.omap4 +++ b/sys/arm/ti/omap4/files.omap4 @@ -1,6 +1,5 @@ #$FreeBSD$ -arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/ti/ti_smc.S standard diff --git a/sys/arm/xilinx/files.zynq7 b/sys/arm/xilinx/files.zynq7 index be3e599..90fa7ef 100644 --- a/sys/arm/xilinx/files.zynq7 +++ b/sys/arm/xilinx/files.zynq7 @@ -9,7 +9,6 @@ arm/arm/bus_space_base.c standard arm/arm/bus_space_generic.c standard arm/arm/bus_space_asm_generic.S standard -arm/arm/gic.c standard arm/arm/mpcore_timer.c standard arm/arm/pl310.c standard |