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
/
ti816x_evm.h
diff --git
a/include/configs/ti816x_evm.h
b/include/configs/ti816x_evm.h
index
5db4c60
..
51b09d4
100644
(file)
--- a/
include/configs/ti816x_evm.h
+++ b/
include/configs/ti816x_evm.h
@@
-12,8
+12,6
@@
#define CONFIG_TI81XX
#define CONFIG_TI816X
#define CONFIG_TI81XX
#define CONFIG_TI816X
-#define CONFIG_SYS_NO_FLASH
-#define CONFIG_OMAP
#define CONFIG_ARCH_CPU_INIT
#define CONFIG_ARCH_CPU_INIT
@@
-50,12
+48,7
@@
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
#define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */
-#define CONFIG_CMD_ASKEN
-#define CONFIG_OMAP_GPIO
-#define CONFIG_MMC
-#define CONFIG_GENERIC_MMC
-#define CONFIG_OMAP_HSMMC
-#define CONFIG_DOS_PARTITION
+#define CONFIG_CMD_ASKENV
#define CONFIG_FS_FAT
#define CONFIG_FS_FAT
@@
-102,8
+95,6
@@
#define CONFIG_SYS_NS16550_CLK (48000000)
#define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */
#define CONFIG_SYS_NS16550_CLK (48000000)
#define CONFIG_SYS_NS16550_COM1 0x48024000 /* Base EVM has UART2 */
-#define CONFIG_BAUDRATE 115200
-
/* allow overwriting serial config and ethaddr */
#define CONFIG_ENV_OVERWRITE
/* allow overwriting serial config and ethaddr */
#define CONFIG_ENV_OVERWRITE
@@
-144,7
+135,4
@@
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
#define CONFIG_SKIP_LOWLEVEL_INIT
#endif
-/* Unsupported features */
-#undef CONFIG_USE_IRQ
-
#endif
#endif