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

rockchip: generate u-boot-rockchip.bin with binman for ARM64 boards

Browse Source 
This allows to build u-boot-rockchip.bin binary with binman for Rockchip
ARM64 boards instead of the legacy Makefile way.

Cc: Quentin Schulz <foss+uboot@0leil.net>
Signed-off-by: Quentin Schulz <quentin.schulz@theobroma-systems.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Quentin Schulz 2022-09-02 15:10:52 +02:00 committed by Kever Yang
parent 001f788cdb
commit 05713d5707
9 changed files with 18 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Makefile
View File

@ -1005,8 +1005,7 @@ ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
# On ARM64 this target is produced by binman so we don't need this dep # On ARM64 this target is produced by binman so we don't need this dep
ifeq ($(CONFIG_ARM64),y) ifeq ($(CONFIG_ARM64),y)
ifeq ($(CONFIG_SPL),y) ifeq ($(CONFIG_SPL),y)
# TODO: Get binman to generate this too INPUTS-y += u-boot.itb
INPUTS-y += u-boot-rockchip.bin
endif endif
else else
ifeq ($(CONFIG_SPL),y) ifeq ($(CONFIG_SPL),y)
@ -1498,29 +1497,6 @@ OBJCOPYFLAGS_u-boot-with-spl.bin = -I binary -O binary \
u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE u-boot-with-spl.bin: $(SPL_IMAGE) $(SPL_PAYLOAD) FORCE
$(call if_changed,pad_cat) $(call if_changed,pad_cat)
ifeq ($(CONFIG_ARCH_ROCKCHIP),y)
# TPL + SPL
ifeq ($(CONFIG_SPL)$(CONFIG_TPL),yy)
MKIMAGEFLAGS_u-boot-tpl-rockchip.bin = -n $(CONFIG_SYS_SOC) -T rksd
tpl/u-boot-tpl-rockchip.bin: tpl/u-boot-tpl.bin FORCE
$(call if_changed,mkimage)
idbloader.img: tpl/u-boot-tpl-rockchip.bin spl/u-boot-spl.bin FORCE
$(call if_changed,cat)
else
MKIMAGEFLAGS_idbloader.img = -n $(CONFIG_SYS_SOC) -T rksd
idbloader.img: spl/u-boot-spl.bin FORCE
$(call if_changed,mkimage)
endif
ifeq ($(CONFIG_ARM64),y)
OBJCOPYFLAGS_u-boot-rockchip.bin = -I binary -O binary \
--pad-to=$(CONFIG_SPL_PAD_TO) --gap-fill=0xff
u-boot-rockchip.bin: idbloader.img u-boot.itb FORCE
$(call if_changed,pad_cat)
endif # CONFIG_ARM64
endif # CONFIG_ARCH_ROCKCHIP
ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy) ifeq ($(CONFIG_ARCH_LPC32XX)$(CONFIG_SPL),yy)
MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE) MKIMAGEFLAGS_lpc32xx-spl.img = -T lpc32xximage -a $(CONFIG_SPL_TEXT_BASE)

2
arch/arm/Kconfig
View File

@ -1974,7 +1974,7 @@ config ARCH_STM32MP
config ARCH_ROCKCHIP config ARCH_ROCKCHIP
bool "Support Rockchip SoCs" bool "Support Rockchip SoCs"
select BLK select BLK
select BINMAN if SPL_OPTEE || (SPL && !ARM64) select BINMAN if SPL_OPTEE || SPL
select DM select DM
select DM_GPIO select DM_GPIO
select DM_I2C select DM_I2C

2
arch/arm/dts/px30-u-boot.dtsi
View File

@ -3,6 +3,8 @@
* (C) Copyright 2019 Rockchip Electronics Co., Ltd * (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/ */
#include "rockchip-u-boot.dtsi"
/ { / {
aliases { aliases {
mmc0 = &emmc; mmc0 = &emmc;

2
arch/arm/dts/rk3308-u-boot.dtsi
View File

@ -3,6 +3,8 @@
*(C) Copyright 2019 Rockchip Electronics Co., Ltd *(C) Copyright 2019 Rockchip Electronics Co., Ltd
*/ */
#include "rockchip-u-boot.dtsi"
/ { / {
aliases { aliases {
mmc0 = &emmc; mmc0 = &emmc;

2
arch/arm/dts/rk3326-odroid-go2-u-boot.dtsi
View File

@ -3,6 +3,8 @@
* Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH * Copyright (c) 2020 Theobroma Systems Design und Consulting GmbH
*/ */
#include "rockchip-u-boot.dtsi"
/ { / {
chosen { chosen {
u-boot,spl-boot-order = &sdmmc; u-boot,spl-boot-order = &sdmmc;

2
arch/arm/dts/rk3328-u-boot.dtsi
View File

@ -3,6 +3,8 @@
* (C) Copyright 2019 Rockchip Electronics Co., Ltd * (C) Copyright 2019 Rockchip Electronics Co., Ltd
*/ */
#include "rockchip-u-boot.dtsi"
/ { / {
aliases { aliases {
mmc0 = &emmc; mmc0 = &emmc;

1
arch/arm/dts/rk3368-u-boot.dtsi
View File

@ -4,6 +4,7 @@
*/ */
#include <dt-bindings/memory/rk3368-dmc.h> #include <dt-bindings/memory/rk3368-dmc.h>
#include "rockchip-u-boot.dtsi"
/ { / {
dmc: dmc@ff610000 { dmc: dmc@ff610000 {

2
arch/arm/dts/rk3568-u-boot.dtsi
View File

@ -3,6 +3,8 @@
* (C) Copyright 2021 Rockchip Electronics Co., Ltd * (C) Copyright 2021 Rockchip Electronics Co., Ltd
*/ */
#include "rockchip-u-boot.dtsi"
/ { / {
aliases { aliases {
mmc0 = &sdhci; mmc0 = &sdhci;

5
arch/arm/dts/rockchip-u-boot.dtsi
View File

@ -30,7 +30,12 @@
}; };
}; };
#ifdef CONFIG_ARM64
blob {
filename = "u-boot.itb";
#else
u-boot-img { u-boot-img {
#endif
offset = <CONFIG_SPL_PAD_TO>; offset = <CONFIG_SPL_PAD_TO>;
}; };
}; };