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
build/jam/board/raspberry_pi/BoardSetup
+1 -1
View File
@@ -49,7 +49,7 @@ HAIKU_BOARD_SDIMAGE_SIZE = 256 ;
# gcc flags for the specific cpu # gcc flags for the specific cpu
# #
local flags = -mtune=arm1176jzf-s -march=armv6 -mfloat-abi=softfp ; local flags = -mtune=arm1176jzf-s -march=armv6 ;
HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ; HAIKU_ASFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;
HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ; HAIKU_CCFLAGS_$(HAIKU_PACKAGING_ARCH) += $(flags) ;
headers/private/kernel/arch/arm/bcm2835.h → headers/private/kernel/arch/arm/bcm283X.h
+13 -13
View File
@@ -23,8 +23,8 @@
* Authors: * Authors:
* Alexander von Gluck, kallisti5@unixzen.com * Alexander von Gluck, kallisti5@unixzen.com
*/ */
#ifndef __PLATFORM_BCM2835_H #ifndef __PLATFORM_BCM283X_H
#define __PLATFORM_BCM2835_H #define __PLATFORM_BCM283X_H
#define SIZE_4K 0x00001000 #define SIZE_4K 0x00001000
@@ -37,19 +37,19 @@
*/ */
// Section 1.2.2 // Section 1.2.2
#define BCM2835_SDRAM_BASE 0x00000000 #define BCM283X_SDRAM_BASE 0x00000000
#define BCM2835_PERIPHERAL_BASE 0x20000000 #define BCM283X_PERIPHERAL_BASE 0x20000000
// Added to physical addresses to select the different cache behaviours // Added to physical addresses to select the different cache behaviours
#define BCM2835_VIDEO_CORE_L1_L2_CACHED (0 << 30) #define BCM283X_VIDEO_CORE_L1_L2_CACHED (0 << 30)
#define BCM2835_VIDEO_CORE_L2_COHERENT (1 << 30) #define BCM283X_VIDEO_CORE_L2_COHERENT (1 << 30)
#define BCM2835_VIDEO_CORE_L2_CACHED (2 << 30) #define BCM283X_VIDEO_CORE_L2_CACHED (2 << 30)
#define BCM2835_VIDEO_CORE_UNCACHED (3 << 30) #define BCM283X_VIDEO_CORE_UNCACHED (3 << 30)
// The highest two bits are used to select aliases to the physical memory // The highest two bits are used to select aliases to the physical memory
// with different cache semantic. Clearing them converts the address to // with different cache semantic. Clearing them converts the address to
// physical memory as seen by ARM. // 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 #define ST_BASE 0x3000
@@ -57,7 +57,7 @@
#define DMA_BASE 0x7000 #define DMA_BASE 0x7000
// DMA Controller, sec 4.2, page 39 // DMA Controller, sec 4.2, page 39
#define ARM_BASE 0xB000 #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 #define PM_BASE 0x100000
// Power Management, Reset controller and Watchdog registers // Power Management, Reset controller and Watchdog registers
#define GPIO_BASE 0x200000 #define GPIO_BASE 0x200000
@@ -89,10 +89,10 @@
#define VECT_BASE 0xFFFF0000 #define VECT_BASE 0xFFFF0000
#define VECT_SIZE SIZE_4K #define VECT_SIZE SIZE_4K
#define DEVICE_BASE BCM2835_PERIPHERAL_BASE #define DEVICE_BASE BCM283X_PERIPHERAL_BASE
#define DEVICE_SIZE 0xFFFFFF #define DEVICE_SIZE 0xFFFFFF
#define SDRAM_BASE BCM2835_SDRAM_BASE #define SDRAM_BASE BCM283X_SDRAM_BASE
#define SDRAM_SIZE 0x4000000 #define SDRAM_SIZE 0x4000000
// 64Mb // 64Mb
@@ -149,4 +149,4 @@
#define ARM_MAILBOX_CHANNEL_FRAMEBUFFER 1 #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_TYPE_ARM6 1
#define BOARD_CPU_BCM2835 1 #define BOARD_CPU_BCM2835 1
#include <arch/arm/bcm2825.h> #include <arch/arm/bcm283X.h>
// UART Settings // UART Settings
#define BOARD_UART_AMBA_PL011 1 #define BOARD_UART_AMBA_PL011 1
src/system/boot/arch/arm/arch_framebuffer_bcm2835.cpp
+3 -3
View File
@@ -11,7 +11,7 @@
#include "arch_framebuffer.h" #include "arch_framebuffer.h"
#include <arch/arm/bcm2835.h> #include <arch/arm/bcm283X.h>
#include <arch/cpu.h> #include <arch/cpu.h>
#include <boot/stage2.h> #include <boot/stage2.h>
#include <boot/platform.h> #include <boot/platform.h>
@@ -124,7 +124,7 @@ ArchFBArmBCM2835::SetVideoMode(int width, int height, int depth)
// TODO: arch_mailbox calls! // TODO: arch_mailbox calls!
// status_t result = write_mailbox(ARM_MAILBOX_CHANNEL_FRAMEBUFFER, // status_t result = write_mailbox(ARM_MAILBOX_CHANNEL_FRAMEBUFFER,
// (uint32)&sFramebufferConfig | BCM2835_VIDEO_CORE_L2_COHERENT); // (uint32)&sFramebufferConfig | BCM283X_VIDEO_CORE_L2_COHERENT);
// if (result != B_OK) // if (result != B_OK)
// return result; // return result;
@@ -159,7 +159,7 @@ ArchFBArmBCM2835::SetVideoMode(int width, int height, int depth)
// * sFramebufferConfig.height); // * sFramebufferConfig.height);
fPhysicalBase fPhysicalBase
= BCM2835_BUS_TO_PHYSICAL(sFramebufferConfig.frame_buffer_address); = BCM283X_BUS_TO_PHYSICAL(sFramebufferConfig.frame_buffer_address);
fSize = sFramebufferConfig.screen_size; fSize = sFramebufferConfig.screen_size;
// TODO: kDefaultPageFlags // TODO: kDefaultPageFlags
src/system/boot/arch/arm/arch_mailbox_bcm2835.cpp
+1 -1
View File
@@ -13,7 +13,7 @@
#include "arch_mailbox.h" #include "arch_mailbox.h"
#include "arch_cpu.h" #include "arch_cpu.h"
#include "bcm2835.h" #include <arch/arm/bcm283X.h>
class ArchMailboxArmBCM2835 final : public ArchMailbox { class ArchMailboxArmBCM2835 final : public ArchMailbox {
src/system/boot/platform/raspberrypi_arm/gpio.h
+1 -1
View File
@@ -11,7 +11,7 @@
#include <SupportDefs.h> #include <SupportDefs.h>
#include <arch/arm/bcm2835.h> #include <arch/arm/bcm283X.h>
#define GPIO_IN 0 #define GPIO_IN 0
src/system/boot/platform/u-boot/video.cpp
+1 -1
View File
@@ -111,7 +111,7 @@ platform_init_video(void)
#elif defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836) #elif defined(BOARD_CPU_BCM2835) || defined(BOARD_CPU_BCM2836)
extern ArchFramebuffer *arch_get_fb_arm_bcm2835(addr_t base); extern ArchFramebuffer *arch_get_fb_arm_bcm2835(addr_t base);
// BCM2835/BCM2836 gets their framebuffer base from a Mailbox // BCM2835/BCM2836 gets their framebuffer base from a Mailbox
gFramebuffer = arch_get_fb_arm_bcm2825(0x0); gFramebuffer = arch_get_fb_arm_bcm2835(0x0);
#elif defined(BOARD_CPU_OMAP3) #elif defined(BOARD_CPU_OMAP3)
extern ArchFramebuffer *arch_get_fb_arm_omap3(addr_t base); extern ArchFramebuffer *arch_get_fb_arm_omap3(addr_t base);
gFramebuffer = arch_get_fb_arm_omap3(FB_BASE); gFramebuffer = arch_get_fb_arm_omap3(FB_BASE);