ARM: Rockchip: switch to multiimage support
- Add images/Makefile.rockchip - Allow multiple boards to be selected - protect initcalls with appropriate of_machine_is_compatible - rename board specific config to SoC config - Add dtb file to compilation - turn barebox_arm_reset_vectorto ENTRY_FUNCTION - pass dtb to barebox_arm_entry Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
parent
3bef9916a3
commit
903b1d4309
|
@ -134,6 +134,7 @@ config ARCH_ROCKCHIP
|
|||
select COMMON_CLK_OF_PROVIDER
|
||||
select GPIOLIB
|
||||
select PINCTRL_ROCKCHIP
|
||||
select HAVE_PBL_MULTI_IMAGES
|
||||
|
||||
config ARCH_SOCFPGA
|
||||
bool "Altera SOCFPGA cyclone5"
|
||||
|
|
|
@ -45,6 +45,9 @@ static void radxa_rock_pmic_init(void)
|
|||
|
||||
static int setup_plls(void)
|
||||
{
|
||||
if (!of_machine_is_compatible("radxa,rock"))
|
||||
return 0;
|
||||
|
||||
/* Codec PLL frequency: 594 MHz */
|
||||
rk3188_pll_set_parameters(RK3188_CPLL, 2, 198, 4);
|
||||
/* General PLL frequency: 300 MHz */
|
||||
|
@ -56,6 +59,9 @@ coredevice_initcall(setup_plls);
|
|||
|
||||
static int devices_init(void)
|
||||
{
|
||||
if (!of_machine_is_compatible("radxa,rock"))
|
||||
return 0;
|
||||
|
||||
i2c_register_board_info(0, radxa_rock_i2c_devices,
|
||||
ARRAY_SIZE(radxa_rock_i2c_devices));
|
||||
add_generic_device_res("i2c-gpio", 0, NULL, 0, &i2c_gpio_pdata);
|
||||
|
@ -71,6 +77,9 @@ device_initcall(devices_init);
|
|||
|
||||
static int hostname_init(void)
|
||||
{
|
||||
if (!of_machine_is_compatible("radxa,rock"))
|
||||
return 0;
|
||||
|
||||
barebox_set_hostname("radxa-rock");
|
||||
|
||||
return 0;
|
||||
|
|
|
@ -16,8 +16,15 @@
|
|||
#include <asm/barebox-arm-head.h>
|
||||
#include <asm/barebox-arm.h>
|
||||
|
||||
void __naked barebox_arm_reset_vector(void)
|
||||
extern char __dtb_rk3188_radxarock_start[];
|
||||
|
||||
ENTRY_FUNCTION(start_radxa_rock, r0, r1, r2)
|
||||
{
|
||||
uint32_t fdt;
|
||||
|
||||
arm_cpu_lowlevel_init();
|
||||
barebox_arm_entry(0x60000000, SZ_2G, 0);
|
||||
|
||||
fdt = (uint32_t)__dtb_rk3188_radxarock_start - get_runtime_offset();
|
||||
|
||||
barebox_arm_entry(0x60000000, SZ_2G, fdt);
|
||||
}
|
||||
|
|
|
@ -1,33 +1,34 @@
|
|||
CONFIG_BUILTIN_DTB=y
|
||||
CONFIG_BUILTIN_DTB_NAME="rk3188-radxarock"
|
||||
CONFIG_ARCH_ROCKCHIP=y
|
||||
CONFIG_AEABI=y
|
||||
CONFIG_MACH_RADXA_ROCK=y
|
||||
CONFIG_THUMB2_BAREBOX=y
|
||||
CONFIG_CMD_ARM_MMUINFO=y
|
||||
CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS=y
|
||||
CONFIG_ARM_UNWIND=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_MALLOC_SIZE=0x4000000
|
||||
CONFIG_MALLOC_TLSF=y
|
||||
CONFIG_MMU=y
|
||||
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/radxa-rock/env"
|
||||
CONFIG_KALLSYMS=y
|
||||
CONFIG_RELOCATABLE=y
|
||||
CONFIG_PROMPT="radxa-rock:"
|
||||
CONFIG_LONGHELP=y
|
||||
CONFIG_GLOB=y
|
||||
CONFIG_HUSH_FANCY_PROMPT=y
|
||||
CONFIG_CMDLINE_EDITING=y
|
||||
CONFIG_AUTO_COMPLETE=y
|
||||
CONFIG_PARTITION=y
|
||||
CONFIG_DEFAULT_ENVIRONMENT_GENERIC_NEW=y
|
||||
CONFIG_DEFAULT_ENVIRONMENT_PATH="arch/arm/boards/radxa-rock/env"
|
||||
CONFIG_CMD_EDIT=y
|
||||
CONFIG_CMD_SLEEP=y
|
||||
CONFIG_CMD_EXPORT=y
|
||||
CONFIG_CMD_PRINTENV=y
|
||||
CONFIG_CMD_READLINE=y
|
||||
CONFIG_CMD_TFTP=y
|
||||
CONFIG_CMD_ECHO_E=y
|
||||
CONFIG_CMD_LOADB=y
|
||||
CONFIG_CMD_LOADY=y
|
||||
CONFIG_CMD_MEMINFO=y
|
||||
CONFIG_CMD_IOMEM=y
|
||||
CONFIG_CMD_MM=y
|
||||
CONFIG_NET_CMD_IFUP=y
|
||||
CONFIG_CMD_BOOTM=y
|
||||
CONFIG_CMD_BOOTU=y
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
CONFIG_CMD_RESET=y
|
||||
CONFIG_CMD_GO=y
|
||||
|
@ -35,28 +36,25 @@ CONFIG_CMD_OFTREE=y
|
|||
CONFIG_CMD_OF_PROPERTY=y
|
||||
CONFIG_CMD_OF_NODE=y
|
||||
CONFIG_CMD_TIMEOUT=y
|
||||
CONFIG_CMD_TFTP=y
|
||||
CONFIG_CMD_PARTITION=y
|
||||
CONFIG_CMD_GPIO=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_UNCOMPRESS=y
|
||||
CONFIG_CMD_I2C=y
|
||||
CONFIG_CMD_LED=y
|
||||
CONFIG_CMD_MIITOOL=y
|
||||
CONFIG_CMD_CLK=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_NET_DHCP=y
|
||||
CONFIG_NET_PING=y
|
||||
CONFIG_OFDEVICE=y
|
||||
CONFIG_OF_BAREBOX_DRIVERS=y
|
||||
CONFIG_DRIVER_SERIAL_NS16550=y
|
||||
CONFIG_LED=y
|
||||
CONFIG_LED_GPIO=y
|
||||
CONFIG_LED_GPIO_OF=y
|
||||
CONFIG_NET=y
|
||||
CONFIG_NET_PING=y
|
||||
CONFIG_NET_DHCP=y
|
||||
CONFIG_PINCTRL=y
|
||||
CONFIG_PINCTRL_ROCKCHIP=y
|
||||
CONFIG_DRIVER_NET_ARC_EMAC=y
|
||||
CONFIG_SMSC_PHY=y
|
||||
CONFIG_I2C=y
|
||||
CONFIG_I2C_GPIO=y
|
||||
CONFIG_MFD_ACT8846=y
|
||||
CONFIG_DRIVER_NET_ARC_EMAC=y
|
||||
CONFIG_SMSC_PHY=y
|
||||
CONFIG_LED=y
|
||||
CONFIG_LED_GPIO=y
|
||||
CONFIG_LED_GPIO_OF=y
|
||||
CONFIG_FS_TFTP=y
|
|
@ -29,6 +29,7 @@ dtb-$(CONFIG_ARCH_IMX6) += imx6q-gk802.dtb \
|
|||
imx6q-udoo.dtb \
|
||||
imx6q-var-custom.dtb
|
||||
dtb-$(CONFIG_ARCH_MVEBU) += dove-cubox-bb.dtb
|
||||
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3188-radxarock.dtb
|
||||
dtb-$(CONFIG_ARCH_SOCFPGA) += socfpga_cyclone5_sockit.dtb \
|
||||
socfpga_cyclone5_socrates.dtb
|
||||
dtb-$(CONFIG_ARCH_TEGRA) += \
|
||||
|
@ -54,6 +55,7 @@ pbl-$(CONFIG_MACH_TOSHIBA_AC100) += tegra20-paz00.dtb.o
|
|||
pbl-$(CONFIG_MACH_TQMA53) += imx53-mba53.dtb.o
|
||||
pbl-$(CONFIG_MACH_TQMA6X) += imx6dl-mba6x.dtb.o imx6q-mba6x.dtb.o
|
||||
pbl-$(CONFIG_MACH_TX25) += imx25-karo-tx25.dtb.o
|
||||
pbl-$(CONFIG_MACH_RADXA_ROCK) += rk3188-radxarock.dtb.o
|
||||
pbl-$(CONFIG_MACH_SOCFPGA_EBV_SOCRATES) += socfpga_cyclone5_socrates.dtb.o
|
||||
pbl-$(CONFIG_MACH_SOCFPGA_TERASIC_SOCKIT) += socfpga_cyclone5_sockit.dtb.o
|
||||
pbl-$(CONFIG_MACH_SOLIDRUN_HUMMINGBOARD) += imx6dl-hummingboard.dtb.o
|
||||
|
|
|
@ -17,6 +17,7 @@
|
|||
|
||||
/ {
|
||||
model = "Radxa Rock";
|
||||
compatible = "radxa,rock", "rockchip,rk3188";
|
||||
|
||||
memory {
|
||||
reg = <0x60000000 0x80000000>;
|
||||
|
|
|
@ -4,12 +4,9 @@ config ARCH_TEXT_BASE
|
|||
hex
|
||||
default 0x68000000
|
||||
|
||||
choice
|
||||
prompt "Board type"
|
||||
comment "select Rockchip boards:"
|
||||
|
||||
config MACH_RADXA_ROCK
|
||||
bool "Radxa rock board"
|
||||
|
||||
endchoice
|
||||
|
||||
endif
|
||||
|
|
|
@ -99,6 +99,7 @@ $(obj)/%.img: $(obj)/$$(FILE_$$(@F))
|
|||
include $(srctree)/images/Makefile.am33xx
|
||||
include $(srctree)/images/Makefile.imx
|
||||
include $(srctree)/images/Makefile.mvebu
|
||||
include $(srctree)/images/Makefile.rockchip
|
||||
include $(srctree)/images/Makefile.socfpga
|
||||
include $(srctree)/images/Makefile.tegra
|
||||
|
||||
|
|
|
@ -0,0 +1,9 @@
|
|||
#
|
||||
# barebox image generation Makefile for Rockchip images
|
||||
#
|
||||
|
||||
board = $(srctree)/arch/$(ARCH)/boards
|
||||
|
||||
pblx-$(CONFIG_MACH_RADXA_ROCK) += start_radxa_rock
|
||||
FILE_barebox-radxa-rock.img = start_radxa_rock.pblx
|
||||
image-$(CONFIG_MACH_RADXA_ROCK) += barebox-radxa-rock.img
|
Loading…
Reference in New Issue