[U-Boot] [PATCH 1/5] ARM: bcm2835: move CONFIG_BCM283* to Kconfig
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- This series depends on:
* My series beginning with "ARM: bcm283x: don't always define CONFIG_BCM2835" * My patch "serial: add BCM283x mini UART driver". * Alexander Graf's arm64 page table/cache series starting with "arm64: Add 32bit arm compatible dcache definitions". --- arch/arm/mach-bcm283x/Kconfig | 12 +++++++++++- include/configs/rpi.h | 1 - include/configs/rpi_2.h | 1 - 3 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 1a7baf69e590..dc6770437ec6 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -1,3 +1,11 @@ +config BCM2835 + bool "Broadcom BCM2835 SoC support" + depends on ARCH_BCM283X + +config BCM2836 + bool "Broadcom BCM2836 SoC support" + depends on ARCH_BCM283X + menu "Broadcom BCM283X family" depends on ARCH_BCM283X
@@ -7,12 +15,14 @@ choice
config TARGET_RPI bool "Raspberry Pi" + select BCM2835 select CPU_ARM1176
config TARGET_RPI_2 bool "Raspberry Pi 2" - select CPU_V7 select ARMV7_LPAE + select BCM2836 + select CPU_V7
endchoice
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index a788ce42e44c..86422e390da2 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -7,7 +7,6 @@ #ifndef __CONFIG_H #define __CONFIG_H
-#define CONFIG_BCM2835 #define CONFIG_SYS_CACHELINE_SIZE 32
#include "rpi-common.h" diff --git a/include/configs/rpi_2.h b/include/configs/rpi_2.h index 13dc8de14315..0917e8650864 100644 --- a/include/configs/rpi_2.h +++ b/include/configs/rpi_2.h @@ -8,7 +8,6 @@ #define __CONFIG_H
#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_BCM2836 #define CONFIG_SYS_CACHELINE_SIZE 64
#include "rpi-common.h"
To simplify support for new SoCs, just use a constant filename for the unknown case. In practice this case shouldn't be hit anyway, so the filename isn't relevant, and certainly doesn't need to differentiate between SoCs. If a user has an as-yet-unknown board, they can override this value in the environment anyway.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- board/raspberrypi/rpi/rpi.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 1fd7591f3325..54ea4a814b54 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -99,11 +99,7 @@ struct rpi_model {
static const struct rpi_model rpi_model_unknown = { "Unknown model", -#ifdef CONFIG_BCM2836 - "bcm2836-rpi-other.dtb", -#else - "bcm2835-rpi-other.dtb", -#endif + "bcm283x-rpi-other.dtb", false, };
This allows U-Boot to known the name of the board.
The existing rpi_2_defconfig should be able to operate correctly on the Raspberry Pi 3 in 32-bit mode /if/ you have configured the firmware to use the PL011 UART as the console UART (the default is the mini UART). This should be possible by loading the pi3-miniuart-bt DT overlay. As of 20160323 (or firmware.git commit 7f536a27cc74 "kernel: lirc_rpi: Lower IR reception error to debug See: https://github.com/raspberrypi/linux/pull/1361" this doesn't seem to work; I assume this is due to a firmware bug.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- board/raspberrypi/rpi/rpi.c | 5 +++++ 1 file changed, 5 insertions(+)
diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index 54ea4a814b54..d31a79c661d9 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -109,6 +109,11 @@ static const struct rpi_model rpi_models_new_scheme[] = { "bcm2836-rpi-2-b.dtb", true, }, + [0x8] = { + "3 Model B", + "bcm2837-rpi-3-b.dtb", + true, + }, [0x9] = { "Zero", "bcm2835-rpi-zero.dtb",
This adds an explanation of which Raspberry Pi models each target option supports.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- arch/arm/mach-bcm283x/Kconfig | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-)
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index dc6770437ec6..0790dd02d6f0 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -14,12 +14,29 @@ choice optional
config TARGET_RPI - bool "Raspberry Pi" + bool "Raspberry Pi (all BCM2835 variants)" + help + Support for all ARM1176-/BCM2835-based Raspberry Pi variants, such as + the A, A+, B, B+, Compute Module, and Zero. This option cannot + support BCM2836/BCM2837-based Raspberry Pis such as the RPi 2 and + RPi 3 due to different peripheral address maps. + + This option creates a build targetting the ARM1176 ISA. select BCM2835 select CPU_ARM1176
config TARGET_RPI_2 bool "Raspberry Pi 2" + help + Support for all BCM2836-based Raspberry Pi variants, such as + the RPi 2 model B. + + This option should also support BCM2837-based variants such as the + RPi 3 model B, when run in 32-bit mode, provided you have configured + the VideoCore firmware (via config.txt) to select the PL011 UART for + the console (the default is the mini UART on the RPi 3). + + This option creates a build targetting the ARMv7/AArch32 ISA. select ARMV7_LPAE select BCM2836 select CPU_V7
The Raspberry Pi 3 contains a BCM2837 SoC. The BCM2837 is a BCM2836 with the CPU complex swapped out for a quad-core ARMv8. This can operate in 32- or 64-bit mode. 32-bit mode is the current default selected by the VideoCore firmware on the Raspberry Pi 3. This patch adds a 32-bit port of U-Boot for the Raspberry Pi 3.
From U-Boot's perspective, the only delta between the RPi 2 and RPi 3 is a
change in usage of the SoC UARTs. On all previous Pis, the PL011 was the only UART in use. The Raspberry Pi 3 adds a Bluetooth module which uses a UART to connect to the SoC. By default, the PL011 is used for this purpose since it has larger FIFOs than the other ("mini" UART). However, this can be configured via the VideoCore firmware's config.txt file. This patch hard-codes use of the mini UART in the RPi 3 port. If your system uses the PL011 UART for the console even on the RPi 3, please use the RPi 2 U-Boot port instead. A future change might determine which UART to use at run-time, thus allowing the RPi 2 and RPi 3 (32-bit) ports to be squashed together.
The mini UART has some limitations. One externally visible issue in the BCM2837 integration is that the UART divides the SoC's "core clock" to generate the baud rate. The core clock is typically variable, and under control of the VideoCore firmware for thermal management reasons. If the VC FW does modify the core clock rate, UART communication will be corrupted since the baud rate will vary from the expected value. This was not an issue for the PL011 UART, since it is fed by a fixed 3MHz clock. To work around this, the VideoCore firmware can be told not to modify the SoC core clock. However, the only way this can happen and be thermally safe is to limit the core clock to a low/minimum frequency. This leaves performance on the table for use-cases that don't care about a UART console. Consequently, use of the mini UART console must be explicitly requested by entering the following line into config.txt
enable_uart=1
A recent version of the VC firmware is required to ensure that the mini UART is fully and correctly initialized by the VC FW. At least firmware.git commit 7f536a27cc74 "kernel: lirc_rpi: Lower IR reception error to debug See: https://github.com/raspberrypi/linux/pull/1361" is required. However, note that there is a bug in that version that prevents MMC from operating correctly on any Pi. As of 20160323 that is not fixed.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- arch/arm/mach-bcm283x/Kconfig | 21 +++++++++++++++++++++ board/raspberrypi/rpi/rpi.c | 16 +++++++++++++++- board/raspberrypi/rpi_3_32b/MAINTAINERS | 6 ++++++ board/raspberrypi/rpi_3_32b/Makefile | 7 +++++++ configs/rpi_3_32b_defconfig | 11 +++++++++++ include/configs/rpi-common.h | 9 ++++++++- include/configs/rpi_3_32b.h | 15 +++++++++++++++ 7 files changed, 83 insertions(+), 2 deletions(-) create mode 100644 board/raspberrypi/rpi_3_32b/MAINTAINERS create mode 100644 board/raspberrypi/rpi_3_32b/Makefile create mode 100644 configs/rpi_3_32b_defconfig create mode 100644 include/configs/rpi_3_32b.h
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig index 0790dd02d6f0..ea33d77ae1f7 100644 --- a/arch/arm/mach-bcm283x/Kconfig +++ b/arch/arm/mach-bcm283x/Kconfig @@ -6,6 +6,10 @@ config BCM2836 bool "Broadcom BCM2836 SoC support" depends on ARCH_BCM283X
+config BCM2837 + bool "Broadcom BCM2837 SoC support" + depends on ARCH_BCM283X + menu "Broadcom BCM283X family" depends on ARCH_BCM283X
@@ -41,11 +45,27 @@ config TARGET_RPI_2 select BCM2836 select CPU_V7
+config TARGET_RPI_3_32B + bool "Raspberry Pi 3 32-bit build" + Support for all BCM2837-based Raspberry Pi variants, such as + the RPi 3 model B, in AArch32 (32-bit) mode. + + This option assumes the VideoCore firmware is configured to use the + mini UART (rather than PL011) for the serial console. This is the + default on the RPi 3. To enable the UART console, the following non- + default option must be present in config.txt: enable_uart=1. + + This option creates a build targetting the ARMv7/AArch32 ISA. + select ARMV7_LPAE + select BCM2837 + select CPU_V7 + endchoice
config SYS_BOARD default "rpi" if TARGET_RPI default "rpi_2" if TARGET_RPI_2 + default "rpi_3_32b" if TARGET_RPI_3_32B
config SYS_VENDOR default "raspberrypi" @@ -56,5 +76,6 @@ config SYS_SOC config SYS_CONFIG_NAME default "rpi" if TARGET_RPI default "rpi_2" if TARGET_RPI_2 + default "rpi_3_32b" if TARGET_RPI_3_32B
endmenu diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index d31a79c661d9..20b5cf48f558 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012-2013,2015 Stephen Warren + * (C) Copyright 2012-2016 Stephen Warren * * SPDX-License-Identifier: GPL-2.0 */ @@ -18,6 +18,7 @@ #include <asm/arch/sdhci.h> #include <asm/global_data.h> #include <dm/platform_data/serial_pl01x.h> +#include <dm/platform_data/serial_bcm283x_mu.h>
DECLARE_GLOBAL_DATA_PTR;
@@ -30,6 +31,7 @@ U_BOOT_DEVICE(bcm2835_gpios) = { .platdata = &gpio_platdata, };
+#ifdef CONFIG_PL01X_SERIAL static const struct pl01x_serial_platdata serial_platdata = { #ifndef CONFIG_BCM2835 .base = 0x3f201000, @@ -44,6 +46,18 @@ U_BOOT_DEVICE(bcm2835_serials) = { .name = "serial_pl01x", .platdata = &serial_platdata, }; +#else +static const struct bcm283x_mu_serial_platdata serial_platdata = { + .base = 0x3f215040, + .clock = 250000000, + .skip_init = true, +}; + +U_BOOT_DEVICE(bcm2837_serials) = { + .name = "serial_bcm283x_mu", + .platdata = &serial_platdata, +}; +#endif
struct msg_get_arm_mem { struct bcm2835_mbox_hdr hdr; diff --git a/board/raspberrypi/rpi_3_32b/MAINTAINERS b/board/raspberrypi/rpi_3_32b/MAINTAINERS new file mode 100644 index 000000000000..bc9df87f03d4 --- /dev/null +++ b/board/raspberrypi/rpi_3_32b/MAINTAINERS @@ -0,0 +1,6 @@ +RPI_3_32B BOARD +M: Stephen Warren swarren@wwwdotorg.org +S: Maintained +F: board/raspberrypi/rpi_3_32b/ +F: include/configs/rpi_3_32b.h +F: configs/rpi_3_32b_defconfig diff --git a/board/raspberrypi/rpi_3_32b/Makefile b/board/raspberrypi/rpi_3_32b/Makefile new file mode 100644 index 000000000000..78e287487cd4 --- /dev/null +++ b/board/raspberrypi/rpi_3_32b/Makefile @@ -0,0 +1,7 @@ +# +# (C) Copyright 2012-2016 Stephen Warren swarren@wwwdotorg.org +# +# SPDX-License-Identifier: GPL-2.0 +# + +obj-y := ../rpi/rpi.o diff --git a/configs/rpi_3_32b_defconfig b/configs/rpi_3_32b_defconfig new file mode 100644 index 000000000000..71a0c288c72c --- /dev/null +++ b/configs/rpi_3_32b_defconfig @@ -0,0 +1,11 @@ +CONFIG_ARM=y +CONFIG_ARCH_BCM283X=y +CONFIG_TARGET_RPI_3_32B=y +CONFIG_OF_BOARD_SETUP=y +CONFIG_SYS_PROMPT="U-Boot> " +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +# CONFIG_CMD_FPGA is not set +CONFIG_CMD_GPIO=y +CONFIG_PHYS_TO_BUS=y +CONFIG_OF_LIBFDT=y diff --git a/include/configs/rpi-common.h b/include/configs/rpi-common.h index 12e1adde204c..0f3ce4f4bf7c 100644 --- a/include/configs/rpi-common.h +++ b/include/configs/rpi-common.h @@ -1,5 +1,5 @@ /* - * (C) Copyright 2012,2015 Stephen Warren + * (C) Copyright 2012-2016 Stephen Warren * * SPDX-License-Identifier: GPL-2.0 */ @@ -24,6 +24,9 @@ * We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation * chose to use someone else's previously registered machine ID (3139, MX51_GGC) * rather than obtaining a valid ID:-/ + * + * For the bcm2837, hopefully a machine type is not needed, since everything + * is DT. */ #ifdef CONFIG_BCM2835 #define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 @@ -94,7 +97,11 @@ #endif
/* Console UART */ +#ifdef CONFIG_BCM2837 +#define CONFIG_BCM283X_MU_SERIAL +#else #define CONFIG_PL01X_SERIAL +#endif #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200
diff --git a/include/configs/rpi_3_32b.h b/include/configs/rpi_3_32b.h new file mode 100644 index 000000000000..c00379b9aa4d --- /dev/null +++ b/include/configs/rpi_3_32b.h @@ -0,0 +1,15 @@ +/* + * (C) Copyright 2012-2016 Stephen Warren swarren@wwwdotorg.org + * + * SPDX-License-Identifier: GPL-2.0 + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#define CONFIG_SKIP_LOWLEVEL_INIT +#define CONFIG_SYS_CACHELINE_SIZE 64 + +#include "rpi-common.h" + +#endif
On 03/23/2016 10:54 PM, Stephen Warren wrote:
The Raspberry Pi 3 contains a BCM2837 SoC. The BCM2837 is a BCM2836 with the CPU complex swapped out for a quad-core ARMv8. This can operate in 32- or 64-bit mode. 32-bit mode is the current default selected by the VideoCore firmware on the Raspberry Pi 3. This patch adds a 32-bit port of U-Boot for the Raspberry Pi 3.
...
A recent version of the VC firmware is required to ensure that the mini UART is fully and correctly initialized by the VC FW. At least firmware.git commit 7f536a27cc74 "kernel: lirc_rpi: Lower IR reception error to debug See: https://github.com/raspberrypi/linux/pull/1361" is required. However, note that there is a bug in that version that prevents MMC from operating correctly on any Pi. As of 20160323 that is not fixed.
The MMC bug has been fixed, so I'll revise this patch description since I have to resend anyway.
diff --git a/arch/arm/mach-bcm283x/Kconfig b/arch/arm/mach-bcm283x/Kconfig
+config TARGET_RPI_3_32B
- bool "Raspberry Pi 3 32-bit build"
Support for all BCM2837-based Raspberry Pi variants, such asthe RPi 3 model B, in AArch32 (32-bit) mode.
I missed the "help" line there. I fail for adding "comments" and not test building:-(
participants (1)
-
Stephen Warren