From: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> To: Arnd Bergmann <arnd-r2nGTMty4D4@public.gmane.org>, Olof Johansson <olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org>, Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>, Rob Herring <rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org> Cc: linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org, linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org, Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>, Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>, Lior Amsalem <alior-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org>, Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org>, Yehuda Yitschak <yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Subject: [RFC PATCH 2/3] ARM: mvebu: restore uncompress.h Date: Tue, 25 Sep 2012 16:46:51 -0600 [thread overview] Message-ID: <1348613212-21897-3-git-send-email-swarren@wwwdotorg.org> (raw) In-Reply-To: <1348613212-21897-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> Now that we have a way to provide uncompress.h in a multi-platform zImage, re-instate mvebu's uncompress.h. This was originally removed as part of commit 387798b "ARM: initial multiplatform support". Note that actually enabling this via DEBUG_LL still entails the restrictions outlined for that option. Cc: Gregory CLEMENT <gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: Thomas Petazzoni <thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> Cc: Lior Amsalem <alior-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Cc: Andrew Lunn <andrew-g2DYL2Zd6BY@public.gmane.org> Cc: Yehuda Yitschak <yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org> --- arch/arm/Kconfig.debug | 3 +- arch/arm/include/debug/mvebu-uncompress.h | 43 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/debug/mvebu-uncompress.h diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0daec3d..af34a43 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -423,8 +423,9 @@ config DEBUG_LL_INCLUDE config UNCOMPRESS_INCLUDE string default "debug/icedcc-uncompress.h" if DEBUG_ICEDCC + default "debug/mvebu-uncompress.h" if DEBUG_MVEBU_UART default "debug/none-uncompress.h" if ARCH_MULTIPLATFORM || \ - DEBUG_HIGHBANK_UART || DEBUG_MVEBU_UART || \ + DEBUG_HIGHBANK_UART || \ DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \ DEBUG_VEXPRESS_UART0_DETECT || DEBUG_VEXPRESS_UART0_CA9 || \ DEBUG_VEXPRESS_UART0_RS1 diff --git a/arch/arm/include/debug/mvebu-uncompress.h b/arch/arm/include/debug/mvebu-uncompress.h new file mode 100644 index 0000000..df3bd6b --- /dev/null +++ b/arch/arm/include/debug/mvebu-uncompress.h @@ -0,0 +1,43 @@ +/* + * Marvell Armada SoC kernel uncompression UART routines + * + * Copyright (C) 2012 Marvell + * + * Lior Amsalem <alior-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 + +#define UART_THR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ + + 0x12000)) +#define UART_LSR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ + + 0x12014)) + +#define LSR_THRE 0x20 + +static void putc(const char c) +{ + int i; + + for (i = 0; i < 0x1000; i++) { + /* Transmit fifo not full? */ + if (*UART_LSR & LSR_THRE) + break; + } + + *UART_THR = c; +} + +static void flush(void) +{ +} + +/* + * nothing to do + */ +#define arch_decomp_setup() +#define arch_decomp_wdog() -- 1.7.0.4
WARNING: multiple messages have this Message-ID (diff)
From: swarren@wwwdotorg.org (Stephen Warren) To: linux-arm-kernel@lists.infradead.org Subject: [RFC PATCH 2/3] ARM: mvebu: restore uncompress.h Date: Tue, 25 Sep 2012 16:46:51 -0600 [thread overview] Message-ID: <1348613212-21897-3-git-send-email-swarren@wwwdotorg.org> (raw) In-Reply-To: <1348613212-21897-1-git-send-email-swarren@wwwdotorg.org> From: Stephen Warren <swarren@nvidia.com> Now that we have a way to provide uncompress.h in a multi-platform zImage, re-instate mvebu's uncompress.h. This was originally removed as part of commit 387798b "ARM: initial multiplatform support". Note that actually enabling this via DEBUG_LL still entails the restrictions outlined for that option. Cc: Gregory CLEMENT <gregory.clement@free-electrons.com> Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Cc: Lior Amsalem <alior@marvell.com> Cc: Andrew Lunn <andrew@lunn.ch> Cc: Yehuda Yitschak <yehuday@marvell.com> Signed-off-by: Stephen Warren <swarren@nvidia.com> --- arch/arm/Kconfig.debug | 3 +- arch/arm/include/debug/mvebu-uncompress.h | 43 +++++++++++++++++++++++++++++ 2 files changed, 45 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/debug/mvebu-uncompress.h diff --git a/arch/arm/Kconfig.debug b/arch/arm/Kconfig.debug index 0daec3d..af34a43 100644 --- a/arch/arm/Kconfig.debug +++ b/arch/arm/Kconfig.debug @@ -423,8 +423,9 @@ config DEBUG_LL_INCLUDE config UNCOMPRESS_INCLUDE string default "debug/icedcc-uncompress.h" if DEBUG_ICEDCC + default "debug/mvebu-uncompress.h" if DEBUG_MVEBU_UART default "debug/none-uncompress.h" if ARCH_MULTIPLATFORM || \ - DEBUG_HIGHBANK_UART || DEBUG_MVEBU_UART || \ + DEBUG_HIGHBANK_UART || \ DEBUG_PICOXCELL_UART || DEBUG_SOCFPGA_UART || \ DEBUG_VEXPRESS_UART0_DETECT || DEBUG_VEXPRESS_UART0_CA9 || \ DEBUG_VEXPRESS_UART0_RS1 diff --git a/arch/arm/include/debug/mvebu-uncompress.h b/arch/arm/include/debug/mvebu-uncompress.h new file mode 100644 index 0000000..df3bd6b --- /dev/null +++ b/arch/arm/include/debug/mvebu-uncompress.h @@ -0,0 +1,43 @@ +/* + * Marvell Armada SoC kernel uncompression UART routines + * + * Copyright (C) 2012 Marvell + * + * Lior Amsalem <alior@marvell.com> + * + * This file is licensed under the terms of the GNU General Public + * License version 2. This program is licensed "as is" without any + * warranty of any kind, whether express or implied. + */ + +#define ARMADA_370_XP_REGS_PHYS_BASE 0xd0000000 + +#define UART_THR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ + + 0x12000)) +#define UART_LSR ((volatile unsigned char *)(ARMADA_370_XP_REGS_PHYS_BASE\ + + 0x12014)) + +#define LSR_THRE 0x20 + +static void putc(const char c) +{ + int i; + + for (i = 0; i < 0x1000; i++) { + /* Transmit fifo not full? */ + if (*UART_LSR & LSR_THRE) + break; + } + + *UART_THR = c; +} + +static void flush(void) +{ +} + +/* + * nothing to do + */ +#define arch_decomp_setup() +#define arch_decomp_wdog() -- 1.7.0.4
next prev parent reply other threads:[~2012-09-25 22:46 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2012-09-25 22:46 [RFC PATCH 0/3] ARM: uncompress.h multi-platform enablement Stephen Warren 2012-09-25 22:46 ` Stephen Warren [not found] ` <1348613212-21897-1-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-09-25 22:46 ` [RFC PATCH 1/3] ARM: move ICEDCC uncompress.h to common location Stephen Warren 2012-09-25 22:46 ` Stephen Warren [not found] ` <1348613212-21897-2-git-send-email-swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-09-26 21:56 ` Domenico Andreoli 2012-09-26 21:56 ` Domenico Andreoli 2012-09-27 5:19 ` Stephen Warren 2012-09-27 5:19 ` Stephen Warren 2012-09-25 22:46 ` Stephen Warren [this message] 2012-09-25 22:46 ` [RFC PATCH 2/3] ARM: mvebu: restore uncompress.h Stephen Warren 2012-09-25 22:46 ` [RFC PATCH 3/3] ARM: tegra: move debug macros to include/debug Stephen Warren 2012-09-25 22:46 ` Stephen Warren 2012-09-26 10:38 ` [RFC PATCH 0/3] ARM: uncompress.h multi-platform enablement Arnd Bergmann 2012-09-26 10:38 ` Arnd Bergmann [not found] ` <201209261038.36223.arnd-r2nGTMty4D4@public.gmane.org> 2012-09-26 10:44 ` Russell King - ARM Linux 2012-09-26 10:44 ` Russell King - ARM Linux [not found] ` <20120926104421.GA7040-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2012-09-26 12:05 ` Arnd Bergmann 2012-09-26 12:05 ` Arnd Bergmann [not found] ` <201209261205.01351.arnd-r2nGTMty4D4@public.gmane.org> 2012-09-26 13:10 ` Domenico Andreoli 2012-09-26 13:10 ` Domenico Andreoli 2012-09-26 13:48 ` Tim Bird 2012-09-26 13:48 ` Tim Bird [not found] ` <506307A0.7010701-mEdOJwZ7QcZBDgjK7y7TUQ@public.gmane.org> 2012-09-26 14:17 ` Arnd Bergmann 2012-09-26 14:17 ` Arnd Bergmann [not found] ` <201209261417.18883.arnd-r2nGTMty4D4@public.gmane.org> 2012-09-26 14:48 ` Tim Bird 2012-09-26 14:48 ` Tim Bird [not found] ` <506315A6.3090300-mEdOJwZ7QcZBDgjK7y7TUQ@public.gmane.org> 2012-09-26 14:49 ` Arnd Bergmann 2012-09-26 14:49 ` Arnd Bergmann [not found] ` <201209261449.48468.arnd-r2nGTMty4D4@public.gmane.org> 2012-09-26 15:10 ` Russell King - ARM Linux 2012-09-26 15:10 ` Russell King - ARM Linux [not found] ` <20120926151023.GC30938-l+eeeJia6m9vn6HldHNs0ANdhmdF6hFW@public.gmane.org> 2012-09-26 15:34 ` Stephen Warren 2012-09-26 15:34 ` Stephen Warren [not found] ` <50632096.7080208-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> 2012-09-28 3:53 ` Nicolas Pitre 2012-09-28 3:53 ` Nicolas Pitre 2012-09-27 5:37 ` Jean-Christophe PLAGNIOL-VILLARD 2012-09-27 5:37 ` Jean-Christophe PLAGNIOL-VILLARD
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1348613212-21897-3-git-send-email-swarren@wwwdotorg.org \ --to=swarren-3lzwwm7+weoh9zmkesr00q@public.gmane.org \ --cc=alior-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ --cc=andrew-g2DYL2Zd6BY@public.gmane.org \ --cc=arnd-r2nGTMty4D4@public.gmane.org \ --cc=gregory.clement-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org \ --cc=linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org \ --cc=linux-tegra-u79uwXL29TY76Z2rM5mHXA@public.gmane.org \ --cc=olof-nZhT3qVonbNeoWH0uzbU5w@public.gmane.org \ --cc=rob.herring-bsGFqQB8/DxBDgjK7y7TUQ@public.gmane.org \ --cc=swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org \ --cc=thomas.petazzoni-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org \ --cc=yehuday-eYqpPyKDWXRBDgjK7y7TUQ@public.gmane.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.