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
video: Moving mx3fb.c to CONFIG_VIDEO
[platform/kernel/u-boot.git]
/
include
/
configs
/
microblaze-generic.h
diff --git
a/include/configs/microblaze-generic.h
b/include/configs/microblaze-generic.h
index
c30cc4c
..
09ff7c4
100644
(file)
--- a/
include/configs/microblaze-generic.h
+++ b/
include/configs/microblaze-generic.h
@@
-44,7
+44,7
@@
# define CONFIG_SYS_NS16550_REG_SIZE -4
# define CONFIG_CONS_INDEX 1
# define CONFIG_SYS_NS16550_COM1 \
# define CONFIG_SYS_NS16550_REG_SIZE -4
# define CONFIG_CONS_INDEX 1
# define CONFIG_SYS_NS16550_COM1 \
- (XILINX_UART16550_BASEADDR + 0x1000
+ 0x3
)
+ (XILINX_UART16550_BASEADDR + 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
@@
-57,9
+57,10
@@
#endif
/* setting reset address */
#endif
/* setting reset address */
-/*#define CONFIG_SYS_RESET_ADDRESS TEXT_BASE*/
+/*#define CONFIG_SYS_RESET_ADDRESS
CONFIG_SYS_
TEXT_BASE*/
/* ethernet */
/* 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
@@
-103,7
+104,7
@@
/*
* memory layout - Example
/*
* memory layout - Example
- * TEXT_BASE = 0x1200_0000;
+ *
CONFIG_SYS_
TEXT_BASE = 0x1200_0000;
* CONFIG_SYS_SRAM_BASE = 0x1000_0000;
* CONFIG_SYS_SRAM_SIZE = 0x0400_0000;
*
* CONFIG_SYS_SRAM_BASE = 0x1000_0000;
* CONFIG_SYS_SRAM_SIZE = 0x0400_0000;
*
@@
-113,7
+114,7
@@
*
* 0x1000_0000 CONFIG_SYS_SDRAM_BASE
* FREE
*
* 0x1000_0000 CONFIG_SYS_SDRAM_BASE
* FREE
- * 0x1200_0000 TEXT_BASE
+ * 0x1200_0000
CONFIG_SYS_
TEXT_BASE
* U-BOOT code
* 0x1202_0000
* FREE
* U-BOOT code
* 0x1202_0000
* FREE
@@
-135,17
+136,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
+243,10
@@
#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
#endif
#if defined(CONFIG_SYSTEMACE)
#endif
#if defined(CONFIG_SYSTEMACE)
@@
-326,4
+325,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 */