Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 158c9c78a50f7f04f4498abe36f8c1be83fafb75

Authored by Stephen Warren
Committed by Tom Rini
1 parent d22a765755
Exists in v2017.01-smarct4x and in 30 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

ARM: rpi: add some missing Kconfig help text 

Add notes re: enabling the UART to the RPi 3 32-bit help text. Fully
describe the RPi 3 64-bit board option.

Signed-off-by: Stephen Warren <swarren@wwwdotorg.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 1 changed file with 27 additions and 1 deletions Side-by-side Diff

arch/arm/mach-bcm283x/Kconfig
Diff comments   View file @ 158c9c7
... ... @@ -63,7 +63,9 @@
63 63 This option assumes the VideoCore firmware is configured to use the
64 64 mini UART (rather than PL011) for the serial console. This is the
65 65 default on the RPi 3. To enable the UART console, the following non-
66   - default option must be present in config.txt: enable_uart=1.
  66 + default option must be present in config.txt: enable_uart=1. This is
  67 + required for U-Boot to operate correctly, even if you only care
  68 + about the HDMI/usbkbd console.
67 69  
68 70 This option creates a build targetting the ARMv7/AArch32 ISA.
69 71 select ARMV7_LPAE
... ... @@ -72,6 +74,30 @@
72 74  
73 75 config TARGET_RPI_3
74 76 bool "Raspberry Pi 3 64-bit build"
  77 + help
  78 + Support for all BCM2837-based Raspberry Pi variants, such as
  79 + the RPi 3 model B, in AArch64 (64-bit) mode.
  80 +
  81 + This option assumes the VideoCore firmware is configured to use the
  82 + mini UART (rather than PL011) for the serial console. This is the
  83 + default on the RPi 3. To enable the UART console, the following non-
  84 + default option must be present in config.txt: enable_uart=1. This is
  85 + required for U-Boot to operate correctly, even if you only care
  86 + about the HDMI/usbkbd console.
  87 +
  88 + At the time of writing, the VC FW requires a non-default option in
  89 + config.txt to request the ARM CPU boot in 64-bit mode:
  90 + arm_control=0x200
  91 +
  92 + The VC FW typically provides ARM "stub" code to set up the CPU and
  93 + quiesce secondary SMP CPUs. This is not currently true in 64-bit
  94 + mode. In order to boot U-Boot before the VC FW is enhanced, please
  95 + see the commit description for the commit which added RPi3 support
  96 + for a workaround. Since the instructions are temporary, they are not
  97 + duplicated here. The VC FW enhancement is tracked in
  98 + https://github.com/raspberrypi/firmware/issues/579.
  99 +
  100 + This option creates a build targetting the ARMv8/AArch64 ISA.
75 101 select ARM64
76 102 select BCM2837
77 103