diff options
| author | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-01-15 16:44:18 -0500 |
| commit | 8e9801c283c0e5a7ccd5c04f5ba09003d01f1591 (patch) | |
| tree | ae79033993ae3f06b581a3bd0fcd8dc36a3528eb /include/configs/cm_fx6.h | |
| parent | a970ee22578dce3d7596280351d3dbade561ed8c (diff) | |
| parent | 9587b0d61133c025d48ebf480aa021fc2fdd53a7 (diff) | |
Merge git://git.denx.de/u-boot-imx
Diffstat (limited to 'include/configs/cm_fx6.h')
| -rw-r--r-- | include/configs/cm_fx6.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index ec3e6e6ca5..da870b9baa 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -67,6 +67,7 @@ #define CONFIG_ENV_OFFSET (768 * 1024) #ifndef CONFIG_SPL_BUILD +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define CONFIG_EXTRA_ENV_SETTINGS \ "fdt_high=0xffffffff\0" \ "initrd_high=0xffffffff\0" \ @@ -75,6 +76,7 @@ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ + "fdtfile=undefined\0" \ "stdin=serial,usbkbd\0" \ "stdout=serial,vga\0" \ "stderr=serial,vga\0" \ @@ -152,6 +154,11 @@ "fi;" \ "run setupnandboot;" \ "run nandboot;\0" \ + "findfdt="\ + "if test $board_name = Utilite && test $board_rev = MX6Q ; then " \ + "setenv fdtfile imx6q-utilite-pro.dtb; fi; " \ + "if test $fdtfile = undefined; then " \ + "echo WARNING: Could not determine dtb to use; fi; \0" \ BOOTENV #define CONFIG_PREBOOT "usb start;sf probe" |