Merge branch 'master' into next

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

diff --git a/include/configs/trats.h b/include/configs/trats.h
index bca239a..530b413 100644 (file)
--- a/include/configs/trats.h
+++ b/include/configs/trats.h
@@ -12,7 +12,6 @@
 #include <configs/exynos4-common.h>
 
 #ifndef CONFIG_SYS_L2CACHE_OFF
-#define CONFIG_SYS_L2_PL310
 #define CONFIG_SYS_PL310_BASE  0x10502000
 #endif
 
@@ -149,7 +148,6 @@
 #define LCD_BPP                        LCD_COLOR16
 
 /* LCD */
-#define CONFIG_FB_ADDR         0x52504000
 #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE  ((500 * 160 * 4) + 54)
 
 #endif /* __CONFIG_H */