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

[oweals/u-boot.git] / include / configs / rock2.h

diff --git a/include/configs/rock2.h b/include/configs/rock2.h
index 99d69155d2156fff688d1fd21af7ac1addcfad98..b4dcf23b1cf324f2b7e17ca57d266627e3ca59f6 100644 (file)
--- a/include/configs/rock2.h
+++ b/include/configs/rock2.h
@@ -17,21 +17,4 @@
 #define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
 
-#ifdef CONFIG_ROCKCHIP_SPL_BACK_TO_BROM
-/* SPL @ 32k for 34k
- * u-boot directly after @ 68k for 400k or so
- * ENV @ 992k
- */
-#define CONFIG_ENV_OFFSET ((1024-32) * 1024)
-#else
-/* SPL @ 32k for ~36k
- * ENV @ 96k
- * u-boot @ 128K
- */
-#define CONFIG_ENV_OFFSET (96 * 1024)
-#endif
-
-#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES            10
-
 #endif