Module Name: src
Committed By: bsh
Date: Sat Nov 13 06:29:12 UTC 2010
Modified Files:
src/sys/arch/evbarm/imx31: imx31lk_machdep.c
Log Message:
make this compile again. Need to revisit for UART support.
To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 src/sys/arch/evbarm/imx31/imx31lk_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/imx31/imx31lk_machdep.c
diff -u src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.9 src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.10
--- src/sys/arch/evbarm/imx31/imx31lk_machdep.c:1.9 Sat Dec 26 16:01:24 2009
+++ src/sys/arch/evbarm/imx31/imx31lk_machdep.c Sat Nov 13 06:29:12 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: imx31lk_machdep.c,v 1.9 2009/12/26 16:01:24 uebayasi Exp $ */
+/* $NetBSD: imx31lk_machdep.c,v 1.10 2010/11/13 06:29:12 bsh Exp $ */
/*
* Startup routines for the ZOOM iMX31 LITEKIT.
@@ -110,7 +110,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.9 2009/12/26 16:01:24 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: imx31lk_machdep.c,v 1.10 2010/11/13 06:29:12 bsh Exp $");
#include "opt_ddb.h"
#include "opt_kgdb.h"
@@ -153,6 +153,7 @@
#include <arm/arm32/pte.h>
#include <arm/arm32/machdep.h>
+#include <arm/imx/imx31reg.h>
#include <arm/imx/imxuartreg.h>
#include <arm/imx/imxuartvar.h>
#include <evbarm/imx31/imx31lk_reg.h>
@@ -340,7 +341,7 @@
static const struct pmap_devmap imx31lk_devmap[] = {
{
IMX31LITEKIT_UART1_VBASE,
- _A(IMX_UART1_BASE),
+ _A(UART1_BASE),
_S(L1_S_SIZE),
VM_PROT_READ|VM_PROT_WRITE,
PTE_NOCACHE,
@@ -398,7 +399,7 @@
/* Calibrate the delay loop. */
#endif
- imx31lk_consinit(1);
+ consinit();
#ifdef KGDB
kgdb_port_init();
@@ -672,7 +673,7 @@
cpu_setttb(kernel_l1pt.pv_pa);
cpu_tlb_flushID();
cpu_domains(DOMAIN_CLIENT << (PMAP_DOMAIN_KERNEL*2));
- imx31lk_consinit(2);
+ //imx31lk_consinit(2);
/*
* Moved from cpu_startup() as data_abort_handler() references
@@ -809,6 +810,7 @@
#endif /* KGDB */
+#if 0
void
imx31lk_consinit(int phase)
{
@@ -819,39 +821,22 @@
ophase = phase;
switch (phase) {
case 1:
- imxuart_init(0, IMX_UART1_BASE);
+ imxuart_init(0, UART1_BASE);
break;
case 2:
bh = IMX31LITEKIT_UART1_VBASE;
- bh |= (IMX_UART1_BASE & ~_A(IMX_UART1_BASE));
+ bh |= (UART1_BASE & ~_A(UART1_BASE));
imxuart_init(0, bh);
break;
}
}
}
+#endif
void
consinit(void)
{
- imx31lk_consinit(2);
-}
-
-void consinit_test(void);
-void
-consinit_test(void)
-{
- imxuart_softc_t *sc, softc;
- extern int imxuart_puts(imxuart_softc_t *sc, const char *s);
-
- printf("\n%s start\n", __func__);
- sc = &softc;
- sc->sc_init_cnt = 0;
- imxuart_init(sc, IMX_UART1_BASE);
- imxuart_puts(sc, "test1\r\n");
- imxuart_init(sc,
- IMX31LITEKIT_UART1_VBASE|(IMX_UART1_BASE & ~_A(IMX_UART1_BASE)));
- imxuart_puts(sc, "test2\r\n");
- printf("%s done\n", __func__);
+ // imx31lk_consinit(2);
}
#ifdef KGDB
