use COM_CONSOLE define as trigger for 'a4x bus space', and enable for build. This is likely the most controversial part of the diffs to bring in the inline bus space support..
diff --git a/sys/arch/armv7/conf/GENERIC b/sys/arch/armv7/conf/GENERIC index c9e893358a9..85a12ec21eb 100644 --- a/sys/arch/armv7/conf/GENERIC +++ b/sys/arch/armv7/conf/GENERIC @@ -16,7 +16,7 @@ makeoptions KERNEL_BASE_VIRT="0xc0300000" maxusers 32 # estimated number of users option CPU_ARMv7 # Support the ARMv7 -#option BUS_SPACE_NEW # Support the inline bus space +option BUS_SPACE_NEW # Support the inline bus space #option WSDISPLAY_COMPAT_USL # VT handling option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes diff --git a/sys/arch/armv7/conf/RAMDISK b/sys/arch/armv7/conf/RAMDISK index af2f6ad262e..637c95ba469 100644 --- a/sys/arch/armv7/conf/RAMDISK +++ b/sys/arch/armv7/conf/RAMDISK @@ -6,7 +6,7 @@ makeoptions KERNEL_BASE_VIRT="0xc0300000" maxusers 4 # estimated number of users option CPU_ARMv7 # Support the ARMv7 -#option BUS_SPACE_NEW # Support the inline bus space +option BUS_SPACE_NEW # Support the inline bus space option TIMEZONE=0 option DST=0 diff --git a/sys/arch/armv7/dev/com_fdt.c b/sys/arch/armv7/dev/com_fdt.c index 30b0e8683cf..fcba582233f 100644 --- a/sys/arch/armv7/dev/com_fdt.c +++ b/sys/arch/armv7/dev/com_fdt.c @@ -21,6 +21,7 @@ #include <sys/tty.h> #include <machine/intr.h> +#define COM_CONSOLE #include <machine/bus.h> #include <machine/fdt.h> diff --git a/sys/dev/ic/com.c b/sys/dev/ic/com.c index ba3dfce322a..a9543b5938b 100644 --- a/sys/dev/ic/com.c +++ b/sys/dev/ic/com.c @@ -78,10 +78,10 @@ #include <ddb/db_var.h> #endif +#define COM_CONSOLE #include <machine/bus.h> #include <machine/intr.h> -#define COM_CONSOLE #include <dev/cons.h> #include <dev/ic/comreg.h>