Module Name: src
Committed By: matt
Date: Tue Jun 18 15:39:19 UTC 2013
Modified Files:
src/sys/arch/evbarm/beagle: beagle.h
Log Message:
Use OMAP_[345]XXX
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 src/sys/arch/evbarm/beagle/beagle.h
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/beagle/beagle.h
diff -u src/sys/arch/evbarm/beagle/beagle.h:1.12 src/sys/arch/evbarm/beagle/beagle.h:1.13
--- src/sys/arch/evbarm/beagle/beagle.h:1.12 Mon Jun 17 04:38:14 2013
+++ src/sys/arch/evbarm/beagle/beagle.h Tue Jun 18 15:39:19 2013
@@ -1,4 +1,4 @@
-/* $NetBSD: beagle.h,v 1.12 2013/06/17 04:38:14 matt Exp $ */
+/* $NetBSD: beagle.h,v 1.13 2013/06/18 15:39:19 matt Exp $ */
/*
* Copyright (c) 2007 Microsoft
* All rights reserved.
@@ -62,7 +62,7 @@
#define OMAP_SDRC_SIZE OMAP3530_SDRC_SIZE
#endif
-#ifdef OMAP_4430
+#ifdef OMAP_4XXX
#define OMAP_L4_CORE_BASE OMAP4430_L4_CORE_BASE
#define OMAP_L4_CORE_SIZE OMAP4430_L4_CORE_SIZE
#define OMAP_L4_PERIPHERAL_BASE OMAP4430_L4_PERIPHERAL_BASE
@@ -77,7 +77,7 @@
#define OMAP_EMIF2_SIZE OMAP4430_EMIF2_SIZE
#endif
-#ifdef OMAP_5430
+#ifdef OMAP_5XXX
#define OMAP_L4_CORE_BASE OMAP5430_L4_CORE_BASE
#define OMAP_L4_CORE_SIZE OMAP5430_L4_CORE_SIZE
#define OMAP_L4_PERIPHERAL_BASE OMAP5430_L4_PERIPHERAL_BASE
@@ -116,14 +116,14 @@
* We devmap IO starting at KERNEL_VM_BASE + KERNEL_VM_SIZE
*/
#define OMAP_KERNEL_IO_VBASE (KERNEL_VM_BASE + KERNEL_VM_SIZE)
-#if defined(OMAP_3430) || defined(OMAP_3530)
+#if defined(OMAP_3XXX)
#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE
#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
#define OMAP_L4_WAKEUP_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
#define OMAP_SDRC_VBASE (OMAP_L4_WAKEUP_VBASE + OMAP_L4_WAKEUP_SIZE)
#define OMAP_KERNEL_IO_VEND (OMAP_SDRC_VBASE + OMAP_SDRC_SIZE)
#define CONSADDR_VA ((CONSADDR - OMAP_L4_PERIPHERAL_BASE) + OMAP_L4_PERIPHERAL_VBASE)
-#elif defined(OMAP_4430) || defined(OMAP_5430)
+#elif defined(OMAP_4XXX) || defined(OMAP_5XXX)
#define OMAP_L4_CORE_VBASE OMAP_KERNEL_IO_VBASE
#define OMAP_L4_PERIPHERAL_VBASE (OMAP_L4_CORE_VBASE + OMAP_L4_CORE_SIZE)
#define OMAP_L4_ABE_VBASE (OMAP_L4_PERIPHERAL_VBASE + OMAP_L4_PERIPHERAL_SIZE)
