summaryrefslogtreecommitdiff
path: root/sys/arch/armv7
diff options
context:
space:
mode:
Diffstat (limited to 'sys/arch/armv7')
-rw-r--r--sys/arch/armv7/conf/Makefile.armv74
-rw-r--r--sys/arch/armv7/omap/dmtimer.c2
-rw-r--r--sys/arch/armv7/omap/gptimer.c4
-rw-r--r--sys/arch/armv7/omap/prcm.c4
4 files changed, 7 insertions, 7 deletions
diff --git a/sys/arch/armv7/conf/Makefile.armv7 b/sys/arch/armv7/conf/Makefile.armv7
index 45dc4f44c0a..2610fa298ab 100644
--- a/sys/arch/armv7/conf/Makefile.armv7
+++ b/sys/arch/armv7/conf/Makefile.armv7
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile.armv7,v 1.3 2014/02/02 03:59:25 miod Exp $
+# $OpenBSD: Makefile.armv7,v 1.4 2014/05/08 21:17:01 miod Exp $
# For instructions on building kernels consult the config(8) and options(4)
# manual pages.
@@ -24,7 +24,7 @@ _archdir?= $S/arch/${_arch}
INCLUDES= -nostdinc -I$S -I. -I$S/arch
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D__${_mach}__ -MD -MP
CWARNFLAGS= -Werror -Wall -Wstrict-prototypes -Wmissing-prototypes \
- -Wno-main -Wno-uninitialized -Wno-format \
+ -Wno-main -Wno-uninitialized \
-Wstack-larger-than-2047
CMACHFLAGS= -ffreestanding -msoft-float -march=armv6
diff --git a/sys/arch/armv7/omap/dmtimer.c b/sys/arch/armv7/omap/dmtimer.c
index e7dd984e335..b8fbe794854 100644
--- a/sys/arch/armv7/omap/dmtimer.c
+++ b/sys/arch/armv7/omap/dmtimer.c
@@ -194,7 +194,7 @@ dmtimer_attach(struct device *parent, struct device *self, void *args)
dmtimer_setstatclockrate, NULL);
}
else
- panic("attaching too many dmtimers at 0x%x",
+ panic("attaching too many dmtimers at 0x%lx",
aa->aa_dev->mem[0].addr);
/* set IDLEMODE to smart-idle */
diff --git a/sys/arch/armv7/omap/gptimer.c b/sys/arch/armv7/omap/gptimer.c
index 59874c0ffc7..a750cf51c5f 100644
--- a/sys/arch/armv7/omap/gptimer.c
+++ b/sys/arch/armv7/omap/gptimer.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gptimer.c,v 1.2 2013/11/06 19:03:07 syl Exp $ */
+/* $OpenBSD: gptimer.c,v 1.3 2014/05/08 21:17:01 miod Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -171,7 +171,7 @@ gptimer_attach(struct device *parent, struct device *self, void *args)
tc_init(&gptimer_timecounter);
}
else
- panic("attaching too many gptimers at 0x%x",
+ panic("attaching too many gptimers at 0x%lx",
aa->aa_dev->mem[0].addr);
arm_clock_register(gptimer_cpu_initclocks, gptimer_delay,
diff --git a/sys/arch/armv7/omap/prcm.c b/sys/arch/armv7/omap/prcm.c
index f6ca5407005..52b39c4c71c 100644
--- a/sys/arch/armv7/omap/prcm.c
+++ b/sys/arch/armv7/omap/prcm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: prcm.c,v 1.8 2014/03/18 07:34:17 syl Exp $ */
+/* $OpenBSD: prcm.c,v 1.9 2014/05/08 21:17:01 miod Exp $ */
/*
* Copyright (c) 2007,2009 Dale Rahn <drahn@openbsd.org>
*
@@ -443,7 +443,7 @@ prcm_v4_hsusbhost_activate(int type)
break;
default:
- panic("%s: invalid type %d", type);
+ panic("%s: invalid type %d", __func__, type);
return (EINVAL);
}
bus_space_write_4(sc->sc_iot, sc->sc_cm2, clksel_reg_off, clksel);