diff options
| author | Tom Rini <trini@konsulko.com> | 2021-08-23 18:29:35 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-08-24 18:49:14 -0400 |
| commit | d87904814d4509c956c2a94b876f8fdb4374ee6e (patch) | |
| tree | dd14f985d320c586f86e3ecd5a69845f84218161 | |
| parent | 6e17b8044f6194d610cf8f1db5ae7288e1fe91ef (diff) | |
| download | u-boot-d87904814d4509c956c2a94b876f8fdb4374ee6e.tar.gz | |
nitrogen6x: Populate FDTFILE at build-time for all platforms
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 <troy.kisky@boundarydevices.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | configs/mx6qsabrelite_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/nitrogen6x.h | 10 |
2 files changed, 1 insertions, 10 deletions
diff --git a/configs/mx6qsabrelite_defconfig b/configs/mx6qsabrelite_defconfig index 9f0882e932..b496df8a4d 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 0c40750351..1a0d970de7 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" \ |