| Message ID | 20200613205717.v2.35.I12efffc6350f3f7f6cf22950e4a006d393855b78@changeid |
|---|---|
| State | Accepted |
| Commit | e6eca3a916bacd885d977771c55d054a3ec8a1fd |
| Headers | show |
| Series | rockchip: x86: Support building ROM files automatically with binman | expand |
On Sun, Jun 14, 2020 at 10:58 AM Simon Glass <sjg at chromium.org> wrote: > > On sunxi various files that need to be created by binman. It does not make > sense to enumerate these in the Makefile. They are described in the > configuration (devicetree) for each board and we can simply run binman > (always) to generate them. > > This avoid sprinkling the Makefile with arch-specific code. > > Signed-off-by: Simon Glass <sjg at chromium.org> > --- > > (no changes since v1) > > Makefile | 7 ++----- > 1 file changed, 2 insertions(+), 5 deletions(-) > Reviewed-by: Bin Meng <bmeng.cn at gmail.com>
diff --git a/Makefile b/Makefile index e4fed83cb2..ac628cc772 100644 --- a/Makefile +++ b/Makefile @@ -917,7 +917,7 @@ INPUTS-$(CONFIG_EFI_APP) += u-boot-app.efi INPUTS-$(CONFIG_EFI_STUB) += u-boot-payload.efi # Build a combined spl + u-boot image for sunxi -ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_SPL),yy) +ifeq ($(CONFIG_ARCH_SUNXI)$(CONFIG_ARM64)$(CONFIG_SPL),yyy) INPUTS-y += u-boot-sunxi-with-spl.bin endif @@ -1601,10 +1601,7 @@ u-boot-x86-reset16.bin: u-boot FORCE endif # CONFIG_X86 ifneq ($(CONFIG_ARCH_SUNXI),) -ifeq ($(CONFIG_ARM64),) -u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE - $(call if_changed,binman) -else +ifeq ($(CONFIG_ARM64),y) u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.itb FORCE $(call if_changed,cat) endif
On sunxi various files that need to be created by binman. It does not make sense to enumerate these in the Makefile. They are described in the configuration (devicetree) for each board and we can simply run binman (always) to generate them. This avoid sprinkling the Makefile with arch-specific code. Signed-off-by: Simon Glass <sjg at chromium.org> --- (no changes since v1) Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)