Restrict where we need to define fdt_fixup_table to just PowerPC and

Marvell.

Sponsored by:	ABT Systems Ltd
This commit is contained in:
andrew 2016-09-23 14:11:23 +00:00
parent e8d397fa84
commit 87021e009b
18 changed files with 11 additions and 69 deletions

View File

@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int

View File

@ -70,10 +70,6 @@ cpu_reset(void)
while (1);
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -165,10 +165,6 @@ platform_devmap_init(void)
return (0);
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
#ifndef DEV_GIC
static int

View File

@ -56,9 +56,6 @@ __FBSDID("$FreeBSD$");
#define LOCK 0x00000001
extern bus_addr_t al_devmap_pa;
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
static int alpine_get_wdt_base(uint32_t *pbase, uint32_t *psize);
static int alpine_pic_decode_fdt(uint32_t iparent, uint32_t *intr,

View File

@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$");
extern const struct devmap_entry at91_devmap[];
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_aic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -52,10 +52,6 @@ __FBSDID("$FreeBSD$");
#include "platform_if.h"
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
static uint32_t gpio1_node;
#ifndef INTRNG

View File

@ -50,10 +50,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -62,10 +62,6 @@ cpu_reset(void)
while (1);
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -227,10 +227,6 @@ lpc_intc_eoi(void *data)
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -61,10 +61,6 @@ __FBSDID("$FreeBSD$");
PMC_SCRATCH0_MODE_BOOTLOADER | \
PMC_SCRATCH0_MODE_RCM)
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
static vm_offset_t
tegra124_lastaddr(platform_t plat)
{

View File

@ -37,10 +37,6 @@ __FBSDID("$FreeBSD$");
#include <machine/intr.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
fdt_pic_decode_t fdt_pic_table[] = {
&gic_decode_fdt,

View File

@ -38,10 +38,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_aintc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -49,10 +49,6 @@ cpu_reset(void)
while (1);
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_pic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -49,10 +49,6 @@ __FBSDID("$FreeBSD$");
#include <machine/intr.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
#ifdef SOC_TI_AM335X
static int

View File

@ -46,10 +46,6 @@ __FBSDID("$FreeBSD$");
#include <machine/bus.h>
#include <machine/vmparam.h>
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_intc_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -93,10 +93,6 @@ platform_devmap_init(void)
}
struct fdt_fixup_entry fdt_fixup_table[] = {
{ NULL, NULL }
};
#ifndef INTRNG
static int
fdt_gic_decode_ic(phandle_t node, pcell_t *intr, int *interrupt, int *trig,

View File

@ -52,6 +52,15 @@ __FBSDID("$FreeBSD$");
#define debugf(fmt, args...)
#endif
#if defined(__arm__)
#if defined(SOC_MV_ARMADAXP) || defined(SOC_MV_ARMADA38X) || \
defined(SOC_MV_DISCOVERY) || defined(SOC_MV_DOVE) || \
defined(SOC_MV_FREY) || defined(SOC_MV_KIRKWOOD) || \
defined(SOC_MV_LOKIPLUS) || defined(SOC_MV_ORION)
#define FDT_MARVELL
#endif
#endif
static int ofw_fdt_init(ofw_t, void *);
static phandle_t ofw_fdt_peer(ofw_t, phandle_t);
static phandle_t ofw_fdt_child(ofw_t, phandle_t);
@ -415,7 +424,7 @@ ofw_fdt_package_to_path(ofw_t ofw, phandle_t package, char *buf, size_t len)
return (-1);
}
#if defined(__arm__) || defined(__powerpc__)
#if defined(FDT_MARVELL) || defined(__powerpc__)
static int
ofw_fdt_fixup(ofw_t ofw)
{
@ -454,7 +463,7 @@ ofw_fdt_fixup(ofw_t ofw)
static int
ofw_fdt_interpret(ofw_t ofw, const char *cmd, int nret, cell_t *retvals)
{
#if defined(__arm__) || defined(__powerpc__)
#if defined(FDT_MARVELL) || defined(__powerpc__)
int rv;
/*