karo: fdt: fix panel-dpi support

[karo-tx-uboot.git] / include / configs / tegra-common-post.h

diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index c337e3016e7682b7c2e3da2250715b90ca041447..e67ff7b957154f92f3c85bdf1012828ca29c9303 100644 (file)
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -34,14 +34,20 @@
 #define STDIN_KBD_USB ""
 #endif
 
-#ifdef CONFIG_VIDEO_TEGRA
+#ifdef CONFIG_LCD
 #define STDOUT_LCD ",lcd"
 #else
 #define STDOUT_LCD ""
 #endif
 
+#ifdef CONFIG_CROS_EC_KEYB
+#define STDOUT_CROS_EC ",cros-ec-keyb"
+#else
+#define STDOUT_CROS_EC ""
+#endif
+
 #define TEGRA_DEVICE_SETTINGS \
-       "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB "\0" \
+       "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \
        "stdout=serial" STDOUT_LCD "\0" \
        "stderr=serial" STDOUT_LCD "\0" \
        ""
@@ -50,16 +56,31 @@
 #define BOARD_EXTRA_ENV_SETTINGS
 #endif
 
+#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR
+
+#ifndef CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
+#define CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
+#endif
+
+#ifdef CONFIG_ARM64
+#define FDT_HIGH "ffffffffffffffff"
+#define INITRD_HIGH "ffffffffffffffff"
+#else
+#define FDT_HIGH "ffffffff"
+#define INITRD_HIGH "ffffffff"
+#endif
+
 #define CONFIG_EXTRA_ENV_SETTINGS \
        TEGRA_DEVICE_SETTINGS \
        MEM_LAYOUT_ENV_SETTINGS \
-       "fdt_high=ffffffff\0" \
-       "initrd_high=ffffffff\0" \
+       "fdt_high=" FDT_HIGH "\0" \
+       "initrd_high=" INITRD_HIGH "\0" \
        BOOTENV \
-       BOARD_EXTRA_ENV_SETTINGS
+       BOARD_EXTRA_ENV_SETTINGS \
+       CONFIG_CHROMEOS_EXTRA_ENV_SETTINGS
 
 #if defined(CONFIG_TEGRA20_SFLASH) || defined(CONFIG_TEGRA20_SLINK) || defined(CONFIG_TEGRA114_SPI)
-#define CONFIG_FDT_SPI
+#define CONFIG_TEGRA_SPI
 #endif
 
 /* overrides for SPL build here */
@@ -67,11 +88,6 @@
 
 #define CONFIG_SKIP_LOWLEVEL_INIT
 
-/* remove devicetree support */
-#ifdef CONFIG_OF_CONTROL
-#undef CONFIG_OF_CONTROL
-#endif
-
 /* remove I2C support */
 #ifdef CONFIG_SYS_I2C_TEGRA
 #undef CONFIG_SYS_I2C_TEGRA