| Message ID | 1396626102-13991-1-git-send-email-daniel.thompson@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| 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)
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 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 (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 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 (5): ARM: versatile: Enable DEBUG_LL_UART_PL01X ARM: ep93xx: Enable DEBUG_LL_UART_PL01X ARM: Hide 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 | 12 ++++-------- arch/arm/configs/ep93xx_defconfig | 1 + arch/arm/configs/versatile_defconfig | 1 + 3 files changed, 6 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. 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. 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 (4): ARM: versatile: Enable DEBUG_LL_UART_PL01X ARM: ep93xx: Enable DEBUG_LL_UART_PL01X arm: Seperate DEBUG_UART_PHYS from DEBUG_LL on EP93XX arm: Fix DEBUG_LL for multi-platform kernels (without PL01X) arch/arm/Kconfig.debug | 10 +++------- arch/arm/configs/ep93xx_defconfig | 1 + arch/arm/configs/versatile_defconfig | 1 + 3 files changed, 5 insertions(+), 7 deletions(-) -- 1.9.3
On Monday 30 June 2014 12:30:51 Daniel Thompson wrote: > 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. Looks fine to me. Acked-by: Arnd Bergmann <arnd@arndb.de>
On Mon, Jun 30, 2014 at 12:30:51PM +0100, Daniel Thompson wrote: > 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. I don't think this is quite right, because I'm now seeing randconfig finding build errors with this. We can end up with this configuration: CONFIG_DEBUG_LL=y CONFIG_DEBUG_LL_UART_NONE=y # CONFIG_DEBUG_ICEDCC is not set # CONFIG_DEBUG_SEMIHOSTING is not set # CONFIG_DEBUG_LL_UART_8250 is not set # CONFIG_DEBUG_LL_UART_PL01X is not set CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" # CONFIG_DEBUG_UART_8250 is not set which results in: arch/arm/kernel/debug.S:24:33: fatal error: mach/debug-macro.S: No such file or directory make[2]: *** [arch/arm/kernel/debug.o] Error 1 arch/arm/kernel/head.S:27:33: fatal error: mach/debug-macro.S: No such file or directory make[2]: *** [arch/arm/kernel/head.o] Error 1 Full config file: http://www.arm.linux.org.uk/developer/build/file.php?lid=11023
On Sat, Jul 12, 2014 at 11:16:02AM +0100, Russell King - ARM Linux wrote: > On Mon, Jun 30, 2014 at 12:30:51PM +0100, Daniel Thompson wrote: > > 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. > > I don't think this is quite right, because I'm now seeing randconfig > finding build errors with this. We can end up with this configuration: > > CONFIG_DEBUG_LL=y > CONFIG_DEBUG_LL_UART_NONE=y > # CONFIG_DEBUG_ICEDCC is not set > # CONFIG_DEBUG_SEMIHOSTING is not set > # CONFIG_DEBUG_LL_UART_8250 is not set > # CONFIG_DEBUG_LL_UART_PL01X is not set > CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" > # CONFIG_DEBUG_UART_8250 is not set > > which results in: > > arch/arm/kernel/debug.S:24:33: fatal error: mach/debug-macro.S: No such file or directory > make[2]: *** [arch/arm/kernel/debug.o] Error 1 > arch/arm/kernel/head.S:27:33: fatal error: mach/debug-macro.S: No such file or directory > make[2]: *** [arch/arm/kernel/head.o] Error 1 > > Full config file: > http://www.arm.linux.org.uk/developer/build/file.php?lid=11023 Note that this also breaks building versatile as an oldconfig. I'll drop the patch series from my tree for the time being.
On 12/07/14 12:10, Russell King - ARM Linux wrote: > On Sat, Jul 12, 2014 at 11:16:02AM +0100, Russell King - ARM Linux wrote: >> On Mon, Jun 30, 2014 at 12:30:51PM +0100, Daniel Thompson wrote: >>> 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. >> >> I don't think this is quite right, because I'm now seeing randconfig >> finding build errors with this. We can end up with this configuration: >> >> CONFIG_DEBUG_LL=y >> CONFIG_DEBUG_LL_UART_NONE=y >> # CONFIG_DEBUG_ICEDCC is not set >> # CONFIG_DEBUG_SEMIHOSTING is not set >> # CONFIG_DEBUG_LL_UART_8250 is not set >> # CONFIG_DEBUG_LL_UART_PL01X is not set >> CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" >> # CONFIG_DEBUG_UART_8250 is not set >> >> which results in: >> >> arch/arm/kernel/debug.S:24:33: fatal error: mach/debug-macro.S: No such file or directory >> make[2]: *** [arch/arm/kernel/debug.o] Error 1 >> arch/arm/kernel/head.S:27:33: fatal error: mach/debug-macro.S: No such file or directory >> make[2]: *** [arch/arm/kernel/head.o] Error 1 >> Full config file: >> http://www.arm.linux.org.uk/developer/build/file.php?lid=11023 Thanks. I will look at this. Problem is that by making the build system honour the user choice we end up breaking the build when the user makes a bad choice (albeit a bad choice that they should not have been given in the first place). I guess the best fix is to get rid of CONFIG_DEBUG_LL_UART_NONE altogether. > Note that this also breaks building versatile as an oldconfig. I'll drop > the patch series from my tree for the time being. There is a difficult problem with oldconfig. Today DEBUG_LL only works on versatile defconfigs (and oldconfig upgrades from there) because although CONFIG_DEBUG_LL_UART_NONE is selected the build system does not honour this and behaves as though the use selected CONFIG_DEBUG_LL_UART_PL01X instead. Unfortunately if we fix this and remove CONFIG_DEBUG_LL_UART_NONE as proposed above then the oldconfig will silently select CONFIG_DEBUG_SEMIHOSTING. In other words I will be able to offer a patch so that oldconfig *compiles* but I don't know how to get it to preserve behaviour (or whether this matters). Hints about what to do would be very welcome. Daniel.
On 14/07/14 10:05, Daniel Thompson wrote: > On 12/07/14 12:10, Russell King - ARM Linux wrote: >> On Sat, Jul 12, 2014 at 11:16:02AM +0100, Russell King - ARM Linux wrote: >>> On Mon, Jun 30, 2014 at 12:30:51PM +0100, Daniel Thompson wrote: >>>> 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. >>> >>> I don't think this is quite right, because I'm now seeing randconfig >>> finding build errors with this. We can end up with this configuration: >>> >>> CONFIG_DEBUG_LL=y >>> CONFIG_DEBUG_LL_UART_NONE=y >>> # CONFIG_DEBUG_ICEDCC is not set >>> # CONFIG_DEBUG_SEMIHOSTING is not set >>> # CONFIG_DEBUG_LL_UART_8250 is not set >>> # CONFIG_DEBUG_LL_UART_PL01X is not set >>> CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" >>> # CONFIG_DEBUG_UART_8250 is not set >>> >>> which results in: >>> >>> arch/arm/kernel/debug.S:24:33: fatal error: mach/debug-macro.S: No such file or directory >>> make[2]: *** [arch/arm/kernel/debug.o] Error 1 >>> arch/arm/kernel/head.S:27:33: fatal error: mach/debug-macro.S: No such file or directory >>> make[2]: *** [arch/arm/kernel/head.o] Error 1 >>> Full config file: >>> http://www.arm.linux.org.uk/developer/build/file.php?lid=11023 > > Thanks. I will look at this. > > Problem is that by making the build system honour the user choice we end > up breaking the build when the user makes a bad choice (albeit a bad > choice that they should not have been given in the first place). > > I guess the best fix is to get rid of CONFIG_DEBUG_LL_UART_NONE altogether. > > >> Note that this also breaks building versatile as an oldconfig. I'll drop >> the patch series from my tree for the time being. > > There is a difficult problem with oldconfig. > > Today DEBUG_LL only works on versatile defconfigs (and oldconfig > upgrades from there) because although CONFIG_DEBUG_LL_UART_NONE is > selected the build system does not honour this and behaves as though the > use selected CONFIG_DEBUG_LL_UART_PL01X instead. > > Unfortunately if we fix this and remove CONFIG_DEBUG_LL_UART_NONE as > proposed above then the oldconfig will silently select > CONFIG_DEBUG_SEMIHOSTING. > > In other words I will be able to offer a patch so that oldconfig > *compiles* but I don't know how to get it to preserve behaviour (or > whether this matters). > > Hints about what to do would be very welcome. Russell, Out of interest, would you accept the much less ambitious older version of this patch for the upcoming merge window: http://thread.gmane.org/gmane.linux.kernel/1678055 The version linked above solves the problems for multi-platform kernel users (which were caused by SPEARr being enabled in the default multi-platform builds) but doesn't seek to fix things like ICEDCC and semihosting for the remaining single platform kernels. 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. 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 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: versatile: Enable DEBUG_LL_UART_PL01X
arm: ep93xx: Enable DEBUG_LL_UART_PL01X
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 | 138 ++++++++++++++++++++----
arch/arm/configs/ep93xx_defconfig | 1 +
arch/arm/configs/versatile_defconfig | 1 +
arch/arm/include/debug/ks8695.S | 40 +++++++
arch/arm/include/debug/netx.S | 36 +++++++
arch/arm/include/debug/sa1100.S | 37 +++++++
arch/arm/mach-ks8695/include/mach/debug-macro.S | 36 -------
arch/arm/mach-netx/include/mach/debug-macro.S | 36 -------
arch/arm/mach-omap1/include/mach/debug-macro.S | 101 -----------------
arch/arm/mach-sa1100/include/mach/debug-macro.S | 62 -----------
10 files changed, 233 insertions(+), 255 deletions(-)
create mode 100644 arch/arm/include/debug/ks8695.S
create mode 100644 arch/arm/include/debug/netx.S
create mode 100644 arch/arm/include/debug/sa1100.S
delete mode 100644 arch/arm/mach-ks8695/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-netx/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-sa1100/include/mach/debug-macro.S
--
1.9.3
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 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: versatile: Enable DEBUG_LL_UART_PL01X
arm: ep93xx: Enable DEBUG_LL_UART_PL01X
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 | 138 ++++++++++++++++++---
arch/arm/configs/ep93xx_defconfig | 1 +
arch/arm/configs/versatile_defconfig | 1 +
.../mach/debug-macro.S => include/debug/ks8695.S} | 10 +-
.../mach/debug-macro.S => include/debug/netx.S} | 22 ++--
arch/arm/include/debug/sa1100.S | 37 ++++++
arch/arm/mach-omap1/include/mach/debug-macro.S | 101 ---------------
arch/arm/mach-sa1100/include/mach/debug-macro.S | 62 ---------
8 files changed, 175 insertions(+), 197 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%)
create mode 100644 arch/arm/include/debug/sa1100.S
delete mode 100644 arch/arm/mach-omap1/include/mach/debug-macro.S
delete mode 100644 arch/arm/mach-sa1100/include/mach/debug-macro.S
--
1.9.3
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(-)