[PATCH 1/2] arm: imx: move spl_imx_romapi.c to imx8m/ subdirectory

[Peng Fan (OSS)]

On 2021/10/14 20:52, Rasmus Villemoes wrote:
> Currently, if one builds for an iMX platform != imx8m and selects
> CONFIG_SPL_BOOTROM_SUPPORT, the build breaks because some
> definitions (struct rom_api, the enum boot_dev_type_e and various
> QUERY_* macros) are only exposed by the sys_proto.h header when
> CONFIG_IMX8M=y.

i.MX8ULP also use rom api.

Regards,
Peng.
> 
> While it's not necessarily meaningful to enable BOOTROM_SUPPORT for
> those other platforms, it makes better sense for code which is
> specific to imx8m to live in imx8m/.
> 
> Signed-off-by: Rasmus Villemoes <rasmus.villemoes at prevas.dk>
> ---
>   arch/arm/mach-imx/Makefile                     | 2 --
>   arch/arm/mach-imx/imx8m/Makefile               | 1 +
>   arch/arm/mach-imx/{ => imx8m}/spl_imx_romapi.c | 0
>   3 files changed, 1 insertion(+), 2 deletions(-)
>   rename arch/arm/mach-imx/{ => imx8m}/spl_imx_romapi.c (100%)
> 
> diff --git a/arch/arm/mach-imx/Makefile b/arch/arm/mach-imx/Makefile
> index 82aa39dee7..a9dee38c8d 100644
> --- a/arch/arm/mach-imx/Makefile
> +++ b/arch/arm/mach-imx/Makefile
> @@ -230,5 +230,3 @@ obj-$(CONFIG_ARCH_MX7ULP) += mx7ulp/
>   obj-$(CONFIG_IMX8M) += imx8m/
>   obj-$(CONFIG_ARCH_IMX8) += imx8/
>   obj-$(CONFIG_ARCH_IMXRT) += imxrt/
> -
> -obj-$(CONFIG_SPL_BOOTROM_SUPPORT) += spl_imx_romapi.o
> diff --git a/arch/arm/mach-imx/imx8m/Makefile b/arch/arm/mach-imx/imx8m/Makefile
> index d9dee894aa..3911489d2b 100644
> --- a/arch/arm/mach-imx/imx8m/Makefile
> +++ b/arch/arm/mach-imx/imx8m/Makefile
> @@ -6,3 +6,4 @@ obj-y += lowlevel_init.o
>   obj-y += clock_slice.o soc.o
>   obj-$(CONFIG_IMX8MQ) += clock_imx8mq.o
>   obj-$(CONFIG_IMX8MM)$(CONFIG_IMX8MN)$(CONFIG_IMX8MP) += clock_imx8mm.o
> +obj-$(CONFIG_SPL_BOOTROM_SUPPORT) += spl_imx_romapi.o
> diff --git a/arch/arm/mach-imx/spl_imx_romapi.c b/arch/arm/mach-imx/imx8m/spl_imx_romapi.c
> similarity index 100%
> rename from arch/arm/mach-imx/spl_imx_romapi.c
> rename to arch/arm/mach-imx/imx8m/spl_imx_romapi.c
>