| Message ID | 20190416131746.1303495-1-arnd@arndb.de (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: debug-ll: add default address for digicolor | expand |
Hi Arnd, On Tue, Apr 16, 2019 at 03:17:30PM +0200, Arnd Bergmann wrote: > The digicolor platform has three UARTs, but the Kconfig.debug > file explicitly lists port zero as the one to be used for the > console, while not providing any default values. > > This can get an automated randconfig build stuck in a loop > waiting for the user to input the number. As we already know > the physical address, this patch provides that number as > default, along with a reasonable default value for the virtual > address. > > Cc: Baruch Siach <baruch@tkos.co.il> > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > --- > arch/arm/Kconfig.debug | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index a8a1e14f20ab..e5f0b36d797f 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -1676,6 +1676,7 @@ config DEBUG_UART_PHYS > default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1 > default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4 > default 0xe8008000 if DEBUG_R7S72100_SCIF2 > + default 0xf0000740 if DEBUG_DIGICOLOR_UA0 The addruart macro in arch/arm/include/debug/digicolor.S adds the 0x740 offset. So CONFIG_DEBUG_UART_PHYS should be 0xf0000000. > default 0xf0000be0 if ARCH_EBSA110 > default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE > default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE > @@ -1785,6 +1786,7 @@ config DEBUG_UART_VIRT > default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0 > default 0xfd883000 if DEBUG_ALPINE_UART0 > default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE > + default 0xfe000740 if DEBUG_DIGICOLOR_UA0 The value I used when testing used to be 0xf0100000. > default 0xfe012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_ORION5X > default 0xfe017000 if DEBUG_MMP_UART2 > default 0xfe018000 if DEBUG_MMP_UART3 Thanks, baruch
On Wed, Apr 17, 2019 at 6:12 AM Baruch Siach <baruch@tkos.co.il> wrote: > On Tue, Apr 16, 2019 at 03:17:30PM +0200, Arnd Bergmann wrote: > > The digicolor platform has three UARTs, but the Kconfig.debug > > file explicitly lists port zero as the one to be used for the > > console, while not providing any default values. > > > > This can get an automated randconfig build stuck in a loop > > waiting for the user to input the number. As we already know > > the physical address, this patch provides that number as > > default, along with a reasonable default value for the virtual > > address. > > > > Cc: Baruch Siach <baruch@tkos.co.il> > > Signed-off-by: Arnd Bergmann <arnd@arndb.de> > > --- > > arch/arm/Kconfig.debug | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > > index a8a1e14f20ab..e5f0b36d797f 100644 > > --- a/arch/arm/Kconfig.debug > > +++ b/arch/arm/Kconfig.debug > > @@ -1676,6 +1676,7 @@ config DEBUG_UART_PHYS > > default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1 > > default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4 > > default 0xe8008000 if DEBUG_R7S72100_SCIF2 > > + default 0xf0000740 if DEBUG_DIGICOLOR_UA0 > > The addruart macro in arch/arm/include/debug/digicolor.S adds the 0x740 offset. > So CONFIG_DEBUG_UART_PHYS should be 0xf0000000. Ok, fixed. > > default 0xf0000be0 if ARCH_EBSA110 > > default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE > > default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE > > @@ -1785,6 +1786,7 @@ config DEBUG_UART_VIRT > > default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0 > > default 0xfd883000 if DEBUG_ALPINE_UART0 > > default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE > > + default 0xfe000740 if DEBUG_DIGICOLOR_UA0 > > The value I used when testing used to be 0xf0100000. Ok, using that now. It shouldn't matter either way here, we only care about that there is nothing else at that address. Arnd
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index a8a1e14f20ab..e5f0b36d797f 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -1676,6 +1676,7 @@ config DEBUG_UART_PHYS default 0xe6e68000 if DEBUG_RCAR_GEN2_SCIF1 default 0xe6ee0000 if DEBUG_RCAR_GEN2_SCIF4 default 0xe8008000 if DEBUG_R7S72100_SCIF2 + default 0xf0000740 if DEBUG_DIGICOLOR_UA0 default 0xf0000be0 if ARCH_EBSA110 default 0xf1012000 if DEBUG_MVEBU_UART0_ALTERNATE default 0xf1012100 if DEBUG_MVEBU_UART1_ALTERNATE @@ -1785,6 +1786,7 @@ config DEBUG_UART_VIRT default 0xfd012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_MV78XX0 default 0xfd883000 if DEBUG_ALPINE_UART0 default 0xfde12000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_DOVE + default 0xfe000740 if DEBUG_DIGICOLOR_UA0 default 0xfe012000 if DEBUG_MVEBU_UART0_ALTERNATE && ARCH_ORION5X default 0xfe017000 if DEBUG_MMP_UART2 default 0xfe018000 if DEBUG_MMP_UART3
The digicolor platform has three UARTs, but the Kconfig.debug file explicitly lists port zero as the one to be used for the console, while not providing any default values. This can get an automated randconfig build stuck in a loop waiting for the user to input the number. As we already know the physical address, this patch provides that number as default, along with a reasonable default value for the virtual address. Cc: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Arnd Bergmann <arnd@arndb.de> --- arch/arm/Kconfig.debug | 2 ++ 1 file changed, 2 insertions(+)