projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
a545850
..
5caf90a
100644
(file)
--- a/
include/configs/rpi.h
+++ b/
include/configs/rpi.h
@@
-63,9
+63,6
@@
#define CONFIG_SYS_MEMTEST_END 0x00200000
#define CONFIG_LOADADDR 0x00200000
#define CONFIG_SYS_MEMTEST_END 0x00200000
#define CONFIG_LOADADDR 0x00200000
-/* Flash */
-#define CONFIG_SYS_NO_FLASH
-
/* Devices */
/* GPIO */
#define CONFIG_BCM2835_GPIO
/* Devices */
/* GPIO */
#define CONFIG_BCM2835_GPIO
@@
-79,7
+76,6
@@
*/
#define CONFIG_FB_ADDR 0
#define CONFIG_VIDEO_BCM2835
*/
#define CONFIG_FB_ADDR 0
#define CONFIG_VIDEO_BCM2835
-#define CONFIG_SYS_WHITE_ON_BLACK
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
#ifdef CONFIG_CMD_USB
#define CONFIG_USB_DWC2
@@
-102,7
+98,6
@@
#define CONFIG_PL01X_SERIAL
#endif
#define CONFIG_CONS_INDEX 0
#define CONFIG_PL01X_SERIAL
#endif
#define CONFIG_CONS_INDEX 0
-#define CONFIG_BAUDRATE 115200
/* Console configuration */
#define CONFIG_SYS_CBSIZE 1024
/* Console configuration */
#define CONFIG_SYS_CBSIZE 1024
@@
-122,7
+117,7
@@
/* Shell */
#define CONFIG_SYS_MAXARGS 16
/* Shell */
#define CONFIG_SYS_MAXARGS 16
-#define CONFIG_C
OMMAND_HISTORY
+#define CONFIG_C
MDLINE_EDITING
/* ATAGs support for bootm/bootz */
#define CONFIG_SETUP_MEMORY_TAGS
/* ATAGs support for bootm/bootz */
#define CONFIG_SETUP_MEMORY_TAGS