[src/trunk]: src/sys/arch/evbarm Fix BOARDTYPE handling

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/88fca679d417
branches:  trunk
changeset: 332105:88fca679d417
user:      skrll <skrll%NetBSD.org@localhost>
date:      Sun Sep 07 06:14:13 2014 +0000

description:
Fix BOARDTYPE handling

diffstat:

 sys/arch/evbarm/awin/awin_machdep.c |  6 ++----
 sys/arch/evbarm/conf/mk.awin        |  5 +++--
 2 files changed, 5 insertions(+), 6 deletions(-)

diffs (46 lines):

diff -r bab99735727b -r 88fca679d417 sys/arch/evbarm/awin/awin_machdep.c
--- a/sys/arch/evbarm/awin/awin_machdep.c       Sun Sep 07 00:50:56 2014 +0000
+++ b/sys/arch/evbarm/awin/awin_machdep.c       Sun Sep 07 06:14:13 2014 +0000
@@ -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 @@
 #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;
diff -r bab99735727b -r 88fca679d417 sys/arch/evbarm/conf/mk.awin
--- a/sys/arch/evbarm/conf/mk.awin      Sun Sep 07 00:50:56 2014 +0000
+++ b/sys/arch/evbarm/conf/mk.awin      Sun Sep 07 06:14:13 2014 +0000
@@ -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 @@
 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