Module Name: src
Committed By: jmcneill
Date: Sun Dec 7 15:00:37 UTC 2014
Modified Files:
src/sys/arch/arm/allwinner: awin_board.c
Log Message:
only access A20 regs if running on A20
To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 src/sys/arch/arm/allwinner/awin_board.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/arm/allwinner/awin_board.c
diff -u src/sys/arch/arm/allwinner/awin_board.c:1.31 src/sys/arch/arm/allwinner/awin_board.c:1.32
--- src/sys/arch/arm/allwinner/awin_board.c:1.31 Fri Dec 5 14:36:44 2014
+++ src/sys/arch/arm/allwinner/awin_board.c Sun Dec 7 15:00:37 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: awin_board.c,v 1.31 2014/12/05 14:36:44 jmcneill Exp $ */
+/* $NetBSD: awin_board.c,v 1.32 2014/12/07 15:00:37 jmcneill Exp $ */
/*-
* Copyright (c) 2012 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -36,7 +36,7 @@
#include <sys/cdefs.h>
-__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.31 2014/12/05 14:36:44 jmcneill Exp $");
+__KERNEL_RCSID(1, "$NetBSD: awin_board.c,v 1.32 2014/12/07 15:00:37 jmcneill Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -217,7 +217,7 @@ awin_bootstrap(vaddr_t iobase, vaddr_t u
}
printf("%s: cpu status: 0=%#x 1=%#x 2=%#x 3=%#x\n", __func__,
s[0], s[1], s[2], s[3]);
- } else {
+ } else if (awin_chip_id() == AWIN_CHIP_ID_A20) {
uint32_t s0 = bus_space_read_4(&awin_bs_tag, awin_core_bsh,
AWIN_CPUCFG_OFFSET + AWIN_CPUCFG_CPU0_STATUS_REG);
uint32_t s1 = bus_space_read_4(&awin_bs_tag, awin_core_bsh,
