projects / platform / kernel / linux-starfive.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e8606cd e9670cc)
Merge tag 'renesas-arm-soc-for-v5.4-tag1' of git://git.kernel.org/pub/scm/linux/kerne...
authorArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 21:12:57 +0000 (23:12 +0200)
committerArnd Bergmann <arnd@arndb.de>
Tue, 3 Sep 2019 21:12:58 +0000 (23:12 +0200)
Renesas ARM SoC updates for v5.4

  - Low-level debugging support for RZ/A2M.

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

Link: https://lore.kernel.org/r/20190823123643.18799-3-geert+renesas@glider.be
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
1  2 
arch/arm/Kconfig.debug patch | diff1 | diff2 | blob | history

diff --cc arch/arm/Kconfig.debug
index 96a8a1973fa3938aeda4d842c9ac1730d4ec9ab2,c029961d379595eb4e406fcc62f6932f80ed2396..fe7e9b583e635424ef5d2781d14faaccfab75989
--- 1/arch/arm/Kconfig.debug
--- 2/arch/arm/Kconfig.debug
+++ b/arch/arm/Kconfig.debug
@@@ -1526,9 -1547,13 +1540,11 @@@ config DEBUG_LL_INCLUD
                                 DEBUG_IMX6SX_UART || \
                                 DEBUG_IMX6UL_UART || \
                                 DEBUG_IMX7D_UART
 -      default "debug/ks8695.S" if DEBUG_KS8695_UART
        default "debug/msm.S" if DEBUG_QCOM_UARTDM
 -      default "debug/netx.S" if DEBUG_NETX_UART
        default "debug/omap2plus.S" if DEBUG_OMAP2PLUS_UART
        default "debug/renesas-scif.S" if DEBUG_R7S72100_SCIF2
+       default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF2
+       default "debug/renesas-scif.S" if DEBUG_R7S9210_SCIF4
        default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF0
        default "debug/renesas-scif.S" if DEBUG_RCAR_GEN1_SCIF2
        default "debug/renesas-scif.S" if DEBUG_RCAR_GEN2_SCIF0
@@@ -1686,7 -1717,9 +1703,8 @@@ config DEBUG_UART_PHY
                DEBUG_LL_UART_8250 || DEBUG_LL_UART_PL01X || \
                DEBUG_LL_UART_EFM32 || \
                DEBUG_UART_8250 || DEBUG_UART_PL01X || DEBUG_MESON_UARTAO || \
 -              DEBUG_NETX_UART || \
                DEBUG_QCOM_UARTDM || DEBUG_R7S72100_SCIF2 || \
+               DEBUG_R7S9210_SCIF2 || DEBUG_R7S9210_SCIF4 || \
                DEBUG_RCAR_GEN1_SCIF0 || DEBUG_RCAR_GEN1_SCIF2 || \
                DEBUG_RCAR_GEN2_SCIF0 || DEBUG_RCAR_GEN2_SCIF1 || \
                DEBUG_RCAR_GEN2_SCIF2 || DEBUG_RCAR_GEN2_SCIF4 || \
Domain: System / Kernel;