Tue Jun 13 15:24:05 2017 UTC ()
Now that bus_space can use devmap - use it for early console


(skrll)
diff -r1.83 -r1.84 src/sys/arch/cats/cats/cats_machdep.c
cvs diff -r1.83 -r1.84 src/sys/arch/cats/cats/cats_machdep.c (expand / switch to unified diff)

--- src/sys/arch/cats/cats/cats_machdep.c 2017/03/19 12:46:21 1.83
+++ src/sys/arch/cats/cats/cats_machdep.c 2017/06/13 15:24:05 1.84
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1/* $NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $ */ 1/* $NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $ */
2 2
3/* 3/*
4 * Copyright (c) 1997,1998 Mark Brinicombe. 4 * Copyright (c) 1997,1998 Mark Brinicombe.
5 * Copyright (c) 1997,1998 Causality Limited. 5 * Copyright (c) 1997,1998 Causality Limited.
6 * All rights reserved. 6 * All rights reserved.
7 * 7 *
8 * Redistribution and use in source and binary forms, with or without 8 * Redistribution and use in source and binary forms, with or without
9 * modification, are permitted provided that the following conditions 9 * modification, are permitted provided that the following conditions
10 * are met: 10 * are met:
11 * 1. Redistributions of source code must retain the above copyright 11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer. 12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright 13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the 14 * notice, this list of conditions and the following disclaimer in the
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 30 * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 31 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 32 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 33 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
34 * SUCH DAMAGE. 34 * SUCH DAMAGE.
35 * 35 *
36 * Machine dependent functions for kernel setup for EBSA285 core architecture 36 * Machine dependent functions for kernel setup for EBSA285 core architecture
37 * using cyclone firmware 37 * using cyclone firmware
38 * 38 *
39 * Created : 24/11/97 39 * Created : 24/11/97
40 */ 40 */
41 41
42#include <sys/cdefs.h> 42#include <sys/cdefs.h>
43__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.83 2017/03/19 12:46:21 skrll Exp $"); 43__KERNEL_RCSID(0, "$NetBSD: cats_machdep.c,v 1.84 2017/06/13 15:24:05 skrll Exp $");
44 44
45#include "opt_ddb.h" 45#include "opt_ddb.h"
46#include "opt_modular.h" 46#include "opt_modular.h"
47#include "opt_pmap_debug.h" 47#include "opt_pmap_debug.h"
48 48
49#include "isadma.h" 49#include "isadma.h"
50 50
51#include <sys/param.h> 51#include <sys/param.h>
52#include <sys/device.h> 52#include <sys/device.h>
53#include <sys/systm.h> 53#include <sys/systm.h>
54#include <sys/kernel.h> 54#include <sys/kernel.h>
55#include <sys/exec.h> 55#include <sys/exec.h>
56#include <sys/exec_aout.h> 56#include <sys/exec_aout.h>
@@ -256,27 +256,27 @@ initarm(void *arm_bootargs) @@ -256,27 +256,27 @@ initarm(void *arm_bootargs)
256 bootconfig.dram[0].address = ebsabootinfo.bt_memstart; 256 bootconfig.dram[0].address = ebsabootinfo.bt_memstart;
257 bootconfig.dram[0].pages = (ebsabootinfo.bt_memend 257 bootconfig.dram[0].pages = (ebsabootinfo.bt_memend
258 - ebsabootinfo.bt_memstart) / PAGE_SIZE; 258 - ebsabootinfo.bt_memstart) / PAGE_SIZE;
259 259
260 /* 260 /*
261 * Initialise the diagnostic serial console 261 * Initialise the diagnostic serial console
262 * This allows a means of generating output during initarm(). 262 * This allows a means of generating output during initarm().
263 * Once all the memory map changes are complete we can call consinit() 263 * Once all the memory map changes are complete we can call consinit()
264 * and not have to worry about things moving. 264 * and not have to worry about things moving.
265 */ 265 */
266 pmap_devmap_bootstrap((vaddr_t)ebsabootinfo.bt_l1, cats_devmap); 266 pmap_devmap_bootstrap((vaddr_t)ebsabootinfo.bt_l1, cats_devmap);
267 267
268#ifdef FCOM_INIT_ARM 268#ifdef FCOM_INIT_ARM
269 fcomcnattach(DC21285_ARMCSR_BASE, comcnspeed, comcnmode); 269 fcomcnattach(DC21285_ARMCSR_VBASE, comcnspeed, comcnmode);
270#endif 270#endif
271 271
272 /* Talk to the user */ 272 /* Talk to the user */
273 printf("NetBSD/cats booting ...\n"); 273 printf("NetBSD/cats booting ...\n");
274 274
275 if (ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_EBSA 275 if (ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_EBSA
276 && ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_CATS) 276 && ebsabootinfo.bt_magic != BT_MAGIC_NUMBER_CATS)
277 panic("Incompatible magic number %#x passed in boot args", 277 panic("Incompatible magic number %#x passed in boot args",
278 ebsabootinfo.bt_magic); 278 ebsabootinfo.bt_magic);
279 279
280#ifdef VERBOSE_INIT_ARM 280#ifdef VERBOSE_INIT_ARM
281 /* output the incoming bootinfo */ 281 /* output the incoming bootinfo */
282 printf("bootinfo @ %p\n", arm_bootargs); 282 printf("bootinfo @ %p\n", arm_bootargs);