| Message ID | 20191022143922.10205-13-jjhiblot@ti.com |
|---|---|
| State | Accepted |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | Add support for applications of overlays in SPL | expand |
On Tue, 22 Oct 2019 at 08:40, Jean-Jacques Hiblot <jjhiblot@ti.com> wrote: > > If u-boot.img is a FIT image, CONFIG_OF_OVERLAY_LIST can be used to add > DT overlays to u-boot.img. > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> > --- > > Changes in v6: None > Changes in v5: None > Changes in v4: None > Changes in v3: None > Changes in v2: None > > Makefile | 3 ++- > dts/Kconfig | 8 ++++++++ > 2 files changed, 10 insertions(+), 1 deletion(-) Reviewed-by: Simon Glass <sjg@chromium.org> nit below > > diff --git a/Makefile b/Makefile > index 6fda3268e7..46c5bd4753 100644 > --- a/Makefile > +++ b/Makefile > @@ -1262,7 +1262,8 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ > -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ > -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ > -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ > - $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) > + $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) \ > + $(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST))) > else > MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \ > -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ > diff --git a/dts/Kconfig b/dts/Kconfig > index c9ab66cccc..c150a9b2af 100644 > --- a/dts/Kconfig > +++ b/dts/Kconfig > @@ -130,6 +130,14 @@ config OF_LIST > device tree files (without the directory or .dtb suffix) > separated by <space>. > > +config OF_OVERLAY_LIST > + string "List of device tree overlays to include for DT control" > + depends on SPL_LOAD_FIT_APPLY_OVERLAY > + help > + This option specifies a list of device tree overlaysto use for DT missing space > + control. This option can then be used a FIT generator to include by a FIT generator? > + the overlays in the FIT image > + > choice > prompt "SPL OF LIST compression" > depends on MULTI_DTB_FIT > -- > 2.17.1 >
On Tue, Oct 22, 2019 at 04:39:21PM +0200, Jean-Jacques Hiblot wrote: > If u-boot.img is a FIT image, CONFIG_OF_OVERLAY_LIST can be used to add > DT overlays to u-boot.img. > > Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> > Reviewed-by: Simon Glass <sjg@chromium.org> With Simon's nits corrected: Applied to u-boot/master, thanks!
diff --git a/Makefile b/Makefile index 6fda3268e7..46c5bd4753 100644 --- a/Makefile +++ b/Makefile @@ -1262,7 +1262,8 @@ MKIMAGEFLAGS_u-boot.img = -f auto -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ -p $(CONFIG_FIT_EXTERNAL_OFFSET) \ -n "U-Boot $(UBOOTRELEASE) for $(BOARD) board" -E \ - $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) + $(patsubst %,-b arch/$(ARCH)/dts/%.dtb,$(subst ",,$(CONFIG_OF_LIST))) \ + $(patsubst %,-b arch/$(ARCH)/dts/%.dtbo,$(subst ",,$(CONFIG_OF_OVERLAY_LIST))) else MKIMAGEFLAGS_u-boot.img = -A $(ARCH) -T firmware -C none -O u-boot \ -a $(CONFIG_SYS_TEXT_BASE) -e $(CONFIG_SYS_UBOOT_START) \ diff --git a/dts/Kconfig b/dts/Kconfig index c9ab66cccc..c150a9b2af 100644 --- a/dts/Kconfig +++ b/dts/Kconfig @@ -130,6 +130,14 @@ config OF_LIST device tree files (without the directory or .dtb suffix) separated by <space>. +config OF_OVERLAY_LIST + string "List of device tree overlays to include for DT control" + depends on SPL_LOAD_FIT_APPLY_OVERLAY + help + This option specifies a list of device tree overlaysto use for DT + control. This option can then be used a FIT generator to include + the overlays in the FIT image + choice prompt "SPL OF LIST compression" depends on MULTI_DTB_FIT
If u-boot.img is a FIT image, CONFIG_OF_OVERLAY_LIST can be used to add DT overlays to u-boot.img. Signed-off-by: Jean-Jacques Hiblot <jjhiblot@ti.com> --- Changes in v6: None Changes in v5: None Changes in v4: None Changes in v3: None Changes in v2: None Makefile | 3 ++- dts/Kconfig | 8 ++++++++ 2 files changed, 10 insertions(+), 1 deletion(-)