On 8/24/2021 5:41 PM, Tom Rini wrote: > Rather than using CONFIG_SABRELITE to set FDTFILE for only that > platform, switch to always setting this based on > CONFIG_DEFAULT_DEVICE_TREE as this should always match the kernel > device tree name anyhow. > > Cc: Troy Kisky <[email protected]> > Signed-off-by: Tom Rini <[email protected]> > --- > configs/mx6qsabrelite_defconfig | 1 - > include/configs/nitrogen6x.h | 10 +--------- > 2 files changed, 1 insertion(+), 10 deletions(-) > > diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig > index 9f0882e932f4..b496df8a4dac 100644 > --- a/configs/mx6qsabrelite_defconfig > +++ b/configs/mx6qsabrelite_defconfig > @@ -16,7 +16,6 @@ CONFIG_DEFAULT_DEVICE_TREE="imx6q-sabrelite" > CONFIG_CMD_HDMIDETECT=y > CONFIG_AHCI=y > CONFIG_DISTRO_DEFAULTS=y > -CONFIG_SYS_EXTRA_OPTIONS="SABRELITE" > CONFIG_BOOTDELAY=3 > # CONFIG_USE_BOOTCOMMAND is not set > CONFIG_USE_PREBOOT=y > diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h > index 0c407503517d..1a0d970de716 100644 > --- a/include/configs/nitrogen6x.h > +++ b/include/configs/nitrogen6x.h > @@ -90,14 +90,6 @@ > #define DISTRO_BOOT_DEV_DHCP(func) > #endif > > - > -#if defined(CONFIG_SABRELITE) > -#define FDTFILE "fdtfile=imx6q-sabrelite.dtb\0" > -#else > -/* FIXME: nitrogen6x covers multiple configs. Define fdtfile for each > supported config. */ > -#define FDTFILE > -#endif > - > #define BOOT_TARGET_DEVICES(func) \ > DISTRO_BOOT_DEV_MMC(func) \ > DISTRO_BOOT_DEV_SATA(func) \ > @@ -113,7 +105,7 @@ > "fdt_high=0xffffffff\0" \ > "initrd_high=0xffffffff\0" \ > "fdt_addr_r=0x18000000\0" \ > - FDTFILE \ > + "fdtfile=" __stringify(CONFIG_DEFAULT_DEVICE_TREE) ".dtb\0" \ > "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ > "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ > "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ >
Acked-by: Troy Kisky <[email protected]> Thanks!
