Author: andrew
Date: Thu Feb 11 11:49:27 2016
New Revision: 295509
URL: https://svnweb.freebsd.org/changeset/base/295509
Log:
Stop defining fdt_pic_table when building for ARM_INTRNG.
Modified:
head/sys/arm/altera/socfpga/socfpga_common.c
head/sys/arm/amlogic/aml8726/aml8726_machdep.c
head/sys/arm/annapurna/alpine/common.c
head/sys/arm/at91/at91_common.c
head/sys/arm/broadcom/bcm2835/bcm2835_common.c
head/sys/arm/freescale/imx/imx_common.c
head/sys/arm/freescale/vybrid/vf_common.c
head/sys/arm/lpc/lpc_intc.c
head/sys/arm/mv/mv_common.c
head/sys/arm/rockchip/rk30xx_common.c
head/sys/arm/samsung/exynos/exynos5_common.c
head/sys/arm/versatile/versatile_common.c
head/sys/arm/xilinx/zy7_machdep.c
Modified: head/sys/arm/altera/socfpga/socfpga_common.c
==============================================================================
--- head/sys/arm/altera/socfpga/socfpga_common.c Thu Feb 11 11:21:45
2016 (r295508)
+++ head/sys/arm/altera/socfpga/socfpga_common.c Thu Feb 11 11:49:27
2016 (r295509)
@@ -74,6 +74,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -92,3 +93,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_pic_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/amlogic/aml8726/aml8726_machdep.c
==============================================================================
--- head/sys/arm/amlogic/aml8726/aml8726_machdep.c Thu Feb 11 11:21:45
2016 (r295508)
+++ head/sys/arm/amlogic/aml8726/aml8726_machdep.c Thu Feb 11 11:49:27
2016 (r295509)
@@ -184,6 +184,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
#ifndef DEV_GIC
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
@@ -212,3 +213,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
#endif
NULL
};
+#endif /* ARM_INTRNG */
Modified: head/sys/arm/annapurna/alpine/common.c
==============================================================================
--- head/sys/arm/annapurna/alpine/common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/annapurna/alpine/common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -136,6 +136,7 @@ infinite:
while (1) {}
}
+#ifndef ARM_INTRNG
static int
alpine_pic_decode_fdt(uint32_t iparent, uint32_t *intr, int *interrupt,
int *trig, int *pol)
@@ -158,3 +159,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&alpine_pic_decode_fdt,
NULL
};
+#endif
Modified: head/sys/arm/at91/at91_common.c
==============================================================================
--- head/sys/arm/at91/at91_common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/at91/at91_common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -53,6 +53,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_aic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -75,6 +76,7 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_aic_decode_ic,
NULL
};
+#endif
static void
at91_eoi(void *unused)
Modified: head/sys/arm/broadcom/bcm2835/bcm2835_common.c
==============================================================================
--- head/sys/arm/broadcom/bcm2835/bcm2835_common.c Thu Feb 11 11:21:45
2016 (r295508)
+++ head/sys/arm/broadcom/bcm2835/bcm2835_common.c Thu Feb 11 11:49:27
2016 (r295509)
@@ -50,6 +50,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -70,3 +71,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_intc_decode_ic,
NULL
};
+#endif /* ARM_INTRNG */
Modified: head/sys/arm/freescale/imx/imx_common.c
==============================================================================
--- head/sys/arm/freescale/imx/imx_common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/freescale/imx/imx_common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -54,6 +54,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -70,3 +71,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_intc_decode_ic,
NULL
};
+#endif /* ARM_INTRNG */
Modified: head/sys/arm/freescale/vybrid/vf_common.c
==============================================================================
--- head/sys/arm/freescale/vybrid/vf_common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/freescale/vybrid/vf_common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -66,6 +66,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -84,3 +85,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_pic_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/lpc/lpc_intc.c
==============================================================================
--- head/sys/arm/lpc/lpc_intc.c Thu Feb 11 11:21:45 2016 (r295508)
+++ head/sys/arm/lpc/lpc_intc.c Thu Feb 11 11:49:27 2016 (r295509)
@@ -231,6 +231,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -248,3 +249,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_pic_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/mv/mv_common.c
==============================================================================
--- head/sys/arm/mv/mv_common.c Thu Feb 11 11:21:45 2016 (r295508)
+++ head/sys/arm/mv/mv_common.c Thu Feb 11 11:49:27 2016 (r295509)
@@ -2181,6 +2181,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -2204,6 +2205,7 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_pic_decode_ic,
NULL
};
+#endif
uint64_t
get_sar_value(void)
Modified: head/sys/arm/rockchip/rk30xx_common.c
==============================================================================
--- head/sys/arm/rockchip/rk30xx_common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/rockchip/rk30xx_common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -42,6 +42,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -61,3 +62,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_aintc_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/samsung/exynos/exynos5_common.c
==============================================================================
--- head/sys/arm/samsung/exynos/exynos5_common.c Thu Feb 11 11:21:45
2016 (r295508)
+++ head/sys/arm/samsung/exynos/exynos5_common.c Thu Feb 11 11:49:27
2016 (r295509)
@@ -53,6 +53,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -71,3 +72,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_pic_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/versatile/versatile_common.c
==============================================================================
--- head/sys/arm/versatile/versatile_common.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/versatile/versatile_common.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -50,6 +50,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -70,3 +71,4 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_intc_decode_ic,
NULL
};
+#endif
Modified: head/sys/arm/xilinx/zy7_machdep.c
==============================================================================
--- head/sys/arm/xilinx/zy7_machdep.c Thu Feb 11 11:21:45 2016
(r295508)
+++ head/sys/arm/xilinx/zy7_machdep.c Thu Feb 11 11:49:27 2016
(r295509)
@@ -98,6 +98,7 @@ struct fdt_fixup_entry fdt_fixup_table[]
{ NULL, NULL }
};
+#ifndef ARM_INTRNG
static int
fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,
int *pol)
@@ -117,7 +118,7 @@ fdt_pic_decode_t fdt_pic_table[] = {
&fdt_gic_decode_ic,
NULL
};
-
+#endif
struct arm32_dma_range *
bus_dma_get_range(void)
_______________________________________________
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"
