Skip to content

Commit 265a6e8

Browse files
committed
arm: add SOC_BRCM_BCM2837 option, include it in GENERIC
We use armv7/GENERIC for the RPI2 images. The original RPI2 is actually a 32-bit BCM2836, but v1.2 was upgraded to the 64-bit BCM2837. The project continues to provide the RPI2 image as armv7, as it's the lowest common denominator of the two. Historically, we've just kind of implicitly acknowledged this by including some bcm2837 bits on a SOC_BCM2836 kernel config -- this worked until r354875 added code that actually cared. Acknowledge formally that BCM2837 is valid in arm32. This name is inconsistent with the other BCM* SOC on !arm64 for two reasons: 1. It's a pre-existing option on arm64, and 2. the naming convention on arm/ should've arguably changed to include BRCM #1 seems to be a convincing enough argument to maintain the existing name for it.
1 parent 4701f12 commit 265a6e8

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

sys/arm/broadcom/bcm2835/bcm2835_machdep.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ FDT_PLATFORM_DEF2(bcm2835, bcm2835_legacy, "bcm2835 (legacy)", 0, "raspberrypi,m
139139
FDT_PLATFORM_DEF2(bcm2835, bcm2835, "bcm2835", 0, "brcm,bcm2835", 100);
140140
#endif
141141

142-
#ifdef SOC_BCM2836
142+
#if defined(SOC_BCM2836) || defined(SOC_BRCM_BCM2837)
143143
static platform_method_t bcm2836_methods[] = {
144144
PLATFORMMETHOD(platform_devmap_init, bcm2836_devmap_init),
145145
PLATFORMMETHOD(platform_late_init, bcm2835_late_init),
@@ -155,4 +155,4 @@ static platform_method_t bcm2836_methods[] = {
155155
FDT_PLATFORM_DEF2(bcm2836, bcm2836_legacy, "bcm2836 (legacy)", 0, "brcm,bcm2709", 100);
156156
FDT_PLATFORM_DEF2(bcm2836, bcm2836, "bcm2836", 0, "brcm,bcm2836", 100);
157157
FDT_PLATFORM_DEF2(bcm2836, bcm2837, "bcm2837", 0, "brcm,bcm2837", 100);
158-
#endif
158+
#endif /* defined(SOC_BCM2836) || defined(SOC_BRCM_BCM2837) */

sys/arm/conf/GENERIC

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,7 @@ options SOC_ALLWINNER_A83T
5757
options SOC_ALLWINNER_H2PLUS
5858
options SOC_ALLWINNER_H3
5959
options SOC_BCM2836
60+
options SOC_BRCM_BCM2837
6061
options SOC_MV_ARMADA38X
6162
options SOC_MV_ARMADAXP
6263
options SOC_TI_AM335X

sys/conf/options.arm

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ SOC_ALTERA_ARRIA10 opt_global.h
4747
SOC_ALTERA_CYCLONE5 opt_global.h
4848
SOC_BCM2835 opt_global.h
4949
SOC_BCM2836 opt_global.h
50+
SOC_BRCM_BCM2837 opt_global.h
5051
SOC_IMX51 opt_global.h
5152
SOC_IMX53 opt_global.h
5253
SOC_IMX6 opt_global.h

0 commit comments

Comments
 (0)