summaryrefslogtreecommitdiff
path: root/include/configs/nitrogen6x.h
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-08-24 20:41:03 -0400
committerTom Rini <trini@konsulko.com>2021-08-31 17:47:51 -0400
commit395110284b56bb704020df3fcdf66b74e63986fb (patch)
tree5c3111803c5af0b92a0c7f6a65ea86acf4bb3bf6 /include/configs/nitrogen6x.h
parentc278b05bc631279d8823b0c730d7e0f0346c4b86 (diff)
downloadu-boot-395110284b56bb704020df3fcdf66b74e63986fb.tar.gz
u-boot-395110284b56bb704020df3fcdf66b74e63986fb.tar.bz2
u-boot-395110284b56bb704020df3fcdf66b74e63986fb.zip
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. Signed-off-by: Tom Rini <trini@konsulko.com> Acked-by: Troy Kisky <troy.kisky@boundarydevices.com>
Diffstat (limited to 'include/configs/nitrogen6x.h')
-rw-r--r--include/configs/nitrogen6x.h10
1 files changed, 1 insertions, 9 deletions
diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h
index c6e1461783..6250ce42b9 100644
--- a/include/configs/nitrogen6x.h
+++ b/include/configs/nitrogen6x.h
@@ -84,14 +84,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) \
@@ -107,7 +99,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_SYS_LOAD_ADDR) "\0" \
"pxefile_addr_r=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \
"scriptaddr=" __stringify(CONFIG_SYS_LOAD_ADDR) "\0" \