Commit efb59c94 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'renesas-arm-soc-for-v5.8-tag2' of... 

Merge tag 'renesas-arm-soc-for-v5.8-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/soc

Renesas ARM SoC updates for v5.8 (take two)

  - Add debug-ll support for RZ/G1H.

* tag 'renesas-arm-soc-for-v5.8-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel:
  ARM: debug-ll: Add support for r8a7742

Link: https://lore.kernel.org/r/20200515100547.14671-4-geert+renesas@glider.be


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a875e0e5 96866b1a

arch/arm/Kconfig.debug

+10 −0
Original line number Diff line number Diff line
@@ -976,6 +976,13 @@ choice 
		  Say Y here if you want kernel low-level debugging support

		  via SCIF4 on Renesas RZ/G1E (R8A7745).



	config DEBUG_RCAR_GEN2_SCIFA2

		bool "Kernel low-level debugging messages via SCIFA2 on R8A7742"

		depends on ARCH_R8A7742

		help

		  Say Y here if you want kernel low-level debugging support

		  via SCIFA2 on Renesas RZ/G1H (R8A7742).



	config DEBUG_RMOBILE_SCIFA0

		bool "Kernel low-level debugging messages via SCIFA0 on R8A73A4"

		depends on ARCH_R8A73A4
@@ -1577,6 +1584,7 @@ config DEBUG_LL_INCLUDE 
	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF1

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF2

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF4

	default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIFA2

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA0

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA1

	default "debug/renesas-scif.S" if DEBUG_RMOBILE_SCIFA4
@@ -1696,6 +1704,7 @@ config DEBUG_UART_PHYS 
	default 0xe4007000 if DEBUG_HIP04_UART

	default 0xe6c40000 if DEBUG_RMOBILE_SCIFA0

	default 0xe6c50000 if DEBUG_RMOBILE_SCIFA1

	default 0xe6c60000 if DEBUG_RCAR_GEN2_SCIFA2

	default 0xe6c80000 if DEBUG_RMOBILE_SCIFA4

	default 0xe6e58000 if DEBUG_RCAR_GEN2_SCIF2

	default 0xe6e60000 if DEBUG_RCAR_GEN2_SCIF0
@@ -1737,6 +1746,7 @@ config DEBUG_UART_PHYS 
		DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \

		DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \

		DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \

		DEBUG_RCAR_GEN2_SCIFA2 || \

		DEBUG_RMOBILE_SCIFA0 || DEBUG_RMOBILE_SCIFA1 || \

		DEBUG_RMOBILE_SCIFA4 || DEBUG_S3C24XX_UART || \

		DEBUG_S3C64XX_UART || \