Message-Id: <1416235750-4766-1-git-send-email-daniel.thompson@linaro.org>
Date:	Mon, 17 Nov 2014 14:49:01 +0000
From:	Daniel Thompson <daniel.thompson@...aro.org>
To:	Russell King <linux@....linux.org.uk>,
	Arnd Bergmann <arnd@...db.de>
Cc:	Daniel Thompson <daniel.thompson@...aro.org>,
	linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org,
	spear-devel@...t.st.com, Paul Bolle <pebolle@...cali.nl>,
	Srinivas Kandagatla <srinivas.kandagatla@...aro.org>,
	John Stultz <john.stultz@...aro.org>,
	Sumit Semwal <sumit.semwal@...aro.org>, patches@...aro.org,
	linaro-kernel@...ts.linaro.org
Subject: [PATCH v13 0/9] arm: Fix DEBUG_LL for multi-platform kernels (without PL01X)

This patchset removes some single-platform compatibility tricks related
to DEBUG_LL and, as a result, allows multi_v7_defconfig derived builds
to enable DEBUG_LL. Currently the user selected kbuild setting is
ignored and the PL01X's DEBUG_LL stub is silently selected instead. This
is a pain if your hardware doesn't have this cell, not least because it
takes a little time to figure out that kbuild built the wrong code.

Warning:

    silentoldconfig on PL011 single platforms will result in DEBUG_LL
    being directed at ICEDCC rather than PL011. This should only
    affect silentoldconfig since oldconfig prompts and the defconfigs have
    been updated to avoid this problem.

Changes since v12:
- v11 spuriously missed out changes from v10 and v11 (it was incorrectly
  derived from v9). All changes have been reinstated after thorough
  review of the diff between v13 and v11 (many thanks to Aaro Koskinen).
- Merged the changes to 8250 related changes to defconfig files into
  a single patch (Arnd Bergmann).

Changes since v11:
- Fixed sort order of Kconfig symbols (review of Russell King)
- Reviewed all defconfigs for the selection of DEBUG_UART_NONE.  All
  identified have 8250-based UARTs and are switched to DEBUG_LL_UART_8250
  (review of Arnd Bergmann).
- Fixed regression in the netx macros (bad setting of \rp and \rv.
- Rebased on latest mainline (v3.18-rc1). Note that two patches from v11
  were merged upstream and are no longer included here.
- Added a trivial fix to the defaults list for DEBUG_UART_PHYS which came
  to my attention as a merge conflict.

Changes since v10:
- Fixed typos in the omap1 config help texts (review of Aaro Koskinen).

Changes since v9:
- Removed a spuriously introduced (and unused) config variable from
  the netx patch (review of Paul Bolle).
- Fix netx macro to ensure \rv is correctly initialized.
- Rebased on v3.17rc4.

Changes since v8:
- Regenerated patch series with --find-renames to properly track code
  movement.

Changes since v7:
- Killed DEBUG_LL_UART_NONE completely and migrated over the four remaining
  platforms that relied on this (Arnd Bergmann, Russell King). This
  fixes some problems with oldconfig builds.
- Rebased on latest mainline (v3.17rc1).

Changes since v6:
- Removed a patch to limit DEBUG_LL_UART_NONE to platforms that support
  it because it almost time to drop DEBUG_LL_UART_NONE anyway (only
  four platforms still use it).
- Rebased on latest mainline (v3.16rc3).

Changes since v5:

- Shortened the list of platforms that can select DEBUG_LL_UART_NONE
  (changes Arnd Bergmann)
- Rebased on latest mainline (v3.15rc7).

Changes since v4:

- Rebased to latest mainline (and tested again). No functional changes.

Changes since v3:

- Converted from a single patch to a series.
- Tested defconfig builds of all impacted platforms.

Changes since v2:

- Switch from def_bool to bool (thanks Russell King)

Changes since v1:

- Remove pointless single platform support (thanks Arnd Bergmann)

Daniel Thompson (9):
  arm: cnx3xxxx: Remove spurious default for DEBUG_CNS3XXX
  arm: configs: Enable DEBUG_LL_UART_8250 where needed
  arm: Remove DEBUG_LL_UART_NONE
  arm: ks8695: Migrate debug_ll macros to shared directory
  arm: omap1: Migrate debug_ll macros to use 8250.S
  arm: netx: Migrate DEBUG_LL macros to shared directory
  arm: sa1100: Migrate DEBUG_LL macros to shared directory
  arm: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX
  arm: Fix DEBUG_LL for multi-platform kernels (without PL01X)

 arch/arm/Kconfig.debug                             | 140 +++++++++++++++++----
 arch/arm/configs/iop32x_defconfig                  |   1 +
 arch/arm/configs/iop33x_defconfig                  |   1 +
 arch/arm/configs/ixp4xx_defconfig                  |   1 +
 arch/arm/configs/lpc32xx_defconfig                 |   1 +
 arch/arm/configs/mv78xx0_defconfig                 |   1 +
 arch/arm/configs/orion5x_defconfig                 |   1 +
 arch/arm/configs/rpc_defconfig                     |   1 +
 .../mach/debug-macro.S => include/debug/ks8695.S}  |  10 +-
 .../mach/debug-macro.S => include/debug/netx.S}    |  22 ++--
 .../mach/debug-macro.S => include/debug/sa1100.S}  |  41 ++----
 arch/arm/mach-omap1/include/mach/debug-macro.S     | 101 ---------------
 12 files changed, 151 insertions(+), 170 deletions(-)
 rename arch/arm/{mach-ks8695/include/mach/debug-macro.S => include/debug/ks8695.S} (80%)
 rename arch/arm/{mach-netx/include/mach/debug-macro.S => include/debug/netx.S} (62%)
 rename arch/arm/{mach-sa1100/include/mach/debug-macro.S => include/debug/sa1100.S} (39%)
 delete mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S

--
1.9.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists