leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ARM: rpi: rename rpi_b to rpi

Browse Source 
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>
This commit is contained in:
Stephen Warren 2014-11-19 20:41:03 -07:00 committed by Tom Rini
parent 6fe7845a98
commit 9316e14400
11 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
arch/arm/Kconfig
View File

@ -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
@ -931,7 +931,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"

6
board/raspberrypi/rpi_b/Kconfig → board/raspberrypi/rpi/Kconfig
View File

@ -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

6
board/raspberrypi/rpi/MAINTAINERS Normal file
View File

@ -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

2
board/raspberrypi/rpi_b/Makefile → board/raspberrypi/rpi/Makefile
View File

@ -12,4 +12,4 @@
# GNU General Public License for more details.
#
obj-y := rpi_b.o
obj-y := rpi.o

0
board/raspberrypi/rpi_b/rpi_b.c → board/raspberrypi/rpi/rpi.c
View File

6
board/raspberrypi/rpi_b/MAINTAINERS
View File

@ -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

2
common/lcd.c
View File

@ -530,7 +530,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.

2
configs/rpi_b_defconfig
View File

@ -1,2 +0,0 @@
CONFIG_ARM=y
CONFIG_TARGET_RPI_B=y

2
configs/rpi_defconfig Normal file
View File

@ -0,0 +1,2 @@
CONFIG_ARM=y
CONFIG_TARGET_RPI=y

4
doc/README.clang
View File

@ -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

0
include/configs/rpi_b.h → include/configs/rpi.h
View File