hrev48993 adds 1 changeset to branch 'master'
old head: 59ce6624645699a4c14b08407f406f746205d24f
new head: b1ad5660b2cd9ced0e65fdc134c095e4f135dbaf
overview:
http://cgit.haiku-os.org/haiku/log/?qt=range&q=b1ad5660b2cd+%5E59ce66246456
----------------------------------------------------------------------------
b1ad5660b2cd: arm: Prevent bcm283X inclusion from breaking other boards
* Move *_BASE into board_config.h to prevent conflicts
[ Alexander von Gluck IV <kallisti5@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev48993
Commit: b1ad5660b2cd9ced0e65fdc134c095e4f135dbaf
URL: http://cgit.haiku-os.org/haiku/commit/?id=b1ad5660b2cd
Author: Alexander von Gluck IV <kallisti5@xxxxxxxxxxx>
Date: Sat Apr 4 22:44:06 2015 UTC
----------------------------------------------------------------------------
3 files changed, 22 insertions(+), 24 deletions(-)
headers/private/kernel/arch/arm/bcm283X.h | 26 ++------------------
.../kernel/arch/arm/board/rpi1/board_config.h | 10 ++++++++
.../kernel/arch/arm/board/rpi2/board_config.h | 10 ++++++++
----------------------------------------------------------------------------
diff --git a/headers/private/kernel/arch/arm/bcm283X.h
b/headers/private/kernel/arch/arm/bcm283X.h
index bf56656..e360cfa 100644
--- a/headers/private/kernel/arch/arm/bcm283X.h
+++ b/headers/private/kernel/arch/arm/bcm283X.h
@@ -27,9 +27,6 @@
#define __PLATFORM_BCM283X_H
-#include <board_config.h>
-
-
#define SIZE_4K 0x00001000
/*
@@ -43,17 +40,8 @@
// (all loader drivers compiled in, drivers chosen based on FDT)
//
#define BCM283X_SDRAM_BASE 0x00000000
-#if defined(BOARD_CPU_BCM2835)
-#define BCM283X_PERIPHERAL_BASE 0x20000000
-#elif defined(BOARD_CPU_BCM2836)
-#define BCM283X_PERIPHERAL_BASE 0x3f000000
-#else
-// This will always trigger on non-BCM arm boards
-// Leave in until we use FDT to pick needed board drivers at runtime.
-// We can get peripheral base from the DTB long-term
-#define BCM283X_PERIPHERAL_BASE 0x0
-#warning Unknown BCM283X chipset!
-#endif
+#define BCM2835_PERIPHERAL_BASE 0x20000000
+#define BCM2836_PERIPHERAL_BASE 0x3f000000
// Added to physical addresses to select the different cache behaviours
@@ -102,16 +90,6 @@
#define ARM_CTRL_0_SBM_BASE (ARM_BASE + 0x800)
// ARM Semaphores, Doorbells, and Mailboxes
-#define VECT_BASE 0xFFFF0000
-#define VECT_SIZE SIZE_4K
-
-#define DEVICE_BASE BCM283X_PERIPHERAL_BASE
-#define DEVICE_SIZE 0xFFFFFF
-
-#define SDRAM_BASE BCM283X_SDRAM_BASE
-#define SDRAM_SIZE 0x4000000
- // 64Mb
-
/* UART */
// TODO: Check these UART defines!
diff --git a/headers/private/kernel/arch/arm/board/rpi1/board_config.h
b/headers/private/kernel/arch/arm/board/rpi1/board_config.h
index 607c71c..67f23ad 100644
--- a/headers/private/kernel/arch/arm/board/rpi1/board_config.h
+++ b/headers/private/kernel/arch/arm/board/rpi1/board_config.h
@@ -16,6 +16,16 @@
#include <arch/arm/bcm283X.h>
+#define DEVICE_BASE BCM2835_PERIPHERAL_BASE
+#define DEVICE_SIZE 0xFFFFFF
+
+#define VECT_BASE 0xFFFF0000
+#define VECT_SIZE SIZE_4K
+
+#define SDRAM_BASE BCM283X_SDRAM_BASE
+#define SDRAM_SIZE 0x4000000
+ // 64Mb
+
// UART Settings
#define BOARD_UART_PL011 1
diff --git a/headers/private/kernel/arch/arm/board/rpi2/board_config.h
b/headers/private/kernel/arch/arm/board/rpi2/board_config.h
index 31f8301..98e21a0 100644
--- a/headers/private/kernel/arch/arm/board/rpi2/board_config.h
+++ b/headers/private/kernel/arch/arm/board/rpi2/board_config.h
@@ -16,6 +16,16 @@
#include <arch/arm/bcm283X.h>
+#define DEVICE_BASE BCM2836_PERIPHERAL_BASE
+#define DEVICE_SIZE 0xFFFFFF
+
+#define VECT_BASE 0xFFFF0000
+#define VECT_SIZE SIZE_4K
+
+#define SDRAM_BASE BCM283X_SDRAM_BASE
+#define SDRAM_SIZE 0x4000000
+ // 64Mb
+
// UART Settings
#define BOARD_UART_PL011 1
