diff mbox

[U-Boot,v3,13/13] nios2: 10m50: change to ns16550 uart

Message ID 1447940895-7763-14-git-send-email-thomas@wytron.com.tw
State Accepted
Delegated to: Tom Rini
Headers show

Commit Message

Thomas Chou Nov. 19, 2015, 1:48 p.m. UTC 
Change to ns16550 uart for 10m50 devboard based on a new
Altera release.

Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
Reviewed-by: Tom Rini <trini@konsulko.com>
---
 arch/nios2/dts/10m50_devboard.dts | 2 +-
 configs/10m50_defconfig           | 2 +-
 include/configs/10m50_devboard.h  | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

Comments

Simon Glass Nov. 20, 2015, 5:18 p.m. UTC | #1 
On 19 November 2015 at 06:48, Thomas Chou <thomas@wytron.com.tw> wrote:
> Change to ns16550 uart for 10m50 devboard based on a new
> Altera release.
>
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> ---
>  arch/nios2/dts/10m50_devboard.dts | 2 +-
>  configs/10m50_defconfig           | 2 +-
>  include/configs/10m50_devboard.h  | 1 +
>  3 files changed, 3 insertions(+), 2 deletions(-)

Acked-by: Simon Glass <sjg@chromium.org>
Tom Rini Nov. 22, 2015, 3:53 p.m. UTC | #2 
On Thu, Nov 19, 2015 at 09:48:15PM +0800, Thomas Chou wrote:

> Change to ns16550 uart for 10m50 devboard based on a new
> Altera release.
> 
> Signed-off-by: Thomas Chou <thomas@wytron.com.tw>
> Reviewed-by: Tom Rini <trini@konsulko.com>
> Acked-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox

Patch

diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts
index e89dbb2..05eac30 100644
--- a/arch/nios2/dts/10m50_devboard.dts
+++ b/arch/nios2/dts/10m50_devboard.dts
@@ -262,6 +262,6 @@ 
 
 	chosen {
 		bootargs = "debug console=ttyS0,115200";
-		stdout-path = &uart_0;
+		stdout-path = &a_16550_uart_0;
 	};
 };
diff --git a/configs/10m50_defconfig b/configs/10m50_defconfig
index 1919502..0d18e8d 100644
--- a/configs/10m50_defconfig
+++ b/configs/10m50_defconfig
@@ -22,6 +22,6 @@  CONFIG_MTD=y
 CONFIG_ALTERA_QSPI=y
 CONFIG_DM_ETH=y
 CONFIG_ALTERA_TSE=y
-CONFIG_ALTERA_UART=y
+CONFIG_SYS_NS16550=y
 CONFIG_TIMER=y
 CONFIG_ALTERA_TIMER=y
diff --git a/include/configs/10m50_devboard.h b/include/configs/10m50_devboard.h
index 48d5063..8a91cdb 100644
--- a/include/configs/10m50_devboard.h
+++ b/include/configs/10m50_devboard.h
@@ -20,6 +20,7 @@ 
  */
 #define CONFIG_BAUDRATE			115200
 #define CONFIG_SYS_CONSOLE_INFO_QUIET	/* Suppress console info */
+#define CONFIG_SYS_NS16550_MEM32
 
 /*
  * Flash