diff options
author | Michal Simek <michal.simek@xilinx.com> | 2015-12-09 12:50:05 +0100 |
---|---|---|
committer | Michal Simek <michal.simek@xilinx.com> | 2016-01-27 15:55:49 +0100 |
commit | f0e353ce5538367aa4c61a60702723f32e7c5cfb (patch) | |
tree | d24d9a05570ef48f49e258b09d2f3c5f033f4c9b | |
parent | 54e24d33324a1a4599d9f830a8671a61c45300fc (diff) | |
download | talos-obmc-uboot-f0e353ce5538367aa4c61a60702723f32e7c5cfb.tar.gz talos-obmc-uboot-f0e353ce5538367aa4c61a60702723f32e7c5cfb.zip |
microblaze: Enable uart16550 DM by default
Microblaze is uses uartlite or uart16550 as console drivers.
Signed-off-by: Michal Simek <michal.simek@xilinx.com>
-rw-r--r-- | configs/microblaze-generic_defconfig | 1 | ||||
-rw-r--r-- | include/configs/microblaze-generic.h | 13 |
2 files changed, 1 insertions, 13 deletions
diff --git a/configs/microblaze-generic_defconfig b/configs/microblaze-generic_defconfig index dc4ac0558c..0947c46e4e 100644 --- a/configs/microblaze-generic_defconfig +++ b/configs/microblaze-generic_defconfig @@ -10,4 +10,5 @@ CONFIG_CMD_GPIO=y # CONFIG_CMD_SETEXPR is not set CONFIG_SPL_OF_CONTROL=y CONFIG_OF_EMBED=y +CONFIG_SYS_NS16550=y CONFIG_XILINX_UARTLITE=y diff --git a/include/configs/microblaze-generic.h b/include/configs/microblaze-generic.h index 6e3c80b143..19d5506f4e 100644 --- a/include/configs/microblaze-generic.h +++ b/include/configs/microblaze-generic.h @@ -37,19 +37,6 @@ # define CONFIG_SYS_BAUDRATE_TABLE \ {300, 600, 1200, 2400, 4800, 9600, 19200, 38400, 57600, 115200, 230400} -#if XILINX_UART16550_BASEADDR -# define CONFIG_SYS_NS16550_SERIAL -# 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 \ - ((XILINX_UART16550_BASEADDR & ~0xF) + 0x1000) -# define CONFIG_SYS_NS16550_CLK XILINX_UART16550_CLOCK_HZ -#endif - /* setting reset address */ /*#define CONFIG_SYS_RESET_ADDRESS CONFIG_SYS_TEXT_BASE*/ |