[linux] 01/01: Resolve the two apparent conflicts between kirkwood and orion5x configs

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch benh/armel-marvell-flavour
in repository linux.

commit 91bd514be8d9d4e4da7fde4901c2e9b43d59bf3c
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Jan 27 03:46:30 2016 +0000

    Resolve the two apparent conflicts between kirkwood and orion5x configs
    
    - CONFIG_VFP was disabled for kirkwood, but it has a Sheeva core that
      supports VFP.  CONFIG_FPE_NWFPE had no effect since we disabled
      CONFIG_OABI_COMPAT.
    - After some research I found a low-level UART configuration that
      should work for both of them.
---
 debian/config/armel/config.marvell | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/config/armel/config.marvell b/debian/config/armel/config.marvell
index 7248e67..b7ec73f 100644
--- a/debian/config/armel/config.marvell
+++ b/debian/config/armel/config.marvell
@@ -13,17 +13,22 @@ CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_CMDLINE=""
 # CONFIG_XIP_KERNEL is not set
 CONFIG_ATAGS_PROC=y
-#. kirkwood had CONFIG_FPE_NWFPE=y here
 CONFIG_VFP=y
 
 ##
 ## file: arch/arm/Kconfig.debug
 ##
-#. orion5x had CONFIG_DEBUG_LL_UART_8250=y here
 ## choice: Kernel low-level debugging port
-CONFIG_DEBUG_MVEBU_UART0_ALTERNATE=y
+CONFIG_DEBUG_LL_UART_8250=y
 # CONFIG_DEBUG_ICEDCC is not set
 ## end choice
+#. Kirkwood (with new boot loader) and Orion both have an 8250 at
+#. physical address 0xf1012000.
+CONFIG_DEBUG_UART_PHYS=0xf1012000
+#. MVEBU is flexible about the virtual address (relying on
+#. debug_ll_io_init()) but Orion maps the 8250 as part of a larger
+#. block of registers.  So use the VA that Orion requires.
+CONFIG_DEBUG_UART_VIRT=0xfe012000
 
 ##
 ## file: arch/arm/mach-imx/Kconfig

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git