1.1--- a/sys/src/9/bcm/mem.h
     1.2+++ b/sys/src/9/bcm/mem.h
     1.3@@ -10,9 +10,7 @@
     1.4  */
     1.5 #define	BY2PG		(4*KiB)			/* bytes per page */
     1.6 #define	PGSHIFT		12			/* log(BY2PG) */
     1.7-#define	HOWMANY(x,y)	(((x)+((y)-1))/(y))
     1.8-#define	ROUNDUP(x,y)	(HOWMANY((x),(y))*(y))
     1.9-#define	PGROUND(s)	ROUNDUP(s, BY2PG)
    1.10+#define	PGROUND(s)	ROUND(s, BY2PG)
    1.11 #define	ROUND(s, sz)	(((s)+(sz-1))&~(sz-1))
    1.12 
    1.13 #define	MAXMACH		4			/* max # cpus system can run */
    1.14@@ -51,8 +49,8 @@
    1.15 #define	FIQSTKTOP	(KZERO+0x4000)		/* FIQ stack */
    1.16 #define	L1		(KZERO+0x4000)		/* tt ptes: 16KiB aligned */
    1.17 #define	KTZERO		(KZERO+0x8000)		/* kernel text start */
    1.18-#define VIRTIO		0x7E000000		/* i/o registers */
    1.19-#define	ARMLOCAL	(VIRTIO+IOSIZE)		/* armv7 only */
    1.20+#define VIRTIO		(0x7E000000)		/* i/o registers */
    1.21+#define	ARMLOCAL	(0x7F000000)		/* armv7 only */
    1.22 #define	VGPIO		(ARMLOCAL+MiB)		/* virtual gpio for pi3 ACT LED */
    1.23 #define	FRAMEBUFFER	0xC0000000		/* video framebuffer */
    1.24 
    1.25@@ -95,7 +93,6 @@
    1.26  *	BUS  addresses as seen from the videocore gpu.
    1.27  */
    1.28 #define	PHYSDRAM	0
    1.29-#define	IOSIZE		(16*MiB)
    1.30 
    1.31 #define MIN(a, b)	((a) < (b)? (a): (b))
    1.32 #define MAX(a, b)	((a) > (b)? (a): (b))