merge

[plan9front.git] / sys / src / 9 / bcm / archbcm.c

diff --git a/sys/src/9/bcm/archbcm.c b/sys/src/9/bcm/archbcm.c
index 443a9b7090649bc6abb86569a973bc527f21b66f..d2e13833029d32812bcffe0d549d519261c9eadf 100644 (file)
--- a/sys/src/9/bcm/archbcm.c
+++ b/sys/src/9/bcm/archbcm.c
@@ -15,8 +15,10 @@
 
 Soc soc = {
        .dramsize       = 512*MiB,
-       .physio         = 0x20000000,
        .busdram        = 0x40000000,
+       .iosize         = 16*MiB,
+       .virtio         = VIRTIO,
+       .physio         = 0x20000000,
        .busio          = 0x7E000000,
        .armlocal       = 0,
        .l1ptedramattrs = Cached | Buffered,
@@ -113,12 +115,6 @@ archbcmlink(void)
        addclock0link(wdogfeed, HZ);
 }
 
-int
-l2ap(int ap)
-{
-       return (AP(3, (ap))|AP(2, (ap))|AP(1, (ap))|AP(0, (ap)));
-}
-
 int
 cmpswap(long *addr, long old, long new)
 {