Merge git://git.denx.de/u-boot-fdt

[platform/kernel/u-boot.git] / include / configs / smdk5250.h

diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h
index 183aae7..c152459 100644 (file)
--- a/include/configs/smdk5250.h
+++ b/include/configs/smdk5250.h
@@ -9,9 +9,16 @@
 #ifndef __CONFIG_SMDK_H
 #define __CONFIG_SMDK_H
 
-#include <configs/exynos5250-dt.h>
+#include <configs/exynos5250-common.h>
+#include <configs/exynos5-dt-common.h>
+#include <configs/exynos5-common.h>
 
-#undef CONFIG_DEFAULT_DEVICE_TREE
-#define CONFIG_DEFAULT_DEVICE_TREE     exynos5250-smdk5250
+#undef CONFIG_EXYNOS_FB
+#undef CONFIG_EXYNOS_DP
+#undef CONFIG_KEYBOARD
+
+#define CONFIG_BOARD_COMMON
+
+#define CONFIG_DEFAULT_CONSOLE         "console=ttySAC1,115200n8\0"
 
 #endif /* __CONFIG_SMDK_H */