From patchwork Mon Aug 3 08:21:20 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?G=C3=BCnther_Kelleter?= X-Patchwork-Id: 503050 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id F404E1402DE for ; Mon, 3 Aug 2015 18:31:48 +1000 (AEST) Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 9D2F1280163; Mon, 3 Aug 2015 10:31:03 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00 autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id 1BE622800D4 for ; Mon, 3 Aug 2015 10:30:56 +0200 (CEST) X-policyd-weight: using cached result; rate: -5.5 Received: from mout0.freenet.de (mout0.freenet.de [195.4.92.90]) by arrakis.dune.hu (Postfix) with ESMTPS for ; Mon, 3 Aug 2015 10:30:55 +0200 (CEST) Received: from [195.4.92.140] (helo=mjail0.freenet.de) by mout0.freenet.de with esmtpa (ID gnther.kelleter@freenet.de) (port 25) (Exim 4.85 #1) id 1ZMB9f-0002kG-9o; Mon, 03 Aug 2015 10:31:31 +0200 Received: from localhost ([::1]:34728 helo=mjail0.freenet.de) by mjail0.freenet.de with esmtpa (ID gnther.kelleter@freenet.de) (Exim 4.85 #1) id 1ZMB9f-0003TV-4M; Mon, 03 Aug 2015 10:31:31 +0200 Received: from mx12.freenet.de ([195.4.92.22]:59315) by mjail0.freenet.de with esmtpa (ID gnther.kelleter@freenet.de) (Exim 4.85 #1) id 1ZMB7W-00065r-Mt; Mon, 03 Aug 2015 10:29:18 +0200 Received: from p4fe07fd6.dip0.t-ipconnect.de ([79.224.127.214]:61404 helo=gkelleter.devolo.com) by mx12.freenet.de with esmtpsa (ID gnther.kelleter@freenet.de) (TLSv1.2:DHE-RSA-AES256-GCM-SHA384:256) (port 25) (Exim 4.85 #1) id 1ZMB7W-0000ZD-GS; Mon, 03 Aug 2015 10:29:18 +0200 Received: by gkelleter.devolo.com (Postfix, from userid 1000) id 1AD946137B; Mon, 3 Aug 2015 10:29:18 +0200 (CEST) From: =?UTF-8?q?G=C3=BCnther=20Kelleter?= To: openwrt-devel@lists.openwrt.org Date: Mon, 3 Aug 2015 10:21:20 +0200 Message-Id: <1438590082-2018-2-git-send-email-guenther.kelleter@devolo.de> X-Mailer: git-send-email 2.4.6.89.g851dcf4 In-Reply-To: <1438590082-2018-1-git-send-email-guenther.kelleter@devolo.de> References: <1438590082-2018-1-git-send-email-guenther.kelleter@devolo.de> MIME-Version: 1.0 X-Originated-At: 79.224.127.214!61404 Subject: [OpenWrt-Devel] [PATCH v4 1/3] mcs814x: fix debug UART X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" Switch to new 8250 debug uart code because the old mach-mcs814x/include/mach/debug-macro.S tries to include asm/hardware/debug-8250.S which no longer exists since kernel 3.14 Signed-off-by: Günther Kelleter --- target/linux/mcs814x/config-3.18 | 10 ++++-- .../linux/mcs814x/patches-3.18/014-debuguart.patch | 41 ++++++++++++++++++++++ 2 files changed, 48 insertions(+), 3 deletions(-) create mode 100644 target/linux/mcs814x/patches-3.18/014-debuguart.patch diff --git a/target/linux/mcs814x/config-3.18 b/target/linux/mcs814x/config-3.18 index 87a8382..e57f5ff 100644 --- a/target/linux/mcs814x/config-3.18 +++ b/target/linux/mcs814x/config-3.18 @@ -49,10 +49,15 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y CONFIG_DEBUG_LL=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_DEBUG_LL_INCLUDE="debug/8250.S" CONFIG_DEBUG_LL_UART_NONE=y -# CONFIG_DEBUG_UART_8250 is not set +CONFIG_DEBUG_UART_8250=y +# CONFIG_DEBUG_UART_8250_FLOW_CONTROL is not set +CONFIG_DEBUG_UART_8250_SHIFT=2 +# CONFIG_DEBUG_UART_8250_WORD is not set +CONFIG_DEBUG_UART_PHYS=0x400dc000 # CONFIG_DEBUG_UART_PL01X is not set +CONFIG_DEBUG_UART_VIRT=0xf00dc000 # CONFIG_DEBUG_USER is not set CONFIG_DTC=y CONFIG_EARLY_PRINTK=y @@ -157,7 +162,6 @@ CONFIG_MTD_PHYSMAP=y CONFIG_MULTI_IRQ_HANDLER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_KUSER_HELPERS=y -CONFIG_NEED_MACH_MEMORY_H=y CONFIG_NEED_PER_CPU_KM=y CONFIG_NET_KEY=y # CONFIG_NET_VENDOR_BROADCOM is not set diff --git a/target/linux/mcs814x/patches-3.18/014-debuguart.patch b/target/linux/mcs814x/patches-3.18/014-debuguart.patch new file mode 100644 index 0000000..5f1b67f --- /dev/null +++ b/target/linux/mcs814x/patches-3.18/014-debuguart.patch @@ -0,0 +1,41 @@ +--- a/arch/arm/mach-mcs814x/include/mach/debug-macro.S ++++ /dev/null +@@ -1,11 +0,0 @@ +-#include +- +- .macro addruart, rp, rv, tmp +- ldr \rp, =MCS814X_PHYS_BASE +- ldr \rv, =MCS814X_VIRT_BASE +- orr \rp, \rp, #MCS814X_UART +- orr \rv, \rv, #MCS814X_UART +- .endm +- +-#define UART_SHIFT 2 +-#include +--- a/arch/arm/Kconfig.debug ++++ b/arch/arm/Kconfig.debug +@@ -1089,7 +1089,7 @@ config DEBUG_UART_8250 + (FOOTBRIDGE && !DEBUG_DC21285_PORT) || \ + ARCH_GEMINI || ARCH_IOP13XX || ARCH_IOP32X || \ + ARCH_IOP33X || ARCH_IXP4XX || \ +- ARCH_LPC32XX || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC ++ ARCH_LPC32XX || ARCH_MCS814X || ARCH_MV78XX0 || ARCH_ORION5X || ARCH_RPC + + # Compatibility options for BCM63xx + config DEBUG_UART_BCM63XX +@@ -1124,6 +1124,7 @@ config DEBUG_UART_PHYS + default 0x3e000000 if DEBUG_BCM_KONA_UART + default 0x4000e400 if DEBUG_LL_UART_EFM32 + default 0x40090000 if ARCH_LPC32XX ++ default 0x400dc000 if ARCH_MCS814X + default 0x40100000 if DEBUG_PXA_UART1 + default 0x42000000 if ARCH_GEMINI + default 0x50000000 if DEBUG_S3C24XX_UART && (DEBUG_S3C_UART0 || \ +@@ -1178,6 +1179,7 @@ config DEBUG_UART_VIRT + default 0xe0010fe0 if ARCH_RPC + default 0xe1000000 if DEBUG_MSM_UART + default 0xf0000be0 if ARCH_EBSA110 ++ default 0xf00dc000 if ARCH_MCS814X + default 0xf01fb000 if DEBUG_NOMADIK_UART + default 0xf0201000 if DEBUG_BCM2835 + default 0xf1000300 if DEBUG_BCM_5301X