arm: tegra: define fdtfile option for distro boot

For booting via UEFI we need to define the fdtfile option so
bootefi has the option to load a fdtfile from disk. For arm64
the kernel dtb is located in a vendor directory so we define
that as nvidia for that architecture.

Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
Signed-off-by: Tom Warren <twarren@nvidia.com>

diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h
index 2b968917d34d17d724d8cd4577f55d709bfa1f7c..432eceaf3513112b1960b7632a4cdd64ccf45d42 100644 (file)
--- a/include/configs/tegra-common.h
+++ b/include/configs/tegra-common.h
@@ -49,6 +49,12 @@
 /* Boot Argument Buffer Size */
 #define CONFIG_SYS_BARGSIZE            (CONFIG_SYS_CBSIZE)
 
+#ifdef CONFIG_ARM64
+#define FDTFILE "nvidia/" CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#else
+#define FDTFILE CONFIG_DEFAULT_DEVICE_TREE ".dtb"
+#endif
+
 /*-----------------------------------------------------------------------
  * Physical Memory Map
  */

diff --git a/include/configs/tegra114-common.h b/include/configs/tegra114-common.h
index d3a704569767deba1fe9414a7e65069f6736410d..9d751b6740433c2d3babbce185e853cd337a3593 100644 (file)
--- a/include/configs/tegra114-common.h
+++ b/include/configs/tegra114-common.h
@@ -50,6 +50,7 @@
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"
 

diff --git a/include/configs/tegra124-common.h b/include/configs/tegra124-common.h
index 522993b958ac7feebe1347fbf4bb5765a6ca6852..0eb8f92809181df96277df40dc084e28a8f544d0 100644 (file)
--- a/include/configs/tegra124-common.h
+++ b/include/configs/tegra124-common.h
@@ -52,6 +52,7 @@
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"
 

diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
index b4936cc731f77fd45d13e549887e6b65aad4f55e..5c3ad35c766c8d8a53f941cacbdedc91cc7de45a 100644 (file)
--- a/include/configs/tegra186-common.h
+++ b/include/configs/tegra186-common.h
@@ -49,6 +49,7 @@
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x82000000\0" \
        "ramdisk_addr_r=0x82100000\0"
 

diff --git a/include/configs/tegra20-common.h b/include/configs/tegra20-common.h
index 1e31d82574a6156876594a63054e9e1f6c88638f..fdd89969554150ba235d2a34bd20d7f47f9ad91e 100644 (file)
--- a/include/configs/tegra20-common.h
+++ b/include/configs/tegra20-common.h
@@ -51,6 +51,7 @@
        "scriptaddr=0x10000000\0" \
        "pxefile_addr_r=0x10100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x03000000\0" \
        "ramdisk_addr_r=0x03100000\0"
 

diff --git a/include/configs/tegra210-common.h b/include/configs/tegra210-common.h
index 1b8e94b60cc6fef4f4557c43b94f0f3ce710584b..2226effe16ab2c258cae767afb203c06aca92cce 100644 (file)
--- a/include/configs/tegra210-common.h
+++ b/include/configs/tegra210-common.h
@@ -46,6 +46,7 @@
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83200000\0"
 

diff --git a/include/configs/tegra30-common.h b/include/configs/tegra30-common.h
index 54bc6756abefbeab30cb4f2c4df53bfda06aa8ea..6c5dc24b26664e6831ba27d93a42487310b5c26b 100644 (file)
--- a/include/configs/tegra30-common.h
+++ b/include/configs/tegra30-common.h
@@ -47,6 +47,7 @@
        "scriptaddr=0x90000000\0" \
        "pxefile_addr_r=0x90100000\0" \
        "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \
+       "fdtfile=" FDTFILE "\0" \
        "fdt_addr_r=0x83000000\0" \
        "ramdisk_addr_r=0x83100000\0"