| Message ID | 1396626102-13991-1-git-send-email-daniel.thompson@linaro.org |
|---|---|
| State | New |
| Headers | show |
On 04/04/14 16:41, Daniel Thompson wrote: > diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug > index 0531da8..7e19c94 100644 > --- a/arch/arm/Kconfig.debug > +++ b/arch/arm/Kconfig.debug > @@ -989,12 +989,7 @@ config DEBUG_LL_INCLUDE > > # Compatibility options for PL01x > config DEBUG_UART_PL01X > - def_bool ARCH_EP93XX || \ > - ARCH_INTEGRATOR || \ > - ARCH_SPEAR3XX || \ > - ARCH_SPEAR6XX || \ > - ARCH_SPEAR13XX || \ > - ARCH_VERSATILE > + bool NACK! Sorry. I've got my posting-a-patch and my testing in the wrong order! This patch regresses the build for (at least) the versatile. Expect v4 in due course (after I have improved my build automation). Daniel.
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 without forcing the selection of the PL01X implementation. - Tidy a couple of existing defconfig's so they continue to issue DEBUG_LL messages to PL01X when subsequent changes come along. - Limit DEBUG_LL_UART_NONE to platforms that support it - Fix a potential build problem on EP93XX - Get rid of the compatibility code that causes us to forcibly enable DEBUG_UART_PL01X 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 (5): ARM: versatile: Enable DEBUG_LL_UART_PL01X ARM: ep93xx: Enable DEBUG_LL_UART_PL01X ARM: Conceal DEBUG_LL_UART_NONE from unsupported platforms arm: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) arch/arm/Kconfig.debug | 23 +++++++++++++++-------- arch/arm/configs/ep93xx_defconfig | 1 + arch/arm/configs/versatile_defconfig | 1 + 3 files changed, 17 insertions(+), 8 deletions(-)
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 without forcibly selecting of the PL01X's DEBUG_LL implementation (which doesn't work on some platforms). - Tidy a couple of existing defconfig's so they continue to issue DEBUG_LL messages to PL01X when the subsequent changes come along. - Limit DEBUG_LL_UART_NONE to platforms that support it - Fix a potential build problem on EP93XX - Get rid of the compatibility code that causes us to forcibly enable DEBUG_UART_PL01X Daniel Thompson (5): ARM: versatile: Enable DEBUG_LL_UART_PL01X ARM: ep93xx: Enable DEBUG_LL_UART_PL01X ARM: Conceal DEBUG_LL_UART_NONE from unsupported platforms arm: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) arch/arm/Kconfig.debug | 23 +++++++++++++++-------- arch/arm/configs/ep93xx_defconfig | 1 + arch/arm/configs/versatile_defconfig | 1 + 3 files changed, 17 insertions(+), 8 deletions(-) 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)
diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0531da8..7e19c94 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -989,12 +989,7 @@ config DEBUG_LL_INCLUDE # Compatibility options for PL01x config DEBUG_UART_PL01X - def_bool ARCH_EP93XX || \ - ARCH_INTEGRATOR || \ - ARCH_SPEAR3XX || \ - ARCH_SPEAR6XX || \ - ARCH_SPEAR13XX || \ - ARCH_VERSATILE + bool # Compatibility options for 8250 config DEBUG_UART_8250
When building a multi_v7_defconfig kernel it is not possible to configure DEBUG_LL to use any serial device except a ARM Primecell PL01X, or more accurately and worse, it is possible to configure a different serial device but KConfig does not honour this request. In fact this also overrides the user selection for some of the single platform kernels, for example I don't think DEBUG_LL can be targetted at ICE or semihosted supervisor for ARCH_VERSATILE. This happens because DEBUG_UART_PL01X is automatically enabled by some architectures and this means user decisions made regarding the DEBUG_LL backend will be overriden. Problem is fixed by removing the automatic enabling of this option. Signed-off-by: Daniel Thompson <daniel.thompson@linaro.org> --- Notes: v3: Switch from def_bool to bool (thanks Russell King) v2: Remove pointless single platform support (thanks Arnd Bergmann) arch/arm/Kconfig.debug | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-)