diff options
| author | Wolfgang Denk <wd@denx.de> | 2011-10-04 21:32:16 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2011-10-04 21:32:16 +0200 |
| commit | ec594e8c985466261c9264105218bc0ca24c6689 (patch) | |
| tree | 757447c9e87af50e26c28a95cd1d19407630e71e /include | |
| parent | f092f15d39d1a223b240eb83dc3f4c64a02a8ea6 (diff) | |
| parent | 37e892d93abee1d5558128db26b1fc431928a73b (diff) | |
| download | talos-obmc-uboot-ec594e8c985466261c9264105218bc0ca24c6689.tar.gz talos-obmc-uboot-ec594e8c985466261c9264105218bc0ca24c6689.zip | |
Merge branch 'master' of git://git.denx.de/u-boot-microblaze
* 'master' of git://git.denx.de/u-boot-microblaze:
microblaze: Enable FDT/FIT support
microblaze: Remove address offset for uart16550
microblaze: Do not select NFS for platforms without ethernet
microblaze: Clean up reset asm code
microblaze: Save and restore first unused vector
microblaze: Setup MB vectors if feature is enable for u-boot
microblaze: Remove debug saving value
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/microblaze-generic.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 090ab3bc2e..a811b76d7b 100644 --- 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 \ - (XILINX_UART16550_BASEADDR + 0x1000 + 0x3) + (XILINX_UART16550_BASEADDR + 0x1000) # define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ # define CONFIG_BAUDRATE 115200 @@ -60,6 +60,7 @@ /*#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 @@ -243,6 +244,7 @@ #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 @@ -325,4 +327,9 @@ # 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 */ |
