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://www.denx.de/git/u-boot-nand-flash
[platform/kernel/u-boot.git]
/
include
/
configs
/
uc101.h
diff --git
a/include/configs/uc101.h
b/include/configs/uc101.h
index
3b471d0
..
042750e
100644
(file)
--- a/
include/configs/uc101.h
+++ b/
include/configs/uc101.h
@@
-40,6
+40,8
@@
#define CONFIG_BOARD_EARLY_INIT_R
#define CONFIG_BOARD_EARLY_INIT_R
+#define CONFIG_HIGH_BATS 1 /* High BATs supported */
+
/*
* Serial console configuration
*/
/*
* Serial console configuration
*/
@@
-91,7
+93,7
@@
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
#define CONFIG_BOOTDELAY 5 /* autoboot after 5 seconds */
#define CONFIG_PREBOOT "echo;" \
- "echo Type \
"run flash_nfs
\" to mount root filesystem over NFS;" \
+ "echo Type \
\\"run flash_nfs\\
\" to mount root filesystem over NFS;" \
"echo"
#undef CONFIG_BOOTARGS
"echo"
#undef CONFIG_BOOTARGS
@@
-297,7
+299,7
@@
/* 8Mbit SRAM @0x80100000 */
#define CFG_CS1_START CFG_SRAM_BASE
/* 8Mbit SRAM @0x80100000 */
#define CFG_CS1_START CFG_SRAM_BASE
-#define CFG_CS1_SIZE 0x00
1
00000
+#define CFG_CS1_SIZE 0x00
2
00000
#define CFG_CS1_CFG 0x21D00
/* Display H1, Status Inputs, EPLD @0x80600000 8 Bit */
#define CFG_CS1_CFG 0x21D00
/* Display H1, Status Inputs, EPLD @0x80600000 8 Bit */
@@
-332,7
+334,6
@@
#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */
#define CONFIG_IDE_PREINIT 1
#define CFG_IDE_MAXDEVICE 2 /* max. 2 drives per IDE bus */
#define CONFIG_IDE_PREINIT 1
-/* #define CONFIG_IDE_RESET 1 beispile siehe tqm5200.c */
#define CFG_ATA_IDE0_OFFSET 0x0000
#define CFG_ATA_IDE0_OFFSET 0x0000