diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-01-06 00:06:03 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2017-01-06 00:06:03 +0000 |
| commit | 66f3e7993c192faf7a5ecba3d3e5c3b978b330a1 (patch) | |
| tree | 134748b6794407f107c71d9cf32845d7460bb5a1 /sys/arch/arm/mainbus | |
| parent | d24809928832525fe71d9b4d619559337db860a9 (diff) | |
unifdef CPU_ARMv7 and ARM_ARCH_7
ok kettenis@ patrick@
Diffstat (limited to 'sys/arch/arm/mainbus')
| -rw-r--r-- | sys/arch/arm/mainbus/mainbus.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/sys/arch/arm/mainbus/mainbus.c b/sys/arch/arm/mainbus/mainbus.c index 30ca099ad27..80a5e508031 100644 --- a/sys/arch/arm/mainbus/mainbus.c +++ b/sys/arch/arm/mainbus/mainbus.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mainbus.c,v 1.14 2017/01/03 19:57:01 kettenis Exp $ */ +/* $OpenBSD: mainbus.c,v 1.15 2017/01/06 00:06:02 jsg Exp $ */ /* * Copyright (c) 2016 Patrick Wildt <patrick@blueri.se> * @@ -83,6 +83,8 @@ mainbus_match(struct device *parent, void *cfdata, void *aux) } extern char *hw_prod; +extern struct bus_space armv7_bs_tag; +void platform_init_mainbus(struct device *); void mainbus_attach(struct device *parent, struct device *self, void *aux) @@ -97,14 +99,9 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) return; } -#ifdef CPU_ARMv7 arm_intr_init_fdt(); -#endif -#ifdef CPU_ARMv7 - extern struct bus_space armv7_bs_tag; sc->sc_iot = &armv7_bs_tag; -#endif sc->sc_dmat = &mainbus_dma_tag; sc->sc_acells = OF_getpropint(OF_peer(0), "#address-cells", 1); sc->sc_scells = OF_getpropint(OF_peer(0), "#size-cells", 1); @@ -119,10 +116,7 @@ mainbus_attach(struct device *parent, struct device *self, void *aux) /* Attach CPU first. */ mainbus_legacy_found(self, "cpu"); -#ifdef CPU_ARMv7 - extern void platform_init_mainbus(struct device *); platform_init_mainbus(self); -#endif /* TODO: Scan for interrupt controllers and attach them first? */ |