diff options
| author | Johan Gärdsmark <johan.gardsmark@stericsson.com> | 2010-09-28 15:00:04 +0200 |
|---|---|---|
| committer | Mian Yousaf Kaukab <mian.yousaf.kaukab@stericsson.com> | 2010-10-23 13:29:27 +0200 |
| commit | 85d9350b61addac003aafc62bcec19330e3e07f7 (patch) | |
| tree | 07ddee43219accc343b04f0cc76747d3ab5a72f7 /tools | |
| parent | 7453c8cf7cae31d9989da61a7c5d1f33ffe7a64b (diff) | |
mach-ux500: change console UART from UART2 to UART0 for U5500
Changes console UART padmuxing since UART0 is used on U5500.
Change-Id: I3fe01d1d45800cc7b08baa8f8a39a732dba20fb1
Depends-On: ttyAMA0 added in /base_system/etc/inittab for U5500.
Signed-off-by: Johan Gärdsmark <johan.gardsmark@stericsson.com>
Reviewed-on: http://gerrit.lud.stericsson.com/gerrit/6056
Reviewed-by: Jonas ABERG <jonas.aberg@stericsson.com>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/svpboot/svp5500.S | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/svpboot/svp5500.S b/tools/svpboot/svp5500.S index b74c1bdeea1..73feb880405 100644 --- a/tools/svpboot/svp5500.S +++ b/tools/svpboot/svp5500.S @@ -12,7 +12,7 @@ #define MACH_TYPE MACH_TYPE_U5500 #define CMDLINE \ "root=/dev/ram0 init=init rw " \ - "console=ttyAMA2,115200n8 " \ + "console=ttyAMA0,115200n8 " \ "mem=24MB@0 mem=208M@48M " \ "initrd=0x3000000,60M " \ "earlyprintk " \ @@ -24,13 +24,13 @@ #define NMK_GPIO_AFSLA 0x20 .macro init_console_uart - /* Enable GPIOs for UART2 (177, 178 -> AltA) */ - ldr r5, =U5500_GPIO4_BASE - ldr r6, =((1 << 17) | (1 << 18)) + /* Enable GPIOs for UART0 (28, 29 -> AltA) */ + ldr r5, =U5500_GPIO0_BASE + ldr r6, =((1 << 28) | (1 << 29)) str r6, [r5, #NMK_GPIO_AFSLA] /* Enable UART0 */ - ldr r5, =U5500_UART2_BASE + ldr r5, =U5500_UART0_BASE ldr r6, =(UART011_CR_TXE | UART01x_CR_UARTEN) str r6, [r5, #UART011_CR] .endm |