diff options
| author | Olof Johansson <olof@lixom.net> | 2017-05-25 17:02:05 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2017-05-25 17:02:05 -0700 |
| commit | 962ef410d933dcf92303470484e101f4661d58cc (patch) | |
| tree | 7e877c85404a2f5bd063f048955d6061072f8569 /arch | |
| parent | 5711ea1b5421cbc3f0e35162e3d9611b1a57544c (diff) | |
| parent | 6c0c57ac0951a3166f318b82055b6e60eeaada14 (diff) | |
| download | linux-962ef410d933dcf92303470484e101f4661d58cc.tar.gz linux-962ef410d933dcf92303470484e101f4661d58cc.tar.bz2 linux-962ef410d933dcf92303470484e101f4661d58cc.zip | |
Merge tag 'arm-soc/for-4.12/devicetree-fixes-2' of http://github.com/Broadcom/stblinux into fixes
This pull request contains Broadcom ARM-based SoCs Device Tree fixes for 4.12,
please pull the following:
- Phil provides a fix for the BCM283x (Raspberry Pi) by flagging the first
4KiB of physical memory as a reserved region in order to let the secondary
cores successfully spin until they are brought online
* tag 'arm-soc/for-4.12/devicetree-fixes-2' of http://github.com/Broadcom/stblinux:
ARM: dts: bcm283x: Reserve first page for firmware
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/bcm283x.dtsi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi index 561f27d8d922..9444a9a9ba10 100644 --- a/arch/arm/boot/dts/bcm283x.dtsi +++ b/arch/arm/boot/dts/bcm283x.dtsi @@ -3,6 +3,11 @@ #include <dt-bindings/clock/bcm2835-aux.h> #include <dt-bindings/gpio/gpio.h> +/* firmware-provided startup stubs live here, where the secondary CPUs are + * spinning. + */ +/memreserve/ 0x00000000 0x00001000; + /* This include file covers the common peripherals and configuration between * bcm2835 and bcm2836 implementations, leaving the CPU configuration to * bcm2835.dtsi and bcm2836.dtsi. |