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 bcdd86e9f3bd970da0e597c9459dc039d6c72e2b..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 + 0x3
)
+
((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
@@
-60,6
+64,7
@@
/*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/
/* ethernet */
/*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/
/* ethernet */
+#undef CONFIG_SYS_ENET
#ifdef XILINX_EMACLITE_BASEADDR
# define CONFIG_XILINX_EMACLITE 1
# define CONFIG_SYS_ENET
#ifdef XILINX_EMACLITE_BASEADDR
# define CONFIG_XILINX_EMACLITE 1
# define CONFIG_SYS_ENET
@@
-67,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
@@
-135,17
+144,16
@@
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x1000)
/* global pointer */
#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_SDRAM_BASE + 0x1000)
/* global pointer */
-#define CONFIG_SYS_GBL_DATA_SIZE 128 /* size of global data */
/* start of global data */
#define CONFIG_SYS_GBL_DATA_OFFSET \
/* start of global data */
#define CONFIG_SYS_GBL_DATA_OFFSET \
- (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_SDRAM_SIZE \
- - CONFIG_SYS_GBL_DATA_SIZE)
+ (CONFIG_SYS_SDRAM_SIZE - GENERATED_GBL_DATA_SIZE)
/* monitor code */
#define SIZE 0x40000
/* monitor code */
#define SIZE 0x40000
-#define CONFIG_SYS_MONITOR_LEN
(SIZE - CONFIG_SYS_GBL_DATA_SIZE)
+#define CONFIG_SYS_MONITOR_LEN
SIZE
#define CONFIG_SYS_MONITOR_BASE \
#define CONFIG_SYS_MONITOR_BASE \
- (CONFIG_SYS_GBL_DATA_OFFSET - CONFIG_SYS_MONITOR_LEN)
+ (CONFIG_SYS_SDRAM_BASE + CONFIG_SYS_GBL_DATA_OFFSET \
+ - CONFIG_SYS_MONITOR_LEN - GENERATED_BD_INFO_SIZE)
#define CONFIG_SYS_MONITOR_END \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_SYS_MALLOC_LEN SIZE
#define CONFIG_SYS_MONITOR_END \
(CONFIG_SYS_MONITOR_BASE + CONFIG_SYS_MONITOR_LEN)
#define CONFIG_SYS_MALLOC_LEN SIZE
@@
-243,11
+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
#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)
@@
-326,4
+334,9
@@
# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#endif
# define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
#endif
+/* Enable flat device tree support */
+#define CONFIG_LMB 1
+#define CONFIG_FIT 1
+#define CONFIG_OF_LIBFDT 1
+
#endif /* __CONFIG_H */
#endif /* __CONFIG_H */