Message ID | 20200613205717.v2.29.I82a1dd089f1d29bf69ba8b655f0ef2750690ccd6@changeid |
---|---|
State | Accepted |
Commit | 1d62704d775a8cf74ed5e4bc819c85936cecae41 |
Headers | show |
Series | rockchip: x86: Support building ROM files automatically with binman | expand |
On 6/13/20 8:57 PM, Simon Glass wrote: > This has been in the Makefile long enough to ensure migration is complete. > Drop it. > diff --git a/Makefile b/Makefile > -OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > -u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE > - $(call if_changed,pad_cat) > - > -OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > -u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE > - $(call if_changed,pad_cat) I don't see any replacement rules for those two binaries. Is the intent to force all users not to use them any more; is that what "migration is complete" means? Note that there are users of these files, so if this change/series truly is removing them it will break those users; see: > https://github.com/NVIDIA/tegra-uboot-flasher-scripts/blob/master/build#L166
Hi Stephen, On Mon, 15 Jun 2020 at 16:03, Stephen Warren <swarren at wwwdotorg.org> wrote: > > On 6/13/20 8:57 PM, Simon Glass wrote: > > This has been in the Makefile long enough to ensure migration is complete. > > Drop it. > > > diff --git a/Makefile b/Makefile > > > -OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > > -u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE > > - $(call if_changed,pad_cat) > > - > > -OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > > -u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE > > - $(call if_changed,pad_cat) > > I don't see any replacement rules for those two binaries. Is the intent > to force all users not to use them any more; is that what "migration is > complete" means? Note that there are users of these files, so if this > change/series truly is removing them it will break those users; see: > > > https://github.com/NVIDIA/tegra-uboot-flasher-scripts/blob/master/build#L166 Binman produces all three images when run, so we don't need makefile rules for them anymore. It still produces the files. But let me know if there are any problems. Migration complete just means that there was a reason we had to keep these rules before, and I hope it has gone away. Regards, Simon
On 6/16/20 7:44 AM, Simon Glass wrote: > Hi Stephen, > > On Mon, 15 Jun 2020 at 16:03, Stephen Warren <swarren at wwwdotorg.org> wrote: >> >> On 6/13/20 8:57 PM, Simon Glass wrote: >>> This has been in the Makefile long enough to ensure migration is complete. >>> Drop it. >> >>> diff --git a/Makefile b/Makefile >> >>> -OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) >>> -u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE >>> - $(call if_changed,pad_cat) >>> - >>> -OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) >>> -u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE >>> - $(call if_changed,pad_cat) >> >> I don't see any replacement rules for those two binaries. Is the intent >> to force all users not to use them any more; is that what "migration is >> complete" means? Note that there are users of these files, so if this >> change/series truly is removing them it will break those users; see: >> >>> https://github.com/NVIDIA/tegra-uboot-flasher-scripts/blob/master/build#L166 > > Binman produces all three images when run, so we don't need makefile > rules for them anymore. It still produces the files. But let me know > if there are any problems. OK, if the files are generated by binman anyway, this sounds fine.
diff --git a/Makefile b/Makefile index 07c237120d..fa5f556fb9 100644 --- a/Makefile +++ b/Makefile @@ -1639,23 +1639,9 @@ u-boot-x86-with-spl.bin: spl/u-boot-spl.bin u-boot.bin FORCE $(call if_changed,binman) ifneq ($(CONFIG_ARCH_TEGRA),) -ifneq ($(CONFIG_BINMAN),) # Makes u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin -%-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: \ - spl/%-spl %.bin FORCE +%-dtb-tegra.bin %-tegra.bin %-nodtb-tegra.bin: spl/%-spl %.bin FORCE $(call if_changed,binman) -else -OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) -u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE - $(call if_changed,pad_cat) - -OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) -u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE - $(call if_changed,pad_cat) - -u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE - $(call if_changed,copy) -endif # binman endif OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI)
This has been in the Makefile long enough to ensure migration is complete. Drop it. Signed-off-by: Simon Glass <sjg at chromium.org> --- (no changes since v1) Makefile | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-)