projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mx31pdk: Fix CONFIG_SYS_MEMTEST_END
[oweals/u-boot.git]
/
include
/
configs
/
microblaze-generic.h
diff --git
a/include/configs/microblaze-generic.h
b/include/configs/microblaze-generic.h
index a811b76d7b011803430336565afaa658fcb32857..1f4aefde13c79941052dab3bb689f25369d0ffff 100644
(file)
--- a/
include/configs/microblaze-generic.h
+++ b/
include/configs/microblaze-generic.h
@@
-41,10
+41,14
@@
#elif XILINX_UART16550_BASEADDR
# define CONFIG_SYS_NS16550 1
# define CONFIG_SYS_NS16550_SERIAL
#elif XILINX_UART16550_BASEADDR
# define CONFIG_SYS_NS16550 1
# define CONFIG_SYS_NS16550_SERIAL
-# define CONFIG_SYS_NS16550_REG_SIZE -4
+# if defined(__MICROBLAZEEL__)
+# define CONFIG_SYS_NS16550_REG_SIZE -4
+# else
+# define CONFIG_SYS_NS16550_REG_SIZE 4
+# endif
# define CONFIG_CONS_INDEX 1
# define CONFIG_SYS_NS16550_COM1 \
# define CONFIG_CONS_INDEX 1
# define CONFIG_SYS_NS16550_COM1 \
-
(XILINX_UART16550_BASEADDR
+ 0x1000)
+
((XILINX_UART16550_BASEADDR & ~0xF)
+ 0x1000)
# define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ
# define CONFIG_BAUDRATE 115200
# define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ
# define CONFIG_BAUDRATE 115200
@@
-68,6
+72,10
@@
# define CONFIG_XILINX_LL_TEMAC 1
# define CONFIG_SYS_ENET
#endif
# define CONFIG_XILINX_LL_TEMAC 1
# define CONFIG_SYS_ENET
#endif
+#if defined(XILINX_AXIEMAC_BASEADDR)
+# define CONFIG_XILINX_AXIEMAC 1
+# define CONFIG_SYS_ENET
+#endif
#undef ET_DEBUG
#undef ET_DEBUG
@@
-243,12
+251,11
@@
#ifndef CONFIG_SYS_ENET
# undef CONFIG_CMD_NET
#ifndef CONFIG_SYS_ENET
# undef CONFIG_CMD_NET
-# undef CONFIG_NET_MULTI
# undef CONFIG_CMD_NFS
#else
# define CONFIG_CMD_PING
# define CONFIG_CMD_DHCP
# undef CONFIG_CMD_NFS
#else
# define CONFIG_CMD_PING
# define CONFIG_CMD_DHCP
-# define CONFIG_
NET_MULTI
+# define CONFIG_
CMD_TFTPPUT
#endif
#if defined(CONFIG_SYSTEMACE)
#endif
#if defined(CONFIG_SYSTEMACE)