| Message ID | 1454037892-25625-5-git-send-email-sjg@chromium.org |
|---|---|
| State | Superseded |
| Headers | show |
2016-01-29 12:24 GMT+09:00 Simon Glass <sjg@chromium.org>: > Adjust the Makefile to build u-boot-tegra.bin which contains a device tree > if OF_CONTROL is enabled, and does not if not. This mirrors U-Boot's new > approach of using u-boot.bin to handle both cases. CONFIG_TEGRA_COMMON selects OF_CONTROL, so the condition "if OF_CONTROL is enabled" is always true. I assume "if OF_CONTROL_SEPARATE is enabled" > Signed-off-by: Simon Glass <sjg@chromium.org> > --- > > Changes in v2: > - Update based on previous changes > > Makefile | 11 ++++++----- > 1 file changed, 6 insertions(+), 5 deletions(-) > > diff --git a/Makefile b/Makefile > index aebc43b..f9096c5 100644 > --- a/Makefile > +++ b/Makefile > @@ -765,7 +765,7 @@ endif > > # enable combined SPL/u-boot/dtb rules for tegra > ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) > -ALL-y += u-boot-nodtb-tegra.bin u-boot-dtb-tegra.bin > +ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin u-boot-dtb-tegra.bin > endif > > # Add optional build target if defined in board/cpu/soc headers > @@ -1079,11 +1079,12 @@ 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) > > -ifeq ($(CONFIG_OF_SEPARATE),y) > -OBJCOPYFLAGS_u-boot-dtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > -u-boot-dtb-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE > +OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) > +u-boot-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE > $(call if_changed,pad_cat) > -endif > + > +u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE > + $(call if_changed,cat) > endif I do not understand this logic. From your description, I guess u-boot-spl + u-boot-nodtb.bin -> u-boot-nodtb-tegra.bin u-boot-spl + u-boot-dtb.bin -> u-boot-dtb-tegra.bin u-boot-spl + u-boot.bin -> u-boot-tegra.bin
diff --git a/Makefile b/Makefile index aebc43b..f9096c5 100644 --- a/Makefile +++ b/Makefile @@ -765,7 +765,7 @@ endif # enable combined SPL/u-boot/dtb rules for tegra ifeq ($(CONFIG_TEGRA)$(CONFIG_SPL),yy) -ALL-y += u-boot-nodtb-tegra.bin u-boot-dtb-tegra.bin +ALL-y += u-boot-tegra.bin u-boot-nodtb-tegra.bin u-boot-dtb-tegra.bin endif # Add optional build target if defined in board/cpu/soc headers @@ -1079,11 +1079,12 @@ 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) -ifeq ($(CONFIG_OF_SEPARATE),y) -OBJCOPYFLAGS_u-boot-dtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) -u-boot-dtb-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE +OBJCOPYFLAGS_u-boot-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) +u-boot-tegra.bin: spl/u-boot-spl u-boot-dtb.bin FORCE $(call if_changed,pad_cat) -endif + +u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE + $(call if_changed,cat) endif OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI)
Adjust the Makefile to build u-boot-tegra.bin which contains a device tree if OF_CONTROL is enabled, and does not if not. This mirrors U-Boot's new approach of using u-boot.bin to handle both cases. Signed-off-by: Simon Glass <sjg@chromium.org> --- Changes in v2: - Update based on previous changes Makefile | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-)