[src/trunk]: src/sys/arch/arm/broadcom Allow SRAB to be optional.

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

details:   https://anonhg.NetBSD.org/src/rev/53fc96ae2e84
branches:  trunk
changeset: 328086:53fc96ae2e84
user:      matt <matt%NetBSD.org@localhost>
date:      Wed Mar 26 03:19:11 2014 +0000

description:
Allow SRAB to be optional.

diffstat:

 sys/arch/arm/broadcom/bcm53xx_board.c |  6 ++++--
 sys/arch/arm/broadcom/bcm53xx_ccb.c   |  4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diffs (53 lines):

diff -r 9be7705740fd -r 53fc96ae2e84 sys/arch/arm/broadcom/bcm53xx_board.c
--- a/sys/arch/arm/broadcom/bcm53xx_board.c     Wed Mar 26 03:18:56 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_board.c     Wed Mar 26 03:19:11 2014 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: bcm53xx_board.c,v 1.20 2014/02/19 23:21:02 matt Exp $  */
+/*     $NetBSD: bcm53xx_board.c,v 1.21 2014/03/26 03:19:11 matt Exp $  */
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
  * All rights reserved.
@@ -35,7 +35,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.20 2014/02/19 23:21:02 matt Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_board.c,v 1.21 2014/03/26 03:19:11 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -640,6 +640,7 @@
        }
 }
 
+#ifdef SRAB_BASE
 static kmutex_t srab_lock __cacheline_aligned;
 
 void
@@ -742,3 +743,4 @@
        bcm53xx_srab_busywait(bst, bsh);
        mutex_spin_exit(&srab_lock);
 }
+#endif
diff -r 9be7705740fd -r 53fc96ae2e84 sys/arch/arm/broadcom/bcm53xx_ccb.c
--- a/sys/arch/arm/broadcom/bcm53xx_ccb.c       Wed Mar 26 03:18:56 2014 +0000
+++ b/sys/arch/arm/broadcom/bcm53xx_ccb.c       Wed Mar 26 03:19:11 2014 +0000
@@ -34,7 +34,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.5 2013/12/17 13:13:26 joerg Exp $");
+__KERNEL_RCSID(1, "$NetBSD: bcm53xx_ccb.c,v 1.6 2014/03/26 03:19:11 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/bus.h>
@@ -99,7 +99,9 @@
        { "bcmrng", RNG_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, 1, { IRQ_RNG } },
        { "bcmtmr", TIMER0_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, 2, { IRQ_TIMER0_1, IRQ_TIMER0_2 } },
        { "bcmtmr", TIMER1_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, 2, { IRQ_TIMER1_1, IRQ_TIMER1_2 } },
+#ifdef SRAB_BASE
        { "bcmsw", SRAB_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, },
+#endif
        { "bcmcom", UART2_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, 1, { IRQ_UART2 } },
 #ifdef BCM5301X
        { "bcmi2c", SMBUS1_BASE, 0x1000, BCMCCBCF_PORT_DEFAULT, 1, { IRQ_SMBUS1 } },