GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-03-31 11:31:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

binman: tegra: Convert to use binman

Browse source 
Update tegra to use binman for image creation. This still includes the
current Makefile logic, but a later patch will remove this. Three output
files are created, all of which combine
SPL and U-Boot:

   u-boot-tegra.bin        - standard image
   u-boot-dtb-tegra.bin    - same as u-boot-tegra.bin
   u-boot-nodtb-target.bin - includes U-Boot without the appended device tree

The latter is useful for build systems where the device is appended later,
perhaps after being modified.

Signed-off-by: Simon Glass <sjg@chromium.org>
This commit is contained in:
Simon Glass 2017-11-13 18:55:06 -07:00
parent 39c1502ccc
commit f2faffecb0
9 changed files with 64 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Makefile
View file

@ -1149,6 +1149,11 @@ u-boot-sunxi-with-spl.bin: spl/sunxi-spl.bin u-boot.img u-boot.dtb FORCE
endif endif
ifneq ($(CONFIG_TEGRA),) ifneq ($(CONFIG_TEGRA),)
ifneq ($(CONFIG_BINMAN),)
u-boot-dtb-tegra.bin u-boot-tegra.bin u-boot-nodtb-tegra.bin: \
spl/u-boot-spl u-boot.bin FORCE
$(call if_changed,binman)
else
OBJCOPYFLAGS_u-boot-nodtb-tegra.bin = -O binary --pad-to=$(CONFIG_SYS_TEXT_BASE) 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 u-boot-nodtb-tegra.bin: spl/u-boot-spl u-boot-nodtb.bin FORCE
$(call if_changed,pad_cat) $(call if_changed,pad_cat)
@ -1159,6 +1164,7 @@ u-boot-tegra.bin: spl/u-boot-spl u-boot.bin FORCE
u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE u-boot-dtb-tegra.bin: u-boot-tegra.bin FORCE
$(call if_changed,copy) $(call if_changed,copy)
endif # binman
endif endif
OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI) OBJCOPYFLAGS_u-boot-app.efi := $(OBJCOPYFLAGS_EFI)

40
arch/arm/dts/tegra-u-boot.dtsi Normal file
View file

@ -0,0 +1,40 @@
#include <config.h>
/ {
binman {
multiple-images;
image1 {
filename = "u-boot-tegra.bin";
pad-byte = <0xff>;
u-boot-spl {
};
u-boot {
pos = <(CONFIG_SYS_TEXT_BASE -
CONFIG_SPL_TEXT_BASE)>;
};
};
/* Same as image1 - some tools still expect the -dtb suffix */
image2 {
filename = "u-boot-dtb-tegra.bin";
pad-byte = <0xff>;
u-boot-spl {
};
u-boot {
pos = <(CONFIG_SYS_TEXT_BASE -
CONFIG_SPL_TEXT_BASE)>;
};
};
image3 {
filename = "u-boot-nodtb-tegra.bin";
pad-byte = <0xff>;
u-boot-spl {
};
u-boot-nodtb {
pos = <(CONFIG_SYS_TEXT_BASE -
CONFIG_SPL_TEXT_BASE)>;
};
};
};
};

3
arch/arm/dts/tegra114-u-boot.dtsi Normal file
View file

@ -0,0 +1,3 @@
#include <config.h>
#include "tegra-u-boot.dtsi"

2
arch/arm/dts/tegra124-nyan-big-u-boot.dtsi
View file

@ -5,6 +5,8 @@
* SPDX-License-Identifier: GPL-2.0+ * SPDX-License-Identifier: GPL-2.0+
*/ */
#include "tegra-u-boot.dtsi"
/ { / {
host1x@50000000 { host1x@50000000 {
u-boot,dm-pre-reloc; u-boot,dm-pre-reloc;

3
arch/arm/dts/tegra124-u-boot.dtsi Normal file
View file

@ -0,0 +1,3 @@
#include <config.h>
#include "tegra-u-boot.dtsi"

11
arch/arm/dts/tegra20-u-boot.dtsi
View file

@ -1,8 +1,3 @@
/ { #include <config.h>
host1x@50000000 {
u-boot,dm-pre-reloc; #include "tegra-u-boot.dtsi"
dc@54200000 {
u-boot,dm-pre-reloc;
};
};
};

3
arch/arm/dts/tegra210-u-boot.dtsi Normal file
View file

@ -0,0 +1,3 @@
#include <config.h>
#include "tegra-u-boot.dtsi"

3
arch/arm/dts/tegra30-u-boot.dtsi Normal file
View file

@ -0,0 +1,3 @@
#include <config.h>
#include "tegra-u-boot.dtsi"

1
arch/arm/mach-tegra/Kconfig
View file

@ -38,6 +38,7 @@ config TEGRA_COMMON
select OF_CONTROL select OF_CONTROL
select VIDCONSOLE_AS_LCD if DM_VIDEO select VIDCONSOLE_AS_LCD if DM_VIDEO
select BOARD_EARLY_INIT_F select BOARD_EARLY_INIT_F
select BINMAN
imply CRC32_VERIFY imply CRC32_VERIFY
config TEGRA_NO_BPMP config TEGRA_NO_BPMP