Merge branch 'master' of git://git.denx.de/u-boot

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

diff --git a/include/configs/rpi.h b/include/configs/rpi.h
index e293f2e..5caf90a 100644 (file)
--- a/include/configs/rpi.h
+++ b/include/configs/rpi.h
@@ -76,7 +76,6 @@
  */
 #define CONFIG_FB_ADDR                 0
 #define CONFIG_VIDEO_BCM2835
-#define CONFIG_SYS_WHITE_ON_BLACK
 
 #ifdef CONFIG_CMD_USB
 #define CONFIG_USB_DWC2
@@ -99,7 +98,6 @@
 #define CONFIG_PL01X_SERIAL
 #endif
 #define CONFIG_CONS_INDEX              0
-#define CONFIG_BAUDRATE                        115200
 
 /* Console configuration */
 #define CONFIG_SYS_CBSIZE              1024
@@ -119,7 +117,7 @@
 
 /* Shell */
 #define CONFIG_SYS_MAXARGS             16
-#define CONFIG_COMMAND_HISTORY
+#define CONFIG_CMDLINE_EDITING
 
 /* ATAGs support for bootm/bootz */
 #define CONFIG_SETUP_MEMORY_TAGS