[U-Boot] [PATCH 1/2] ARM: rpi: rename rpi_b to rpi
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- These two patches are based on "ARM: rpi_b: detect board revision" which I sent recently. --- arch/arm/Kconfig | 6 +++--- board/raspberrypi/{rpi_b => rpi}/Kconfig | 6 +++--- board/raspberrypi/rpi/MAINTAINERS | 6 ++++++ board/raspberrypi/{rpi_b => rpi}/Makefile | 2 +- board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} | 0 board/raspberrypi/rpi_b/MAINTAINERS | 6 ------ common/lcd.c | 2 +- configs/rpi_b_defconfig | 2 -- configs/rpi_defconfig | 2 ++ doc/README.clang | 4 ++-- include/configs/{rpi_b.h => rpi.h} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename board/raspberrypi/{rpi_b => rpi}/Kconfig (71%) create mode 100644 board/raspberrypi/rpi/MAINTAINERS rename board/raspberrypi/{rpi_b => rpi}/Makefile (96%) rename board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} (100%) delete mode 100644 board/raspberrypi/rpi_b/MAINTAINERS delete mode 100644 configs/rpi_b_defconfig create mode 100644 configs/rpi_defconfig rename include/configs/{rpi_b.h => rpi.h} (100%)
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index 9b492bea3a06..79be763d5eca 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -396,8 +396,8 @@ config TARGET_MX35PDK bool "Support mx35pdk" select CPU_ARM1136
-config TARGET_RPI_B - bool "Support rpi_b" +config TARGET_RPI + bool "Support rpi" select CPU_ARM1176
config TARGET_TNETV107X_EVM @@ -926,7 +926,7 @@ source "board/palmtreo680/Kconfig" source "board/phytec/pcm051/Kconfig" source "board/ppcag/bg0900/Kconfig" source "board/pxa255_idp/Kconfig" -source "board/raspberrypi/rpi_b/Kconfig" +source "board/raspberrypi/rpi/Kconfig" source "board/ronetix/pm9261/Kconfig" source "board/ronetix/pm9263/Kconfig" source "board/ronetix/pm9g45/Kconfig" diff --git a/board/raspberrypi/rpi_b/Kconfig b/board/raspberrypi/rpi/Kconfig similarity index 71% rename from board/raspberrypi/rpi_b/Kconfig rename to board/raspberrypi/rpi/Kconfig index 501d511f599e..6a538cfac568 100644 --- a/board/raspberrypi/rpi_b/Kconfig +++ b/board/raspberrypi/rpi/Kconfig @@ -1,7 +1,7 @@ -if TARGET_RPI_B +if TARGET_RPI
config SYS_BOARD - default "rpi_b" + default "rpi"
config SYS_VENDOR default "raspberrypi" @@ -10,6 +10,6 @@ config SYS_SOC default "bcm2835"
config SYS_CONFIG_NAME - default "rpi_b" + default "rpi"
endif diff --git a/board/raspberrypi/rpi/MAINTAINERS b/board/raspberrypi/rpi/MAINTAINERS new file mode 100644 index 000000000000..6dcb7bd24ecd --- /dev/null +++ b/board/raspberrypi/rpi/MAINTAINERS @@ -0,0 +1,6 @@ +RPI BOARD +M: Stephen Warren swarren@wwwdotorg.org +S: Maintained +F: board/raspberrypi/rpi/ +F: include/configs/rpi.h +F: configs/rpi_defconfig diff --git a/board/raspberrypi/rpi_b/Makefile b/board/raspberrypi/rpi/Makefile similarity index 96% rename from board/raspberrypi/rpi_b/Makefile rename to board/raspberrypi/rpi/Makefile index 7e9bfbff0cb5..c53c92b1ddb7 100644 --- a/board/raspberrypi/rpi_b/Makefile +++ b/board/raspberrypi/rpi/Makefile @@ -12,4 +12,4 @@ # GNU General Public License for more details. #
-obj-y := rpi_b.o +obj-y := rpi.o diff --git a/board/raspberrypi/rpi_b/rpi_b.c b/board/raspberrypi/rpi/rpi.c similarity index 100% rename from board/raspberrypi/rpi_b/rpi_b.c rename to board/raspberrypi/rpi/rpi.c diff --git a/board/raspberrypi/rpi_b/MAINTAINERS b/board/raspberrypi/rpi_b/MAINTAINERS deleted file mode 100644 index 14f39486a346..000000000000 --- a/board/raspberrypi/rpi_b/MAINTAINERS +++ /dev/null @@ -1,6 +0,0 @@ -RPI_B BOARD -M: Stephen Warren swarren@wwwdotorg.org -S: Maintained -F: board/raspberrypi/rpi_b/ -F: include/configs/rpi_b.h -F: configs/rpi_b_defconfig diff --git a/common/lcd.c b/common/lcd.c index 37147af805ce..df4f482d23d1 100644 --- a/common/lcd.c +++ b/common/lcd.c @@ -529,7 +529,7 @@ static int lcd_init(void *lcdbase) lcd_ctrl_init(lcdbase);
/* - * lcd_ctrl_init() of some drivers (i.e. bcm2835 on rpi_b) ignores + * lcd_ctrl_init() of some drivers (i.e. bcm2835 on rpi) ignores * the 'lcdbase' argument and uses custom lcd base address * by setting up gd->fb_base. Check for this condition and fixup * 'lcd_base' address. diff --git a/configs/rpi_b_defconfig b/configs/rpi_b_defconfig deleted file mode 100644 index 9a4705ed149c..000000000000 --- a/configs/rpi_b_defconfig +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_RPI_B=y diff --git a/configs/rpi_defconfig b/configs/rpi_defconfig new file mode 100644 index 000000000000..9379cf00d444 --- /dev/null +++ b/configs/rpi_defconfig @@ -0,0 +1,2 @@ +CONFIG_ARM=y +CONFIG_TARGET_RPI=y diff --git a/doc/README.clang b/doc/README.clang index 52495d311677..fe36909449cb 100644 --- a/doc/README.clang +++ b/doc/README.clang @@ -28,7 +28,7 @@ sudo apt-get install clang
To compile U-Boot with clang on linux without IAS use e.g.: export TRIPLET=arm-linux-gnueabi && export CROSS_COMPILE="$TRIPLET-" -make HOSTCC=clang CC="clang -target $TRIPLET -mllvm -arm-use-movt=0 -no-integrated-as" rpi_b_defconfig +make HOSTCC=clang CC="clang -target $TRIPLET -mllvm -arm-use-movt=0 -no-integrated-as" rpi_defconfig make HOSTCC=clang CC="clang -target $TRIPLET -mllvm -arm-use-movt=0 -no-integrated-as" all V=1 -j8
FreeBSD 11 (Current): @@ -42,7 +42,7 @@ ln -s /usr/local/bin/arm-gnueabi-freebsd-as /usr/bin/arm-freebsd-eabi-as # The following commands compile U-Boot using the clang xdev toolchain. # NOTE: CROSS_COMPILE and target differ on purpose! export CROSS_COMPILE=arm-gnueabi-freebsd- -gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" rpi_b_defconfig +gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" rpi_defconfig gmake CC="clang -target arm-freebsd-eabi --sysroot /usr/arm-freebsd -no-integrated-as -mllvm -arm-use-movt=0" -j8
Given that u-boot will default to gcc, above commands can be diff --git a/include/configs/rpi_b.h b/include/configs/rpi.h similarity index 100% rename from include/configs/rpi_b.h rename to include/configs/rpi.h
Enable ENV_IS_IN_FAT so that the environment can be stored persistently. It's stored in the FAT partition that the RPi firmware requires. On most RPis, this is on the SD card (which must be present in order for the system to boot). On the CM this is on the built-in eMMC device.
Since we now have a persistent environment, there's no need to load uEnv.txt at boot; we only did that to work around the lack of persistent environment.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org --- include/configs/rpi.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/include/configs/rpi.h b/include/configs/rpi.h index bd3dec6d489c..71d605c964f0 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -106,15 +106,15 @@
/* Environment */ #define CONFIG_ENV_SIZE SZ_16K -#define CONFIG_ENV_IS_NOWHERE +#define CONFIG_ENV_IS_IN_FAT +#define FAT_ENV_INTERFACE "mmc" +#define FAT_ENV_DEVICE_AND_PART "0:1" +#define FAT_ENV_FILE "uboot.env" +#define CONFIG_FAT_WRITE #define CONFIG_ENV_VARS_UBOOT_CONFIG #define CONFIG_SYS_LOAD_ADDR 0x1000000 #define CONFIG_CONSOLE_MUX #define CONFIG_SYS_CONSOLE_IS_IN_ENV -#define CONFIG_PREBOOT \ - "if load mmc 0:1 ${loadaddr} /uEnv.txt; then " \ - "env import -t -r ${loadaddr} ${filesize}; " \ - "fi"
/* Shell */ #define CONFIG_SYS_MAXARGS 8 @@ -139,7 +139,6 @@
/* Some things don't make sense on this HW or yet */ #undef CONFIG_CMD_FPGA -#undef CONFIG_CMD_SAVEENV
/* Environment */ #define ENV_DEVICE_SETTINGS \
On 19 November 2014 at 20:41, Stephen Warren swarren@wwwdotorg.org wrote:
Enable ENV_IS_IN_FAT so that the environment can be stored persistently. It's stored in the FAT partition that the RPi firmware requires. On most RPis, this is on the SD card (which must be present in order for the system to boot). On the CM this is on the built-in eMMC device.
Since we now have a persistent environment, there's no need to load uEnv.txt at boot; we only did that to work around the lack of persistent environment.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
On Wed, Nov 19, 2014 at 08:41:04PM -0700, Stephen Warren wrote:
Enable ENV_IS_IN_FAT so that the environment can be stored persistently. It's stored in the FAT partition that the RPi firmware requires. On most RPis, this is on the SD card (which must be present in order for the system to boot). On the CM this is on the built-in eMMC device.
Since we now have a persistent environment, there's no need to load uEnv.txt at boot; we only did that to work around the lack of persistent environment.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
On 19 November 2014 at 20:41, Stephen Warren swarren@wwwdotorg.org wrote:
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org
These two patches are based on "ARM: rpi_b: detect board revision" which I sent recently.
arch/arm/Kconfig | 6 +++--- board/raspberrypi/{rpi_b => rpi}/Kconfig | 6 +++--- board/raspberrypi/rpi/MAINTAINERS | 6 ++++++ board/raspberrypi/{rpi_b => rpi}/Makefile | 2 +- board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} | 0 board/raspberrypi/rpi_b/MAINTAINERS | 6 ------ common/lcd.c | 2 +- configs/rpi_b_defconfig | 2 -- configs/rpi_defconfig | 2 ++ doc/README.clang | 4 ++-- include/configs/{rpi_b.h => rpi.h} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename board/raspberrypi/{rpi_b => rpi}/Kconfig (71%) create mode 100644 board/raspberrypi/rpi/MAINTAINERS rename board/raspberrypi/{rpi_b => rpi}/Makefile (96%) rename board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} (100%) delete mode 100644 board/raspberrypi/rpi_b/MAINTAINERS delete mode 100644 configs/rpi_b_defconfig create mode 100644 configs/rpi_defconfig rename include/configs/{rpi_b.h => rpi.h} (100%)
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Hi,
On 24 November 2014 at 08:52, Simon Glass sjg@chromium.org wrote:
On 19 November 2014 at 20:41, Stephen Warren swarren@wwwdotorg.org wrote:
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org
These two patches are based on "ARM: rpi_b: detect board revision" which I sent recently.
arch/arm/Kconfig | 6 +++--- board/raspberrypi/{rpi_b => rpi}/Kconfig | 6 +++--- board/raspberrypi/rpi/MAINTAINERS | 6 ++++++ board/raspberrypi/{rpi_b => rpi}/Makefile | 2 +- board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} | 0 board/raspberrypi/rpi_b/MAINTAINERS | 6 ------ common/lcd.c | 2 +- configs/rpi_b_defconfig | 2 -- configs/rpi_defconfig | 2 ++ doc/README.clang | 4 ++-- include/configs/{rpi_b.h => rpi.h} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename board/raspberrypi/{rpi_b => rpi}/Kconfig (71%) create mode 100644 board/raspberrypi/rpi/MAINTAINERS rename board/raspberrypi/{rpi_b => rpi}/Makefile (96%) rename board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} (100%) delete mode 100644 board/raspberrypi/rpi_b/MAINTAINERS delete mode 100644 configs/rpi_b_defconfig create mode 100644 configs/rpi_defconfig rename include/configs/{rpi_b.h => rpi.h} (100%)
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
I have a dependent driver model patch. Is this patch intended to go through the ARM tree?
Regards, Simon
On 11/29/2014 08:56 PM, Simon Glass wrote:
Hi,
On 24 November 2014 at 08:52, Simon Glass sjg@chromium.org wrote:
On 19 November 2014 at 20:41, Stephen Warren swarren@wwwdotorg.org wrote:
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org
These two patches are based on "ARM: rpi_b: detect board revision" which I sent recently.
arch/arm/Kconfig | 6 +++--- board/raspberrypi/{rpi_b => rpi}/Kconfig | 6 +++--- board/raspberrypi/rpi/MAINTAINERS | 6 ++++++ board/raspberrypi/{rpi_b => rpi}/Makefile | 2 +- board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} | 0 board/raspberrypi/rpi_b/MAINTAINERS | 6 ------ common/lcd.c | 2 +- configs/rpi_b_defconfig | 2 -- configs/rpi_defconfig | 2 ++ doc/README.clang | 4 ++-- include/configs/{rpi_b.h => rpi.h} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename board/raspberrypi/{rpi_b => rpi}/Kconfig (71%) create mode 100644 board/raspberrypi/rpi/MAINTAINERS rename board/raspberrypi/{rpi_b => rpi}/Makefile (96%) rename board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} (100%) delete mode 100644 board/raspberrypi/rpi_b/MAINTAINERS delete mode 100644 configs/rpi_b_defconfig create mode 100644 configs/rpi_defconfig rename include/configs/{rpi_b.h => rpi.h} (100%)
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
I have a dependent driver model patch. Is this patch intended to go through the ARM tree?
I would assume so, yes.
Hi Albert,
On 1 December 2014 at 11:01, Stephen Warren swarren@wwwdotorg.org wrote:
On 11/29/2014 08:56 PM, Simon Glass wrote:
Hi,
On 24 November 2014 at 08:52, Simon Glass sjg@chromium.org wrote:
On 19 November 2014 at 20:41, Stephen Warren swarren@wwwdotorg.org wrote:
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org
These two patches are based on "ARM: rpi_b: detect board revision" which I sent recently.
arch/arm/Kconfig | 6 +++--- board/raspberrypi/{rpi_b => rpi}/Kconfig | 6 +++--- board/raspberrypi/rpi/MAINTAINERS | 6 ++++++ board/raspberrypi/{rpi_b => rpi}/Makefile | 2 +- board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} | 0 board/raspberrypi/rpi_b/MAINTAINERS | 6 ------ common/lcd.c | 2 +- configs/rpi_b_defconfig | 2 -- configs/rpi_defconfig | 2 ++ doc/README.clang | 4 ++-- include/configs/{rpi_b.h => rpi.h} | 0 11 files changed, 18 insertions(+), 18 deletions(-) rename board/raspberrypi/{rpi_b => rpi}/Kconfig (71%) create mode 100644 board/raspberrypi/rpi/MAINTAINERS rename board/raspberrypi/{rpi_b => rpi}/Makefile (96%) rename board/raspberrypi/{rpi_b/rpi_b.c => rpi/rpi.c} (100%) delete mode 100644 board/raspberrypi/rpi_b/MAINTAINERS delete mode 100644 configs/rpi_b_defconfig create mode 100644 configs/rpi_defconfig rename include/configs/{rpi_b.h => rpi.h} (100%)
Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
I have a dependent driver model patch. Is this patch intended to go through the ARM tree?
I would assume so, yes.
Do you have any objection to me pulling Stephen's patch through the DM tree so that I can get Raspberry Pi running on driver rmodel?
Regards, Simon
On Wed, Nov 19, 2014 at 08:41:03PM -0700, Stephen Warren wrote:
The U-Boot port runs on a variety of RPi models, not just the B. So, rename the port to something slightly more generic.
Signed-off-by: Stephen Warren swarren@wwwdotorg.org Reviewed-by: Simon Glass sjg@chromium.org Tested-by: Simon Glass sjg@chromium.org
Applied to u-boot/master, thanks!
participants (3)
-
Simon Glass -
Stephen Warren -
Tom Rini