Module Name: src
Committed By: matt
Date: Fri Aug 29 07:29:07 UTC 2014
Modified Files:
src/sys/arch/evbarm/conf: mk.cubie
src/sys/arch/evbarm/cubie: cubie_machdep.c
Log Message:
Instead of printing cubie, use the BOARDTYPE instead. This allows other
boards to use the cubie code but see a more useful BOARDTYPE. We could
also use it to enable more apporpriate configuration for the board.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/sys/arch/evbarm/conf/mk.cubie
cvs rdiff -u -r1.20 -r1.21 src/sys/arch/evbarm/cubie/cubie_machdep.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/evbarm/conf/mk.cubie
diff -u src/sys/arch/evbarm/conf/mk.cubie:1.3 src/sys/arch/evbarm/conf/mk.cubie:1.4
--- src/sys/arch/evbarm/conf/mk.cubie:1.3 Thu Jan 30 00:07:35 2014
+++ src/sys/arch/evbarm/conf/mk.cubie Fri Aug 29 07:29:07 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mk.cubie,v 1.3 2014/01/30 00:07:35 matt Exp $
+# $NetBSD: mk.cubie,v 1.4 2014/08/29 07:29:07 matt Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
.if !empty(MACHINE_ARCH:M*eb)
@@ -8,6 +8,8 @@ EXTRA_LINKFLAGS+= --be8
SYSTEM_FIRST_OBJ= cubie_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/cubie/cubie_start.S
+COPTS.cubie_machdep.c+= -DBOARDTYPE=${BOARDTYPE}
+
GENASSYM_EXTRAS+= ${THISARM}/cubie/genassym.cf
_OSRELEASE!= ${HOST_SH} $S/conf/osrelease.sh
Index: src/sys/arch/evbarm/cubie/cubie_machdep.c
diff -u src/sys/arch/evbarm/cubie/cubie_machdep.c:1.20 src/sys/arch/evbarm/cubie/cubie_machdep.c:1.21
--- src/sys/arch/evbarm/cubie/cubie_machdep.c:1.20 Thu Aug 28 06:36:48 2014
+++ src/sys/arch/evbarm/cubie/cubie_machdep.c Fri Aug 29 07:29:07 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: cubie_machdep.c,v 1.20 2014/08/28 06:36:48 skrll Exp $ */
+/* $NetBSD: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: cubie_machdep.c,v 1.20 2014/08/28 06:36:48 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: cubie_machdep.c,v 1.21 2014/08/29 07:29:07 matt Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -329,7 +329,7 @@ initarm(void *arg)
#ifdef VERBOSE_INIT_ARM
/* Talk to the user */
- printf("\nNetBSD/evbarm (cubie) booting ...\n");
+ printf("\nNetBSD/evbarm (" __STRING(BOARDTYPE) ") booting ...\n");
#endif
const uint8_t *uboot_bootinfo = (void*)uboot_args[0];
