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-arm
[platform/kernel/u-boot.git]
/
include
/
configs
/
incaip.h
diff --git
a/include/configs/incaip.h
b/include/configs/incaip.h
index
0e5ad2b
..
f632a2c
100644
(file)
--- a/
include/configs/incaip.h
+++ b/
include/configs/incaip.h
@@
-47,9
+47,6
@@
#define CONFIG_BAUDRATE 115200
#define CONFIG_BAUDRATE 115200
-/* valid baudrates */
-#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200 }
-
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_PREBOOT "echo;" \
#define CONFIG_TIMESTAMP /* Print image info with timestamp */
#define CONFIG_PREBOOT "echo;" \
@@
-166,7
+163,6
@@
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_INCA_IP_SWITCH
#define CONFIG_NR_DRAM_BANKS 1
#define CONFIG_INCA_IP_SWITCH
-#define CONFIG_NET_MULTI
#define CONFIG_INCA_IP_SWITCH_AMDIX
/*
#define CONFIG_INCA_IP_SWITCH_AMDIX
/*