Merge git://www.denx.de/git/u-boot-imx

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

diff --git a/include/configs/firefly-rk3288.h b/include/configs/firefly-rk3288.h
index 4c5c4ddefd5b21e2b185cc33bde08727384e47b0..d6bb9f6fb4af05d91755e77a3dc717dd33856ce1 100644 (file)
--- a/include/configs/firefly-rk3288.h
+++ b/include/configs/firefly-rk3288.h
@@ -7,16 +7,14 @@
 #ifndef __CONFIG_H
 #define __CONFIG_H
 
-#include <configs/rk3288_common.h>
+#define ROCKCHIP_DEVICE_SETTINGS \
+               "stdin=serial,usbkbd\0" \
+               "stdout=serial,vidconsole\0" \
+               "stderr=serial,vidconsole\0" \
+               "preboot=usb start\0"
 
-#define CONFIG_SPL_MMC_SUPPORT
+#include <configs/rk3288_common.h>
 
-#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)
 
 #endif