On Mo, 2019-12-02 at 11:07 +0100, Sascha Hauer wrote: > On Fri, Nov 29, 2019 at 04:14:27PM +0100, Lucas Stach wrote: > > ARM32 and ARM64 boards can not be built into the same image. Make this > > clear by adding a choice for the different image types. While at it > > add a single board option. > > > > Signed-off-by: Lucas Stach <l.stach@xxxxxxxxxxxxxx> > > --- > > arch/arm/mach-imx/Kconfig | 56 +++++++++++++++++++++++++-------------- > > 1 file changed, 36 insertions(+), 20 deletions(-) > > > > diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig > > index 6e98e95dbb00..f39d58ecefb2 100644 > > --- a/arch/arm/mach-imx/Kconfig > > +++ b/arch/arm/mach-imx/Kconfig > > @@ -199,10 +199,22 @@ config ARCH_VF610 > > select IMX_OCOTP # Needed for clock adjustement > > select CLOCKSOURCE_ARM_GLOBAL_TIMER > > > > +choice > > + prompt "Build type" > > + > > config IMX_MULTI_BOARDS > > - bool "Allow multiple boards to be selected" > > + bool "Allow multiple ARM32 boards to be selected" > > + select HAVE_PBL_MULTI_IMAGES > > + > > +config IMX_MULTI_BOARDS64 > > + bool "Allow multiple ARM64 boards to be selected" > > select HAVE_PBL_MULTI_IMAGES > > > > +config IMX_SINGLE_BOARD > > + bool "Select single board (legacy)" > > + > > +endchoice > > This breaks several defconfigs that now have the wrong default for this > choice: > > cupid_defconfig > eukrea_cpuimx25_defconfig > eukrea_cpuimx27_defconfig > eukrea_cpuimx35_defconfig > eukrea_cpuimx51_defconfig > freescale-mx21-ads_defconfig > freescale-mx25-3ds_defconfig > freescale-mx27-ads_defconfig > freescale-mx35-3ds_defconfig > freescale-mx53-smd_defconfig > imx_v8_defconfig > kindle3_defconfig > neso_defconfig > phytec-phycore-imx31_defconfig > phytec-phycore-imx35_defconfig > tx51stk5_defconfig Uh, sorry about this. Somehow I already had a feeling that his patch might mess something up... Can you remove this single patch from the series? I'll send an updated patch after some soak time in the randconfig builder. Regards, Lucas _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
