Add target for tegra20 u-boot image. This is a concatenation of tegra spl and normal u-boot binaries. For non-devicetree builds this is named "u-boot-t2.bin" for devicetree builds is named "u-boot-dtb-t2.bin". This target is the default target for tegra20 and will get copied over u-boot.bin.
Signed-off-by: Allen Martin <[email protected]> --- Makefile | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Makefile b/Makefile index b2275ed..a168d20 100644 --- a/Makefile +++ b/Makefile @@ -381,6 +381,17 @@ ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin ALL-$(CONFIG_SPL) += $(obj)spl/u-boot-spl.bin ALL-$(CONFIG_OF_SEPARATE) += $(obj)u-boot.dtb $(obj)u-boot-dtb.bin +ifeq ($(SOC),tegra20) +ifeq ($(CONFIG_OF_SEPARATE),y) +T2_UBOOT_IN=$(obj)u-boot-dtb.bin +T2_UBOOT_OUT=$(obj)u-boot-dtb-t2.bin +else +T2_UBOOT_IN=$(obj)u-boot.bin +T2_UBOOT_OUT=$(obj)u-boot-t2.bin +endif +ALL-y += $(T2_UBOOT_OUT) +endif + all: $(ALL-y) $(SUBDIR_EXAMPLES) $(obj)u-boot.dtb: $(obj)u-boot @@ -456,6 +467,15 @@ $(obj)u-boot.sb: $(obj)u-boot.bin $(obj)spl/u-boot-spl.bin elftosb -zdf imx28 -c $(TOPDIR)/board/$(BOARDDIR)/u-boot.bd \ -o $(obj)u-boot.sb +ifeq ($(SOC),tegra20) +$(T2_UBOOT_OUT): $(obj)spl/u-boot-spl.bin $(T2_UBOOT_IN) + $(OBJCOPY) ${OBJCFLAGS} --pad-to=$(CONFIG_SYS_TEXT_BASE) -O binary $(obj)spl/u-boot-spl $(obj)spl/u-boot-spl-pad.bin + cat $(obj)spl/u-boot-spl-pad.bin $(T2_UBOOT_IN) > $(T2_UBOOT_OUT) + rm $(obj)spl/u-boot-spl-pad.bin + cp $(T2_UBOOT_OUT) u-boot.bin +ALL-y: $(T2_UBOOT_OUT) +endif + ifeq ($(CONFIG_SANDBOX),y) GEN_UBOOT = \ cd $(LNDIR) && $(CC) $(SYMS) -T $(obj)u-boot.lds \ @@ -775,6 +795,7 @@ clobber: tidy @rm -f $(obj)u-boot.ais @rm -f $(obj)u-boot.dtb @rm -f $(obj)u-boot.sb + @rm -f $(obj)u-boot.t2 @rm -f $(obj)tools/inca-swap-bytes @rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c @rm -f $(obj)arch/powerpc/cpu/mpc83xx/ddr-gen?.c -- 1.7.9.5 _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot

