[v2,44/49] rockchip: Convert evb-rk3229 over to use binman

Message ID 20200613205717.v2.44.I73e4d54cd52e389620fca72c71e5a47358127dd7@changeid
State New
Headers show
Series
  • rockchip: x86: Support building ROM files automatically with binman
Related show

Commit Message

Simon Glass June 14, 2020, 2:57 a.m.
At present this board uses a custom script to produce the .its file.
Update it to use binman instead. Binman can create all the images that
are needed.

Signed-off-by: Simon Glass <sjg at chromium.org>
---

(no changes since v1)

 Makefile                     | 1 +
 configs/evb-rk3229_defconfig | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

Comments

Bin Meng June 29, 2020, 8:01 a.m. | #1
Hi Simon,

On Sun, Jun 14, 2020 at 10:58 AM Simon Glass <sjg at chromium.org> wrote:
>
> At present this board uses a custom script to produce the .its file.
> Update it to use binman instead. Binman can create all the images that
> are needed.
>
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
>
> (no changes since v1)
>
>  Makefile                     | 1 +
>  configs/evb-rk3229_defconfig | 2 +-
>  2 files changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Makefile b/Makefile
> index 98172a40d8..50f48f786a 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -1484,6 +1484,7 @@ 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
> +       echo rockchip

debug leftover?

>         $(call if_changed,pad_cat)
>  endif # CONFIG_ARM64
>
> diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
> index 4d7beca0b7..9c428fed2a 100644
> --- a/configs/evb-rk3229_defconfig
> +++ b/configs/evb-rk3229_defconfig
> @@ -15,7 +15,7 @@ CONFIG_DEBUG_UART=y
>  CONFIG_FIT=y
>  CONFIG_FIT_VERBOSE=y
>  CONFIG_SPL_LOAD_FIT=y
> -CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh"
> +# CONFIG_USE_SPL_FIT_GENERATOR is not set
>  CONFIG_USE_PREBOOT=y
>  CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb"
>  # CONFIG_DISPLAY_CPUINFO is not set
> --

Regards,
Bin

Patch

diff --git a/Makefile b/Makefile
index 98172a40d8..50f48f786a 100644
--- a/Makefile
+++ b/Makefile
@@ -1484,6 +1484,7 @@  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
+	echo rockchip
 	$(call if_changed,pad_cat)
 endif # CONFIG_ARM64
 
diff --git a/configs/evb-rk3229_defconfig b/configs/evb-rk3229_defconfig
index 4d7beca0b7..9c428fed2a 100644
--- a/configs/evb-rk3229_defconfig
+++ b/configs/evb-rk3229_defconfig
@@ -15,7 +15,7 @@  CONFIG_DEBUG_UART=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_FIT_GENERATOR="arch/arm/mach-rockchip/fit_spl_optee.sh"
+# CONFIG_USE_SPL_FIT_GENERATOR is not set
 CONFIG_USE_PREBOOT=y
 CONFIG_DEFAULT_FDT_FILE="rk3229-evb.dtb"
 # CONFIG_DISPLAY_CPUINFO is not set