Sun Aug 8 09:00:16 2010 UTC ()
Use EVBARM_BOARDTYPE to print 'NetBSD/evbarm(*)'.  That defined to
std.gumstix and std.overo.


(kiyohara)
diff -r1.28 -r1.29 src/sys/arch/evbarm/gumstix/gumstix_machdep.c
cvs diff -r1.28 -r1.29 src/sys/arch/evbarm/gumstix/gumstix_machdep.c (expand / switch to unified diff)

--- src/sys/arch/evbarm/gumstix/gumstix_machdep.c 2010/07/10 08:26:34 1.28
+++ src/sys/arch/evbarm/gumstix/gumstix_machdep.c 2010/08/08 09:00:15 1.29
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: gumstix_machdep.c,v 1.28 2010/07/10 08:26:34 kiyohara Exp $ */ 1/* $NetBSD: gumstix_machdep.c,v 1.29 2010/08/08 09:00:15 kiyohara Exp $ */
2/* 2/*
3 * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation. 3 * Copyright (C) 2005, 2006, 2007 WIDE Project and SOUM Corporation.
4 * All rights reserved. 4 * All rights reserved.
5 * 5 *
6 * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM 6 * Written by Takashi Kiyohara and Susumu Miki for WIDE Project and SOUM
7 * Corporation. 7 * Corporation.
8 * 8 *
9 * Redistribution and use in source and binary forms, with or without 9 * Redistribution and use in source and binary forms, with or without
10 * modification, are permitted provided that the following conditions 10 * modification, are permitted provided that the following conditions
11 * are met: 11 * are met:
12 * 1. Redistributions of source code must retain the above copyright 12 * 1. Redistributions of source code must retain the above copyright
13 * notice, this list of conditions and the following disclaimer. 13 * notice, this list of conditions and the following disclaimer.
14 * 2. Redistributions in binary form must reproduce the above copyright 14 * 2. Redistributions in binary form must reproduce the above copyright
@@ -127,26 +127,27 @@ @@ -127,26 +127,27 @@
127 * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, 127 * IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
128 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 128 * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
129 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 129 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
130 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 130 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
131 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 131 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
132 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 132 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
133 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 133 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
134 * SUCH DAMAGE. 134 * SUCH DAMAGE.
135 * 135 *
136 * Machine dependant functions for kernel setup for Intel IQ80310 evaluation 136 * Machine dependant functions for kernel setup for Intel IQ80310 evaluation
137 * boards using RedBoot firmware. 137 * boards using RedBoot firmware.
138 */ 138 */
139 139
 140#include "opt_evbarm_boardtype.h"
140#include "opt_cputypes.h" 141#include "opt_cputypes.h"
141#include "opt_gumstix.h" 142#include "opt_gumstix.h"
142#include "opt_ddb.h" 143#include "opt_ddb.h"
143#include "opt_kgdb.h" 144#include "opt_kgdb.h"
144#include "opt_pmap_debug.h" 145#include "opt_pmap_debug.h"
145#include "opt_md.h" 146#include "opt_md.h"
146#include "opt_modular.h" 147#include "opt_modular.h"
147#include "opt_com.h" 148#include "opt_com.h"
148#include "md.h" 149#include "md.h"
149 150
150#include <sys/param.h> 151#include <sys/param.h>
151#include <sys/conf.h> 152#include <sys/conf.h>
152#include <sys/device.h> 153#include <sys/device.h>
@@ -568,35 +569,29 @@ initarm(void *arg) @@ -568,35 +569,29 @@ initarm(void *arg)
568 process_kernel_args((int)u_boot_args[r0], 569 process_kernel_args((int)u_boot_args[r0],
569 (char **)u_boot_args[r1]); 570 (char **)u_boot_args[r1]);
570 else 571 else
571 /* 572 /*
572 * Maybe r3 is 'boot args string' of 'bootm'. This string is 573 * Maybe r3 is 'boot args string' of 'bootm'. This string is
573 * linely. 574 * linely.
574 */ 575 */
575 process_kernel_args_liner((char *)u_boot_args[r3]); 576 process_kernel_args_liner((char *)u_boot_args[r3]);
576#ifdef GUMSTIX_NETBSD_ARGS_CONSOLE 577#ifdef GUMSTIX_NETBSD_ARGS_CONSOLE
577 consinit(); 578 consinit();
578#endif 579#endif
579 580
580 /* Talk to the user */ 581 /* Talk to the user */
581 printf("\nNetBSD/evbarm (%s) booting ...\n", 582#define BDSTR(s) _BDSTR(s)
582#if defined(GUMSTIX) 583#define _BDSTR(s) #s
583 "gumstix" 584 printf("\nNetBSD/evbarm (" BDSTR(EVBARM_BOARDTYPE) ") booting ...\n");
584#elif defined(OVERO) 
585 "overo" 
586#else 
587 "???" 
588#endif 
589 ); 
590 585
591 /* Read system serial */ 586 /* Read system serial */
592#if defined(GUMSTIX) 587#if defined(GUMSTIX)
593 read_system_serial(); 588 read_system_serial();
594#endif 589#endif
595 590
596 memstart = SDRAM_START; 591 memstart = SDRAM_START;
597 memsize = ram_size; 592 memsize = ram_size;
598 593
599#ifdef VERBOSE_INIT_ARM 594#ifdef VERBOSE_INIT_ARM
600 printf("initarm: Configuring system ...\n"); 595 printf("initarm: Configuring system ...\n");
601#endif 596#endif
602 597