[PATCH 08/19] boot: Move fdt_support to boot/

[Devarsh Thakkar]

Hi Simon,

On 25/08/23 01:28, Simon Glass wrote:
> This relates to booting since it fixes up the devicetree for the OS. Move
> it into the boot/ directory.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> ---
> 
>  boot/Makefile                  | 3 +++
>  {common => boot}/fdt_support.c | 0
>  common/Makefile                | 2 --
>  3 files changed, 3 insertions(+), 2 deletions(-)
>  rename {common => boot}/fdt_support.c (100%)
> 
> diff --git a/boot/Makefile b/boot/Makefile
> index 10f015722378..f15a161614ff 100644
> --- a/boot/Makefile
> +++ b/boot/Makefile
> @@ -16,6 +16,7 @@ obj-$(CONFIG_QFW) += bootmeth_qfw.o
>  endif
>  
>  obj-y += image.o image-board.o
> +
>  obj-$(CONFIG_ANDROID_AB) += android_ab.o
>  obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o image-android-dt.o
>  
> @@ -37,6 +38,8 @@ obj-$(CONFIG_$(SPL_TPL_)BOOTSTD) += bootflow_menu.o
>  obj-$(CONFIG_$(SPL_TPL_)CEDIT) += cedit.o
>  endif
>  
> +obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
> +
>  obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += image-fdt.o

Can this be,
obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o image-fdt.o ?

Regards
Devarsh

>  obj-$(CONFIG_$(SPL_TPL_)FIT_SIGNATURE) += fdt_region.o
>  obj-$(CONFIG_$(SPL_TPL_)FIT) += image-fit.o
> diff --git a/common/fdt_support.c b/boot/fdt_support.c
> similarity index 100%
> rename from common/fdt_support.c
> rename to boot/fdt_support.c
> diff --git a/common/Makefile b/common/Makefile
> index 0a3f75f2f1c8..0948721d0b47 100644
> --- a/common/Makefile
> +++ b/common/Makefile
> @@ -18,7 +18,6 @@ obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
>  obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
>  
>  obj-$(CONFIG_FDT_SIMPLEFB) += fdt_simplefb.o
> -obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
>  obj-$(CONFIG_MII) += miiphyutil.o
>  obj-$(CONFIG_CMD_MII) += miiphyutil.o
>  obj-$(CONFIG_PHYLIB) += miiphyutil.o
> @@ -51,7 +50,6 @@ ifdef CONFIG_SPL_DFU
>  obj-$(CONFIG_DFU_OVER_USB) += dfu.o
>  endif
>  obj-$(CONFIG_SPL_NET) += miiphyutil.o
> -obj-$(CONFIG_$(SPL_TPL_)OF_LIBFDT) += fdt_support.o
>  
>  obj-$(CONFIG_SPL_USB_HOST) += usb.o usb_hub.o
>  obj-$(CONFIG_SPL_USB_STORAGE) += usb_storage.o