Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: Prevent bcm283X inclusion from breaking other boards

Browse Source 
* Move *_BASE into board_config.h to prevent conflicts
This commit is contained in:
Alexander von Gluck IV 2015-04-04 17:44:06 -05:00
parent 59ce662464
commit b1ad5660b2
3 changed files with 22 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
headers/private/kernel/arch/arm/bcm283X.h
View File

@ -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!

10
headers/private/kernel/arch/arm/board/rpi1/board_config.h
View File

@ -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

10
headers/private/kernel/arch/arm/board/rpi2/board_config.h
View File

@ -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