i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

arm: Rename BCM2835 SoC header to bcm283X.h

Browse Source 
* Fix a few typos in hrev48873
This commit is contained in:
Alexander von Gluck IV
2015-03-07 11:11:53 -06:00
parent f8e19d47fb
commit 523c77e052
7 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/arm/bcm2835.h → headers/private/kernel/arch/arm/bcm283X.h
+13 -13
View File
@@ -23,8 +23,8 @@
* Authors:
* Alexander von Gluck, kallisti5@unixzen.com
*/
#ifndef __PLATFORM_BCM2835_H
#define __PLATFORM_BCM2835_H
#ifndef __PLATFORM_BCM283X_H
#define __PLATFORM_BCM283X_H
#define SIZE_4K 0x00001000
@@ -37,19 +37,19 @@
*/
// Section 1.2.2
#define BCM2835_SDRAM_BASE 0x00000000
#define BCM2835_PERIPHERAL_BASE 0x20000000
#define BCM283X_SDRAM_BASE 0x00000000
#define BCM283X_PERIPHERAL_BASE 0x20000000
// Added to physical addresses to select the different cache behaviours
#define BCM2835_VIDEO_CORE_L1_L2_CACHED (0 << 30)
#define BCM2835_VIDEO_CORE_L2_COHERENT (1 << 30)
#define BCM2835_VIDEO_CORE_L2_CACHED (2 << 30)
#define BCM2835_VIDEO_CORE_UNCACHED (3 << 30)
#define BCM283X_VIDEO_CORE_L1_L2_CACHED (0 << 30)
#define BCM283X_VIDEO_CORE_L2_COHERENT (1 << 30)
#define BCM283X_VIDEO_CORE_L2_CACHED (2 << 30)
#define BCM283X_VIDEO_CORE_UNCACHED (3 << 30)
// The highest two bits are used to select aliases to the physical memory
// with different cache semantic. Clearing them converts the address to
// physical memory as seen by ARM.
#define BCM2835_BUS_TO_PHYSICAL(x) (x & ~BCM2835_VIDEO_CORE_UNCACHED)
#define BCM283X_BUS_TO_PHYSICAL(x) (x & ~BCM283X_VIDEO_CORE_UNCACHED)
#define ST_BASE 0x3000
@@ -57,7 +57,7 @@
#define DMA_BASE 0x7000
// DMA Controller, sec 4.2, page 39
#define ARM_BASE 0xB000
// BCM2835 ARM Control Block, sec 7.5, page 112
// BCM283X ARM Control Block, sec 7.5, page 112
#define PM_BASE 0x100000
// Power Management, Reset controller and Watchdog registers
#define GPIO_BASE 0x200000
@@ -89,10 +89,10 @@
#define VECT_BASE 0xFFFF0000
#define VECT_SIZE SIZE_4K
#define DEVICE_BASE BCM2835_PERIPHERAL_BASE
#define DEVICE_BASE BCM283X_PERIPHERAL_BASE
#define DEVICE_SIZE 0xFFFFFF
#define SDRAM_BASE BCM2835_SDRAM_BASE
#define SDRAM_BASE BCM283X_SDRAM_BASE
#define SDRAM_SIZE 0x4000000
// 64Mb
@@ -149,4 +149,4 @@
#define ARM_MAILBOX_CHANNEL_FRAMEBUFFER 1
#endif /* __PLATFORM_BCM2835_H */
#endif /* __PLATFORM_BCM283X_H */
headers/private/kernel/arch/arm/board/raspberry_pi/board_config.h
+1 -1
View File
@@ -14,7 +14,7 @@
#define BOARD_CPU_TYPE_ARM6 1
#define BOARD_CPU_BCM2835 1
#include <arch/arm/bcm2825.h>
#include <arch/arm/bcm283X.h>
// UART Settings
#define BOARD_UART_AMBA_PL011 1