ARM: rpi: rename rpi_b to rpi
Subsystems (2)
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.
---
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%)arch/arm/Kconfig +3 -3
@@ -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"
board/raspberrypi/rpi/Kconfig renamed from board/raspberrypi/rpi_b/Kconfig +3 -3
@@ -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
board/raspberrypi/rpi/MAINTAINERS new file +6 -0
@@ -0,0 +1,6 @@ +RPI BOARD +M: Stephen Warren <[email protected]> +S: Maintained +F: board/raspberrypi/rpi/ +F: include/configs/rpi.h +F: configs/rpi_defconfig
board/raspberrypi/rpi/Makefile renamed from board/raspberrypi/rpi_b/Makefile +1 -1
@@ -12,4 +12,4 @@ # GNU General Public License for more details. # -obj-y := rpi_b.o +obj-y := rpi.o
board/raspberrypi/rpi/rpi.c renamed from board/raspberrypi/rpi_b/rpi_b.c +0 -0
board/raspberrypi/rpi_b/MAINTAINERS deleted +0 -6
@@ -1,6 +0,0 @@ -RPI_B BOARD -M: Stephen Warren <[email protected]> -S: Maintained -F: board/raspberrypi/rpi_b/ -F: include/configs/rpi_b.h -F: configs/rpi_b_defconfig
common/lcd.c +1 -1
@@ -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.
configs/rpi_b_defconfig deleted +0 -2
@@ -1,2 +0,0 @@ -CONFIG_ARM=y -CONFIG_TARGET_RPI_B=y
configs/rpi_defconfig new file +2 -0
@@ -0,0 +1,2 @@ +CONFIG_ARM=y +CONFIG_TARGET_RPI=y
doc/README.clang +2 -2
@@ -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
include/configs/rpi.h renamed from include/configs/rpi_b.h +0 -0
Signature · 1 line
1.9.1
PATCH 2/2 ARM: rpi: support an environment
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.
--- include/configs/rpi.h | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-)
include/configs/rpi.h +5 -6
@@ -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 \
Signature · 1 line
1.9.1
PATCH 2/2 ARM: rpi: support an environment
Quoted 10 lines · Stephen Warren
Enable
ENV_IS_IN_FATso 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 <[email protected]>
PATCH 2/2 ARM: rpi: support an environment
In reply to Stephen WarrenQuoted 5 lines · Stephen Warren
Enable
ENV_IS_IN_FATso 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.
Quoted 7 lines
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 <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/e328c5d0/attachment.pgp>
PATCH 1/2 ARM: rpi: rename rpi_b to rpi
In reply to Stephen WarrenQuoted 20 lines · Stephen Warren
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 <[email protected]>---
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(-)
Quoted 8 lines
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%)PATCH 1/2 ARM: rpi: rename rpi_b to rpi
Hi,
Quoted 30 lines · Simon Glass
Quoted 20 lines · Stephen Warren
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 <[email protected]>---
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(-)Quoted 8 lines
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%)
Quoted 2 lines
Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
I have a dependent driver model patch. Is this patch intended to go through the ARM tree?
Regards,
Simon
PATCH 1/2 ARM: rpi: rename rpi_b to rpi
Quoted 33 lines · Simon Glass
Hi,
Quoted 30 lines · Simon Glass
Quoted 28 lines · Stephen Warren
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 <[email protected]>---
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
renameinclude/configs/{rpi_b.h=>rpi.h} (100%)
Quoted 5 lines
Quoted 2 lines
Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>I have a dependent driver model patch. Is this patch intended to go through the ARM tree?
I would assume so, yes.
PATCH 1/2 ARM: rpi: rename rpi_b to rpi
Hi Albert,
Quoted 43 lines · Stephen Warren
Quoted 42 lines · Simon Glass
Hi,
Quoted 36 lines · Simon Glass
Quoted 21 lines · Stephen Warren
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 <[email protected]>---
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(-)Quoted 8 lines
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
renameinclude/configs/{rpi_b.h=>rpi.h} (100%)Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Quoted 6 lines
Quoted 2 lines
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
PATCH 1/2 ARM: rpi: rename rpi_b to rpi
In reply to Stephen WarrenQuoted 6 lines · Stephen Warren
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 <[email protected]>Reviewed-by Simon Glass <[email protected]>Tested-by Simon Glass <[email protected]>
Applied to u-boot/master, thanks!
Signature · 8 lines
Tom -------------- next part -------------- A non-text attachment was scrubbed... Name: signature.asc Type: application/pgp-signature Size: 836 bytes Desc: Digital signature URL: <http://lists.denx.de/pipermail/u-boot/attachments/20141208/068dd6c6/attachment.pgp>