diff mbox series

[U-Boot] rockchip: set SYS_NS16550_MEM32 for all SoCs

Message ID 20180508104301.1437-1-jsg@jsg.id.au
State Accepted
Commit b1959bd0b0c9c942a9f46722c227a36298208101
Headers show
Series [U-Boot] rockchip: set SYS_NS16550_MEM32 for all SoCs | expand

Commit Message

Jonathan Gray May 8, 2018, 10:43 a.m. UTC 
Add back part of patch send out as
'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
gotten lost when it got merged to set SYS_NS16550_MEM32.

Allows serial output to work on tinker-rk3288 again after
c3c0331db1fb7b1f4ff41e144fc04353b37c785c.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
---
 include/configs/rockchip-common.h | 2 ++
 1 file changed, 2 insertions(+)

Comments

Kever Yang May 9, 2018, 8:06 a.m. UTC | #1 
Hi Jonathan,


    Thanks for the patch, and it's interesting how this is missing,

it means all the rockchip socs can not get console output with v2018.05 :(


Thanks,
- Kever
On 05/08/2018 06:43 PM, Jonathan Gray wrote:
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
>
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
>
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
>
> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> index dee82ca99d..68e1105a4b 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -7,6 +7,8 @@
>  #define _ROCKCHIP_COMMON_H_
>  #include <linux/sizes.h>
>  
> +#define CONFIG_SYS_NS16550_MEM32
> +
>  #ifndef CONFIG_SPL_BUILD
>  
>  /* First try to boot from SD (index 0), then eMMC (index 1) */
Philipp Tomsich May 9, 2018, 8:12 a.m. UTC | #2 
Kever,

There were a number a merge conflicts with this series and it looks like I missed
one of them.  This is the risk when I try to resolve conflicts instead of asking for 
a series to be rebased onto master…

Regards,
Philipp.

> On 9 May 2018, at 10:06, Kever Yang <kever.yang@rock-chips.com> wrote:
> 
> Hi Jonathan,
> 
> 
>     Thanks for the patch, and it's interesting how this is missing,
> 
> it means all the rockchip socs can not get console output with v2018.05 :(
> 
> 
> Thanks,
> - Kever
> On 05/08/2018 06:43 PM, Jonathan Gray wrote:
>> Add back part of patch send out as
>> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
>> gotten lost when it got merged to set SYS_NS16550_MEM32.
>> 
>> Allows serial output to work on tinker-rk3288 again after
>> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
>> 
>> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
>> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
>> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>> ---
>> include/configs/rockchip-common.h | 2 ++
>> 1 file changed, 2 insertions(+)
>> 
>> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
>> index dee82ca99d..68e1105a4b 100644
>> --- a/include/configs/rockchip-common.h
>> +++ b/include/configs/rockchip-common.h
>> @@ -7,6 +7,8 @@
>> #define _ROCKCHIP_COMMON_H_
>> #include <linux/sizes.h>
>> 
>> +#define CONFIG_SYS_NS16550_MEM32
>> +
>> #ifndef CONFIG_SPL_BUILD
>> 
>> /* First try to boot from SD (index 0), then eMMC (index 1) */
> 
>
Philipp Tomsich May 9, 2018, 8:14 a.m. UTC | #3 
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
> 
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Philipp Tomsich May 9, 2018, 8:14 a.m. UTC | #4 
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
> 
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
> 

Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Philipp Tomsich May 9, 2018, 8:19 a.m. UTC | #5 
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
> 
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
> 

Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
Philipp Tomsich May 9, 2018, 8:23 a.m. UTC | #6 
Kever,

if this affects all SoCs, then apparently nobody tested -rc3 … I had made sure that
all these last-minute changes had gone in before rc3.

Regards,
Philipp.

> On 9 May 2018, at 10:12, Dr. Philipp Tomsich <philipp.tomsich@theobroma-systems.com> wrote:
> 
> Kever,
> 
> There were a number a merge conflicts with this series and it looks like I missed
> one of them.  This is the risk when I try to resolve conflicts instead of asking for 
> a series to be rebased onto master…
> 
> Regards,
> Philipp.
> 
>> On 9 May 2018, at 10:06, Kever Yang <kever.yang@rock-chips.com> wrote:
>> 
>> Hi Jonathan,
>> 
>> 
>>    Thanks for the patch, and it's interesting how this is missing,
>> 
>> it means all the rockchip socs can not get console output with v2018.05 :(
>> 
>> 
>> Thanks,
>> - Kever
>> On 05/08/2018 06:43 PM, Jonathan Gray wrote:
>>> Add back part of patch send out as
>>> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
>>> gotten lost when it got merged to set SYS_NS16550_MEM32.
>>> 
>>> Allows serial output to work on tinker-rk3288 again after
>>> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
>>> 
>>> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
>>> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
>>> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
>>> ---
>>> include/configs/rockchip-common.h | 2 ++
>>> 1 file changed, 2 insertions(+)
>>> 
>>> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
>>> index dee82ca99d..68e1105a4b 100644
>>> --- a/include/configs/rockchip-common.h
>>> +++ b/include/configs/rockchip-common.h
>>> @@ -7,6 +7,8 @@
>>> #define _ROCKCHIP_COMMON_H_
>>> #include <linux/sizes.h>
>>> 
>>> +#define CONFIG_SYS_NS16550_MEM32
>>> +
>>> #ifndef CONFIG_SPL_BUILD
>>> 
>>> /* First try to boot from SD (index 0), then eMMC (index 1) */
>> 
>> 
> 
> _______________________________________________
> U-Boot mailing list
> U-Boot@lists.denx.de
> https://lists.denx.de/listinfo/u-boot
Heinrich Schuchardt May 9, 2018, 4:47 p.m. UTC | #7 
On 05/08/2018 12:43 PM, Jonathan Gray wrote:
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
> 
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
> 
> Signed-off-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

With the patch I get a serial console on the Asus Tinker-Board (RK3288).

Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>

> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
> index dee82ca99d..68e1105a4b 100644
> --- a/include/configs/rockchip-common.h
> +++ b/include/configs/rockchip-common.h
> @@ -7,6 +7,8 @@
>  #define _ROCKCHIP_COMMON_H_
>  #include <linux/sizes.h>
>  
> +#define CONFIG_SYS_NS16550_MEM32
> +
>  #ifndef CONFIG_SPL_BUILD
>  
>  /* First try to boot from SD (index 0), then eMMC (index 1) */
>
Philipp Tomsich May 9, 2018, 7:10 p.m. UTC | #8 
> Add back part of patch send out as
> 'rockchip: enable SYS_NS16550 for all SoCs by default' that seems to have
> gotten lost when it got merged to set SYS_NS16550_MEM32.
> 
> Allows serial output to work on tinker-rk3288 again after
> c3c0331db1fb7b1f4ff41e144fc04353b37c785c.
> 
> Signed-off-by: Kever Yang <kever.yang@rock-chips.com>
> Signed-off-by: Jonathan Gray <jsg@jsg.id.au>
> Cc: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Acked-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>
> Tested-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
> ---
>  include/configs/rockchip-common.h | 2 ++
>  1 file changed, 2 insertions(+)
> 

Applied to u-boot-rockchip, thanks!
diff mbox series

Patch

diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h
index dee82ca99d..68e1105a4b 100644
--- a/include/configs/rockchip-common.h
+++ b/include/configs/rockchip-common.h
@@ -7,6 +7,8 @@ 
 #define _ROCKCHIP_COMMON_H_
 #include <linux/sizes.h>
 
+#define CONFIG_SYS_NS16550_MEM32
+
 #ifndef CONFIG_SPL_BUILD
 
 /* First try to boot from SD (index 0), then eMMC (index 1) */