diff options
| author | Goldschmidt Simon <sgoldschmidt@de.pepperl-fuchs.com> | 2017-11-21 12:29:56 +0000 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2017-11-29 22:36:58 -0500 |
| commit | 9bd76b807636599712b4f932da9b57d5d3e8fad4 (patch) | |
| tree | 1c1c3f92377a23e1ae6e1cbb3d17ba3f22bb1d7e /lib | |
| parent | 20188f519a75e9d6cdd97c9e747c2550af07eb5f (diff) | |
| download | u-boot-9bd76b807636599712b4f932da9b57d5d3e8fad4.tar.gz u-boot-9bd76b807636599712b4f932da9b57d5d3e8fad4.tar.xz u-boot-9bd76b807636599712b4f932da9b57d5d3e8fad4.zip | |
spl: make CONFIG_OF_EMBED pass dts through fdtgrep
Building spl with CONFIG_OF_EMBED enabled results in an error message
on my board: "SPL image too big". This is because the fdtgrep build
step is only executed for CONFIG_OF_SEPARATE.
Fix this by moving the fdtgrep build step ('cmd_fdtgreo') from
scripts/Makefile.spl to dts/Makefile so that the reduced dtb is
available for all kinds of spl builds.
The resulting variable name for the embedded device tree blob changes,
too, which is why common.h and fdtdec.c have tiny changes.
Signed-off-by: Simon Goldschmidt <sgoldschmidt@de.pepperl-fuchs.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/fdtdec.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/fdtdec.c b/lib/fdtdec.c index c4582eacca..873bcfa78c 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1268,7 +1268,11 @@ int fdtdec_setup(void) # endif # ifdef CONFIG_OF_EMBED /* Get a pointer to the FDT */ +# ifdef CONFIG_SPL_BUILD + gd->fdt_blob = __dtb_dt_spl_begin; +# else gd->fdt_blob = __dtb_dt_begin; +# endif # elif defined CONFIG_OF_SEPARATE # ifdef CONFIG_SPL_BUILD /* FDT is at end of BSS unless it is in a different memory region */ |