Rename bus_space-v6.c to bus_space_base.c, because it's not v6-specific

and now some v5 Marvell systems are using it.  Only define fdt_bus_tag
if option FDT is defined.
This commit is contained in:
Ian Lepore 2015-01-21 03:44:29 +00:00
parent 05ca38474e
commit eb8711ce16
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=277472
15 changed files with 22 additions and 18 deletions

View File

@ -17,7 +17,7 @@ arm/allwinner/a10_ehci.c optional ehci
arm/allwinner/if_emac.c optional emac
arm/allwinner/a10_wdog.c standard
arm/allwinner/timer.c standard
arm/arm/bus_space-v6.c standard
arm/allwinner/a10_common.c standard
arm/arm/bus_space_base.c standard
arm/allwinner/a10_common.c standard
arm/allwinner/a10_machdep.c standard
arm/allwinner/a20/a20_mp.c optional smp

View File

@ -19,5 +19,5 @@ arm/allwinner/a20/a20_cpu_cfg.c standard
arm/allwinner/aintc.c standard
arm/allwinner/if_emac.c optional emac
arm/allwinner/timer.c standard
arm/arm/bus_space-v6.c standard
#arm/allwinner/console.c standard
arm/arm/bus_space_base.c standard
#arm/allwinner/console.c standard

View File

@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S standard
arm/arm/cpufunc_asm_arm11.S standard
arm/arm/cpufunc_asm_armv7.S standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/gic.c standard
arm/arm/mpcore_timer.c standard

View File

@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
#include <sys/systm.h>
#include <machine/bus.h>
#include "opt_platform.h"
/* Prototypes for all the bus_space structure functions */
bs_protos(generic);
@ -43,7 +45,7 @@ bs_protos(generic);
* The bus space tag. This is constant for all instances, so
* we never have to explicitly "create" it.
*/
static struct bus_space _base_tag = {
static struct bus_space arm_base_tag = {
/* privdata is whatever the implementer wants; unused in base tag */
.bs_privdata = NULL,
@ -150,4 +152,6 @@ static struct bus_space _base_tag = {
.bs_wr_8_s = BS_UNIMPLEMENTED,
};
bus_space_tag_t fdtbus_bs_tag = &_base_tag;
#ifdef FDT
bus_space_tag_t fdtbus_bs_tag = &arm_base_tag;
#endif

View File

@ -15,7 +15,7 @@ arm/broadcom/bcm2835/bcm2835_spi.c optional bcm2835_spi
arm/broadcom/bcm2835/bcm2835_systimer.c standard
arm/broadcom/bcm2835/bcm2835_wdog.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/bus_space_generic.c standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/cpufunc_asm_arm11.S standard

View File

@ -10,7 +10,7 @@ kern/kern_clocksource.c standard
arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx51_machdep.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
# Dummy serial console
#arm/freescale/imx/console.c standard

View File

@ -10,7 +10,7 @@ kern/kern_clocksource.c standard
arm/freescale/imx/imx_common.c standard
arm/freescale/imx/imx_machdep.c standard
arm/freescale/imx/imx53_machdep.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
# Special serial console for debuging early boot code
#arm/freescale/imx/console.c standard

View File

@ -15,7 +15,7 @@ kern/kern_clocksource.c standard
#
arm/arm/gic.c standard
arm/arm/pl310.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/mpcore_timer.c standard
arm/freescale/fsl_ocotp.c standard
arm/freescale/imx/imx6_anatop.c standard

View File

@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S standard
arm/arm/cpufunc_asm_arm11.S standard
arm/arm/cpufunc_asm_armv7.S standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/gic.c standard
arm/arm/mpcore_timer.c standard

View File

@ -1,5 +1,5 @@
# $FreeBSD$
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_arm9.S standard
arm/arm/cpufunc_asm_armv5.S standard

View File

@ -12,7 +12,7 @@
# - JTAG/ICE
# - Vector Floating Point (VFP) unit
#
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/bus_space_generic.c standard
arm/arm/cpufunc_asm_arm10.S standard
arm/arm/cpufunc_asm_arm11.S standard

View File

@ -11,7 +11,7 @@ arm/arm/cpufunc_asm_armv7.S standard
arm/arm/gic.c standard
arm/arm/mpcore_timer.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/rockchip/rk30xx_common.c standard
arm/rockchip/rk30xx_machdep.c standard
arm/rockchip/rk30xx_pmu.c standard

View File

@ -9,7 +9,7 @@ arm/arm/cpufunc_asm_arm10.S standard
arm/arm/cpufunc_asm_arm11.S standard
arm/arm/cpufunc_asm_armv7.S standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/gic.c standard
arm/arm/generic_timer.c standard

View File

@ -2,7 +2,7 @@
kern/kern_clocksource.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/bus_space_generic.c standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/cpufunc_asm_armv5.S standard

View File

@ -5,7 +5,7 @@
kern/kern_clocksource.c standard
arm/arm/bus_space-v6.c standard
arm/arm/bus_space_base.c standard
arm/arm/bus_space_generic.c standard
arm/arm/bus_space_asm_generic.S standard
arm/arm/cpufunc_asm_armv5.S standard