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

[u-boot] / include / configs / firefly-rk3288.h

diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index d6423e7e554d21bd989fb71d91613735741e8ce0..2b0ac9ec5f43e62c8bb47679063bcd5b72538cf5 100644 (file)
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -8,24 +8,12 @@
 #define __CONFIG_H
 
 #define ROCKCHIP_DEVICE_SETTINGS \
-               "stdin=serial,cros-ec-keyb\0" \
+               "stdin=serial,usbkbd\0" \
                "stdout=serial,vidconsole\0" \
                "stderr=serial,vidconsole\0"
 
 #include <configs/rk3288_common.h>
 
-#define CONFIG_SPL_MMC_SUPPORT
-
-#define CONFIG_ENV_IS_IN_MMC
 #define CONFIG_SYS_MMC_ENV_DEV 0
-/* SPL @ 32k for ~36k
- * ENV @ 96k
- * u-boot @ 128K
- */
-#define CONFIG_ENV_OFFSET (96 * 1024)
-
-#define CONFIG_I2C_EDID
-#define CONFIG_SYS_WHITE_ON_BLACK
-#define CONFIG_CONSOLE_SCROLL_LINES            10
 
 #endif