56 lines
1.7 KiB
Diff
56 lines
1.7 KiB
Diff
|
From a63eb1bdcd25246b2c637c7846917dc6dc607725 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
Date: Thu, 18 Apr 2019 15:44:59 +0100
|
||
|
|
Subject: [PATCH] add BOOTENV_EFI_SET_FDTFILE_FALLBACK for tegra186 because tx2
|
||
|
|
variants
|
||
|
|
|
||
|
|
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||
|
|
---
|
||
|
|
include/config_distro_bootcmd.h | 2 ++
|
||
|
|
include/configs/tegra186-common.h | 7 ++++++-
|
||
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/include/config_distro_bootcmd.h b/include/config_distro_bootcmd.h
|
||
|
|
index fc0935fa21..fd1c5f5afa 100644
|
||
|
|
--- a/include/config_distro_bootcmd.h
|
||
|
|
+++ b/include/config_distro_bootcmd.h
|
||
|
|
@@ -118,8 +118,10 @@
|
||
|
|
"setenv efi_fdtfile ${soc}-${board}${boardver}.dtb; " \
|
||
|
|
"fi; "
|
||
|
|
#else
|
||
|
|
+#ifndef BOOTENV_EFI_SET_FDTFILE_FALLBACK
|
||
|
|
#define BOOTENV_EFI_SET_FDTFILE_FALLBACK
|
||
|
|
#endif
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
|
||
|
|
#define BOOTENV_SHARED_EFI \
|
||
|
|
diff --git a/include/configs/tegra186-common.h b/include/configs/tegra186-common.h
|
||
|
|
index 5c3ad35c76..d5f21e0907 100644
|
||
|
|
--- a/include/configs/tegra186-common.h
|
||
|
|
+++ b/include/configs/tegra186-common.h
|
||
|
|
@@ -20,6 +20,12 @@
|
||
|
|
/* Generic Interrupt Controller */
|
||
|
|
#define CONFIG_GICV2
|
||
|
|
|
||
|
|
+#undef FDTFILE
|
||
|
|
+#define BOOTENV_EFI_SET_FDTFILE_FALLBACK \
|
||
|
|
+ "if test -z \"${fdtfile}\" -a -n \"${soc}\"; then " \
|
||
|
|
+ "setenv efi_fdtfile ${vendor}/${soc}-${board}${boardver}.dtb; " \
|
||
|
|
+ "fi; "
|
||
|
|
+
|
||
|
|
/*
|
||
|
|
* Memory layout for where various images get loaded by boot scripts:
|
||
|
|
*
|
||
|
|
@@ -49,7 +55,6 @@
|
||
|
|
"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"
|
||
|
|
|
||
|
|
--
|
||
|
|
2.26.0
|
||
|
|
|