summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2017-06-10 22:01:22 (GMT)
committerTom Rini <trini@konsulko.com>2017-06-10 22:01:22 (GMT)
commit8cb3ce64f936f5dedbcfc1935c5caf31bb682474 (patch)
treebc6cbbacd344ccdac327b4bb7337aa316ad000e0 /include
parent4bdb49a7487d1c46c04e3da3f1f370cde1566aea (diff)
parent9620d87259572ef21f0df60988d9a932ca673779 (diff)
downloadu-boot-8cb3ce64f936f5dedbcfc1935c5caf31bb682474.tar.xz
Merge git://git.denx.de/u-boot-dm
Diffstat (limited to 'include')
-rw-r--r--include/configs/rockchip-common.h2
-rw-r--r--include/configs/tegra-common-post.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index 9d183ce..0573571 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -54,4 +54,6 @@
#define CONFIG_ENV_OFFSET (96 * 1024)
#endif
+#define CONFIG_DISPLAY_BOARDINFO_LATE
+
#endif /* _ROCKCHIP_COMMON_H_ */
diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h
index c03efd8..dd72e5b 100644
--- a/include/configs/tegra-common-post.h
+++ b/include/configs/tegra-common-post.h
@@ -105,7 +105,7 @@
/* overrides for SPL build here */
#ifdef CONFIG_SPL_BUILD
-#define CONFIG_SKIP_LOWLEVEL_INIT
+#define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
/* remove I2C support */
#ifdef CONFIG_SYS_I2C_TEGRA