Module Name: src
Committed By: skrll
Date: Sun Sep 7 06:14:13 UTC 2014
Modified Files:
src/sys/arch/evbarm/awin: awin_machdep.c
src/sys/arch/evbarm/conf: mk.awin
Log Message:
Fix BOARDTYPE handling
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/evbarm/awin/awin_machdep.c
cvs rdiff -u -r1.1 -r1.2 src/sys/arch/evbarm/conf/mk.awin
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/awin/awin_machdep.c
diff -u src/sys/arch/evbarm/awin/awin_machdep.c:1.2 src/sys/arch/evbarm/awin/awin_machdep.c:1.3
--- src/sys/arch/evbarm/awin/awin_machdep.c:1.2 Thu Sep 4 02:34:30 2014
+++ src/sys/arch/evbarm/awin/awin_machdep.c Sun Sep 7 06:14:13 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_machdep.c,v 1.2 2014/09/04 02:34:30 jmcneill Exp $ */
+/* $NetBSD: awin_machdep.c,v 1.3 2014/09/07 06:14:13 skrll Exp $ */
/*
* Machine dependent functions for kernel setup for TI OSK5912 board.
@@ -125,7 +125,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.2 2014/09/04 02:34:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: awin_machdep.c,v 1.3 2014/09/07 06:14:13 skrll Exp $");
#include "opt_machdep.h"
#include "opt_ddb.h"
@@ -188,8 +188,6 @@ __KERNEL_RCSID(0, "$NetBSD: awin_machdep
#include <dev/usb/ukbdvar.h>
#include <net/if_ether.h>
-#define AWIN_board __CONCAT(AWIN_, BOARDTYPE)
-
BootConfig bootconfig; /* Boot config storage */
static char bootargs[MAX_BOOT_STRING];
char *boot_args = NULL;
Index: src/sys/arch/evbarm/conf/mk.awin
diff -u src/sys/arch/evbarm/conf/mk.awin:1.1 src/sys/arch/evbarm/conf/mk.awin:1.2
--- src/sys/arch/evbarm/conf/mk.awin:1.1 Sun Aug 31 19:13:01 2014
+++ src/sys/arch/evbarm/conf/mk.awin Sun Sep 7 06:14:13 2014
@@ -1,4 +1,4 @@
-# $NetBSD: mk.awin,v 1.1 2014/08/31 19:13:01 matt Exp $
+# $NetBSD: mk.awin,v 1.2 2014/09/07 06:14:13 skrll Exp $
CPPFLAGS+= -mcpu=cortex-a8 -mfpu=neon
.if !empty(MACHINE_ARCH:M*eb)
@@ -8,7 +8,8 @@ EXTRA_LINKFLAGS+= --be8
SYSTEM_FIRST_OBJ= awin_start.o
SYSTEM_FIRST_SFILE= ${THISARM}/awin/awin_start.S
-COPTS.win_machdep.c+= -DBOARDTYPE=${BOARDTYPE}
+CPPFLAGS.awin_machdep.c+= -DBOARDTYPE=${BOARDTYPE}
+CPPFLAGS.awin_machdep.c+= -DAWIN_board=AWIN_${BOARDTYPE}
GENASSYM_EXTRAS+= ${THISARM}/awin/genassym.cf
