* [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 [not found] <20180305170704.17073-1-paul@crapouillou.net> @ 2018-03-28 15:38 ` Paul Cercueil 2018-05-11 21:53 ` James Hogan 0 siblings, 1 reply; 2+ messages in thread From: Paul Cercueil @ 2018-03-28 15:38 UTC (permalink / raw) To: Ralf Baechle, James Hogan; +Cc: linux-mips, linux-kernel, Paul Cercueil The debug definitions were missing for MACH_JZ4770, resulting in a build failure when DEBUG_ZBOOT was set. Since the UART addresses are the same across all Ingenic SoCs, we just use a #ifdef CONFIG_MACH_INGENIC instead of checking for individual Ingenic SoCs. Additionally, I added a #define for the UART0 address in-code and dropped the <asm/mach-jz4740/base.h> include, for the reason that this include file is slowly being phased out as the whole platform is being moved to devicetree. Signed-off-by: Paul Cercueil <paul@crapouillou.net> --- arch/mips/boot/compressed/uart-16550.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/mips/boot/compressed/uart-16550.c b/arch/mips/boot/compressed/uart-16550.c index b3043c08f769..aee8d7b8f091 100644 --- a/arch/mips/boot/compressed/uart-16550.c +++ b/arch/mips/boot/compressed/uart-16550.c @@ -18,9 +18,9 @@ #define PORT(offset) (CKSEG1ADDR(AR7_REGS_UART0) + (4 * offset)) #endif -#if defined(CONFIG_MACH_JZ4740) || defined(CONFIG_MACH_JZ4780) -#include <asm/mach-jz4740/base.h> -#define PORT(offset) (CKSEG1ADDR(JZ4740_UART0_BASE_ADDR) + (4 * offset)) +#ifdef CONFIG_MACH_INGENIC +#define INGENIC_UART0_BASE_ADDR 0x10030000 +#define PORT(offset) (CKSEG1ADDR(INGENIC_UART0_BASE_ADDR) + (4 * offset)) #endif #ifdef CONFIG_CPU_XLR -- 2.11.0 ^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 2018-03-28 15:38 ` [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 Paul Cercueil @ 2018-05-11 21:53 ` James Hogan 0 siblings, 0 replies; 2+ messages in thread From: James Hogan @ 2018-05-11 21:53 UTC (permalink / raw) To: Paul Cercueil; +Cc: Ralf Baechle, linux-mips, linux-kernel [-- Attachment #1: Type: text/plain, Size: 720 bytes --] On Wed, Mar 28, 2018 at 05:38:12PM +0200, Paul Cercueil wrote: > The debug definitions were missing for MACH_JZ4770, resulting in a build > failure when DEBUG_ZBOOT was set. > > Since the UART addresses are the same across all Ingenic SoCs, we just > use a #ifdef CONFIG_MACH_INGENIC instead of checking for individual > Ingenic SoCs. > > Additionally, I added a #define for the UART0 address in-code and dropped > the <asm/mach-jz4740/base.h> include, for the reason that this include > file is slowly being phased out as the whole platform is being moved to > devicetree. > > Signed-off-by: Paul Cercueil <paul@crapouillou.net> Applied for 4.17 with fixes tag and 4.16 stable tag. Thanks James [-- Attachment #2: signature.asc --] [-- Type: application/pgp-signature, Size: 228 bytes --] ^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2018-05-14 6:00 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
[not found] <20180305170704.17073-1-paul@crapouillou.net>
2018-03-28 15:38 ` [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 Paul Cercueil
2018-05-11 21:53 ` James Hogan
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox