summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/arch/beagle/conf/GENERIC3
-rw-r--r--sys/arch/beagle/conf/Makefile.beagle4
-rw-r--r--sys/arch/beagle/conf/RAMDISK5
3 files changed, 5 insertions, 7 deletions
diff --git a/sys/arch/beagle/conf/GENERIC b/sys/arch/beagle/conf/GENERIC
index 1f0e73414bf..e5237df6a04 100644
--- a/sys/arch/beagle/conf/GENERIC
+++ b/sys/arch/beagle/conf/GENERIC
@@ -1,4 +1,4 @@
-# $OpenBSD: GENERIC,v 1.18 2013/05/21 14:41:05 rapha Exp $
+# $OpenBSD: GENERIC,v 1.19 2013/05/31 19:24:16 rapha Exp $
#
# GENERIC machine description file
#
@@ -40,7 +40,6 @@ maxusers 32
# CPU options
options CPU_ARMv7 # Support the ARMv7
-makeoptions CPUFLAGS="-mcpu=armv5" # dont have gcc v7 support yet.
#option WSDISPLAY_COMPAT_USL # VT handling
#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes
diff --git a/sys/arch/beagle/conf/Makefile.beagle b/sys/arch/beagle/conf/Makefile.beagle
index 8c8313e23f3..5e915f734e1 100644
--- a/sys/arch/beagle/conf/Makefile.beagle
+++ b/sys/arch/beagle/conf/Makefile.beagle
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.beagle,v 1.42 2013/04/30 13:57:02 patrick Exp $
+# $OpenBSD: Makefile.beagle,v 1.43 2013/05/31 19:24:16 rapha Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -27,7 +27,7 @@ CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
-Wno-main -Wno-uninitialized -Wno-format \
-Wstack-larger-than-2047
-CMACHFLAGS= -ffreestanding -msoft-float # -march=armv4 -mtune=strongarm
+CMACHFLAGS= -ffreestanding -msoft-float -march=armv6
CMACHFLAGS+= -fno-builtin-printf -fno-builtin-snprintf \
-fno-builtin-vsnprintf -fno-builtin-log \
-fno-builtin-log2 -fno-builtin-malloc ${NOPIE_FLAGS}
diff --git a/sys/arch/beagle/conf/RAMDISK b/sys/arch/beagle/conf/RAMDISK
index 3526c507634..d2e827b7459 100644
--- a/sys/arch/beagle/conf/RAMDISK
+++ b/sys/arch/beagle/conf/RAMDISK
@@ -1,4 +1,4 @@
-# $OpenBSD: RAMDISK,v 1.20 2013/05/21 14:41:05 rapha Exp $
+# $OpenBSD: RAMDISK,v 1.21 2013/05/31 19:24:16 rapha Exp $
#
# GENERIC machine description file
#
@@ -44,8 +44,7 @@ options APERTURE
maxusers 32
# CPU options
-options CPU_ARMv7 # Support the ARM11
-makeoptions CPUFLAGS="-mcpu=armv5"
+options CPU_ARMv7 # Support the ARMv7
#option WSDISPLAY_COMPAT_USL # VT handling
#option WSDISPLAY_COMPAT_RAWKBD # can get raw scancodes