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

ARM: bcm283x: use OF_CONTROL for bcm283x

Browse Source 
This patch removes use of U_BOOT_DEVICE in board/raspberrypi/rpi/rpi.c,
enables OF_CONTROL in the config and adjusts the rpi_*defconfig configs.

Signed-off-by: Fabian Vogt <fvogt@suse.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Fabian Vogt 2016-09-26 14:26:51 +02:00 committed by Tom Rini
parent d8396a3272
commit 7670909638
6 changed files with 9 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
arch/arm/Kconfig
View File

@ -321,6 +321,7 @@ config ARCH_BCM283X
select DM select DM
select DM_SERIAL select DM_SERIAL
select DM_GPIO select DM_GPIO
select OF_CONTROL
config TARGET_VEXPRESS_CA15_TC2 config TARGET_VEXPRESS_CA15_TC2
bool "Support vexpress_ca15_tc2" bool "Support vexpress_ca15_tc2"

37
board/raspberrypi/rpi/rpi.c
View File

@ -17,7 +17,6 @@
#include <asm/arch/mbox.h> #include <asm/arch/mbox.h>
#include <asm/arch/sdhci.h> #include <asm/arch/sdhci.h>
#include <asm/global_data.h> #include <asm/global_data.h>
#include <dm/platform_data/serial_pl01x.h>
#include <dm/platform_data/serial_bcm283x_mu.h> #include <dm/platform_data/serial_bcm283x_mu.h>
#ifdef CONFIG_ARM64 #ifdef CONFIG_ARM64
#include <asm/armv8/mmu.h> #include <asm/armv8/mmu.h>
@ -28,42 +27,6 @@ DECLARE_GLOBAL_DATA_PTR;
/* From lowlevel_init.S */ /* From lowlevel_init.S */
extern unsigned long fw_dtb_pointer; extern unsigned long fw_dtb_pointer;
static const struct bcm2835_gpio_platdata gpio_platdata = {
.base = BCM2835_GPIO_BASE,
};
U_BOOT_DEVICE(bcm2835_gpios) = {
.name = "gpio_bcm2835",
.platdata = &gpio_platdata,
};
#ifdef CONFIG_PL01X_SERIAL
static const struct pl01x_serial_platdata serial_platdata = {
#ifndef CONFIG_BCM2835
.base = 0x3f201000,
#else
.base = 0x20201000,
#endif
.type = TYPE_PL011,
.skip_init = true,
};
U_BOOT_DEVICE(bcm2835_serials) = {
.name = "serial_pl01x",
.platdata = &serial_platdata,
};
#else
static 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 msg_get_arm_mem {
struct bcm2835_mbox_hdr hdr; struct bcm2835_mbox_hdr hdr;

2
configs/rpi_2_defconfig
View File

@ -1,6 +1,8 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI_2=y CONFIG_TARGET_RPI_2=y
CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b"
CONFIG_OF_EMBED=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set

2
configs/rpi_3_32b_defconfig
View File

@ -2,6 +2,8 @@ CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI_3_32B=y CONFIG_TARGET_RPI_3_32B=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
CONFIG_OF_EMBED=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set

2
configs/rpi_3_defconfig
View File

@ -2,6 +2,8 @@ CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI_3=y CONFIG_TARGET_RPI_3=y
CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_SYS_MALLOC_F_LEN=0x2000
CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b"
CONFIG_OF_EMBED=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set

2
configs/rpi_defconfig
View File

@ -1,6 +1,8 @@
CONFIG_ARM=y CONFIG_ARM=y
CONFIG_ARCH_BCM283X=y CONFIG_ARCH_BCM283X=y
CONFIG_TARGET_RPI=y CONFIG_TARGET_RPI=y
CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b"
CONFIG_OF_EMBED=y
CONFIG_OF_BOARD_SETUP=y CONFIG_OF_BOARD_SETUP=y
# CONFIG_DISPLAY_CPUINFO is not set # CONFIG_DISPLAY_CPUINFO is not set
# CONFIG_DISPLAY_BOARDINFO is not set # CONFIG_DISPLAY_BOARDINFO is not set