LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
@ 2018-03-05 17:07 Paul Cercueil
  2018-03-28 15:38 ` [PATCH v2] " Paul Cercueil
  0 siblings, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2018-03-05 17:07 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 indifidual
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..dd4e6d622184 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))
+#if 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	[flat|nested] 6+ messages in thread

* [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
  2018-03-05 17:07 [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 Paul Cercueil
@ 2018-03-28 15:38 ` Paul Cercueil
  2018-05-11 21:53   ` James Hogan
  0 siblings, 1 reply; 6+ 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	[flat|nested] 6+ messages in thread

* Re: [PATCH v2] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
  2018-03-28 15:38 ` [PATCH v2] " Paul Cercueil
@ 2018-05-11 21:53   ` James Hogan
  0 siblings, 0 replies; 6+ 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] 6+ messages in thread

* Re: [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
  2018-03-22 10:26 ` James Hogan
@ 2018-03-25 14:38   ` Paul Cercueil
  0 siblings, 0 replies; 6+ messages in thread
From: Paul Cercueil @ 2018-03-25 14:38 UTC (permalink / raw)
  To: James Hogan; +Cc: Ralf Baechle, linux-mips, linux-kernel

Hi,

Le jeu. 22 mars 2018 à 7:26, James Hogan <jhogan@kernel.org> a écrit :
> On Sat, Mar 17, 2018 at 09:11:09PM +0100, Paul Cercueil wrote:
>>  Since the UART addresses are the same across all Ingenic SoCs, we 
>> just
>>  use a #ifdef CONFIG_MACH_INGENIC instead of checking for indifidual
>>  Ingenic SoCs.
> 
> s/indifidual/individual/
> 
>>  --- 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))
>>  +#if CONFIG_MACH_INGENIC
> 
> I think you meant #ifdef there.
> 
> Cheers
> James

Oops. Will fix in V2.

-Paul

^ permalink raw reply	[flat|nested] 6+ messages in thread

* Re: [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
  2018-03-17 20:11 [PATCH] " Paul Cercueil
@ 2018-03-22 10:26 ` James Hogan
  2018-03-25 14:38   ` Paul Cercueil
  0 siblings, 1 reply; 6+ messages in thread
From: James Hogan @ 2018-03-22 10:26 UTC (permalink / raw)
  To: Paul Cercueil; +Cc: Ralf Baechle, linux-mips, linux-kernel

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]

On Sat, Mar 17, 2018 at 09:11:09PM +0100, Paul Cercueil wrote:
> Since the UART addresses are the same across all Ingenic SoCs, we just
> use a #ifdef CONFIG_MACH_INGENIC instead of checking for indifidual
> Ingenic SoCs.

s/indifidual/individual/

> --- 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))
> +#if CONFIG_MACH_INGENIC

I think you meant #ifdef there.

Cheers
James

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

^ permalink raw reply	[flat|nested] 6+ messages in thread

* [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
@ 2018-03-17 20:11 Paul Cercueil
  2018-03-22 10:26 ` James Hogan
  0 siblings, 1 reply; 6+ messages in thread
From: Paul Cercueil @ 2018-03-17 20:11 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 indifidual
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..dd4e6d622184 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))
+#if 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	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2018-05-11 21:53 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-03-05 17:07 [PATCH] MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770 Paul Cercueil
2018-03-28 15:38 ` [PATCH v2] " Paul Cercueil
2018-05-11 21:53   ` James Hogan
2018-03-17 20:11 [PATCH] " Paul Cercueil
2018-03-22 10:26 ` James Hogan
2018-03-25 14:38   ` Paul Cercueil

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).