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-i2c
[platform/kernel/u-boot.git]
/
include
/
configs
/
armadillo-800eva.h
diff --git
a/include/configs/armadillo-800eva.h
b/include/configs/armadillo-800eva.h
index
25b88f9
..
2023895
100644
(file)
--- a/
include/configs/armadillo-800eva.h
+++ b/
include/configs/armadillo-800eva.h
@@
-16,12
+16,10
@@
#include <asm/arch/rmobile.h>
#include <asm/arch/rmobile.h>
-#define CONFIG_CMD_DFL
#define CONFIG_CMD_SDRAM
#define BOARD_LATE_INIT
#define CONFIG_CMD_SDRAM
#define BOARD_LATE_INIT
-#define CONFIG_BAUDRATE 115200
#define CONFIG_BOOTARGS ""
#undef CONFIG_SHOW_BOOT_PROGRESS
#define CONFIG_BOOTARGS ""
#undef CONFIG_SHOW_BOOT_PROGRESS
@@
-76,7
+74,6
@@
#define CONFIG_SYS_TEXT_BASE 0xE80C0000
/* FLASH */
#define CONFIG_SYS_TEXT_BASE 0xE80C0000
/* FLASH */
-#define CONFIG_SYS_NO_FLASH
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CONFIG_SYS_FLASH_BASE 0x00000000
#define CONFIG_SYS_FLASH_CFI
#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT
#define CONFIG_SYS_FLASH_BASE 0x00000000