diff options
| author | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2016-10-14 22:23:03 +0000 |
|---|---|---|
| committer | Oleksandr Tymoshenko <gonzo@FreeBSD.org> | 2016-10-14 22:23:03 +0000 |
| commit | 745c4aa5e8f0d0847cc273735c8176329ea94f78 (patch) | |
| tree | ea3ab0f0417da304dfae27af8283110137c7d99c /sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | |
| parent | 401d3029af431d61ea22ba9161d2b5184faed7d0 (diff) | |
Make BRCM2837 port conform FreeBSD/ARM64 guidelines
- Rename SOC_BCM2837 to SOC_BRCM_BCM2837, put it to opt_soc.h
- do not use files.XXX files, just move required sources to
conf/files.arm64 and make them depend on soc_brcm_bcm2837
Suggested by: andrew
Notes
Notes:
svn path=/head/; revision=307335
Diffstat (limited to 'sys/arm/broadcom/bcm2835/bcm2835_vcbus.h')
| -rw-r--r-- | sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h index e71afb70480e..1b540d9be10f 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h +++ b/sys/arm/broadcom/bcm2835/bcm2835_vcbus.h @@ -33,16 +33,23 @@ #ifndef _BCM2835_VCBUS_H_ #define _BCM2835_VCBUS_H_ +/* + * ARM64 define its SOC options in opt_soc.h + */ +#if defined(__aarch64__) +#include "opt_soc.h" +#endif + #define BCM2835_VCBUS_SDRAM_CACHED 0x40000000 #define BCM2835_VCBUS_IO_BASE 0x7E000000 #define BCM2835_VCBUS_SDRAM_UNCACHED 0xC0000000 -#if defined(SOC_BCM2836) || defined(SOC_BCM2837) -#define BCM2835_ARM_IO_BASE 0x3f000000 -#define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_UNCACHED -#else +#if defined(SOC_BCM2835) #define BCM2835_ARM_IO_BASE 0x20000000 #define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_CACHED +#else +#define BCM2835_ARM_IO_BASE 0x3f000000 +#define BCM2835_VCBUS_SDRAM_BASE BCM2835_VCBUS_SDRAM_UNCACHED #endif #define BCM2835_ARM_IO_SIZE 0x01000000 |