From mboxrd@z Thu Jan 1 00:00:00 1970 From: Julien Grall Subject: Re: [PATCH 3/4] arm/early-printk: move UART base address to Rules.mk Date: Fri, 24 May 2013 13:51:09 +0100 Message-ID: <519F623D.3060309@linaro.org> References: <1369392152-1305-1-git-send-email-andre.przywara@calxeda.com> <1369392152-1305-4-git-send-email-andre.przywara@calxeda.com> <519F5EBC.2070003@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <519F5EBC.2070003@linaro.org> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Andre Przywara Cc: stefano.stabellini@eu.citrix.com, Ian.Campbell@citrix.com, xen-devel@lists.xen.org List-Id: xen-devel@lists.xenproject.org On 05/24/2013 01:36 PM, Julien Grall wrote: > On 05/24/2013 11:42 AM, Andre Przywara wrote: > >> The UART memory mapped base address is currently hardcoded in the >> early-printk UART driver, which denies the driver to be used by >> two machines with a different mapping. >> Move this definition out to xen/arch/arm/Rules.mk, allowing easier >> user access and later sharing of the driver. >> >> Signed-off-by: Andre Przywara > > Reviewed-by: Julien Grall By the way, could you remove the "# TODO handle UART..." in arch/arm/Rules.mk as you have implemented it? Thanks, Julien >> --- >> xen/arch/arm/Rules.mk | 3 +++ >> xen/arch/arm/arm32/debug-exynos4210.inc | 2 -- >> xen/arch/arm/arm32/debug-pl011.inc | 2 -- >> xen/arch/arm/arm64/debug-pl011.inc | 2 -- >> 4 files changed, 3 insertions(+), 6 deletions(-) >> >> diff --git a/xen/arch/arm/Rules.mk b/xen/arch/arm/Rules.mk >> index fdcf73e..37a8271 100644 >> --- a/xen/arch/arm/Rules.mk >> +++ b/xen/arch/arm/Rules.mk >> @@ -46,11 +46,13 @@ ifeq ($(debug),y) >> ifeq ($(CONFIG_EARLY_PRINTK), vexpress) >> EARLY_PRINTK_INC := pl011 >> EARLY_PRINTK_BAUD := 38400 >> +EARLY_UART_BASE_ADDRESS := 0x1c090000 >> endif >> ifeq ($(CONFIG_EARLY_PRINTK), exynos5250) >> EARLY_PRINTK_INC := exynos4210 >> EARLY_PRINTK_INIT_UART := y >> EARLY_PRINTK_BAUD := 115200 >> +EARLY_UART_BASE_ADDRESS := 0x12c20000 >> endif >> >> ifneq ($(EARLY_PRINTK_INC),) >> @@ -61,4 +63,5 @@ CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK >> CFLAGS-$(EARLY_PRINTK_INIT_UART) += -DEARLY_PRINTK_INIT_UART >> CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_INC=\"debug-$(EARLY_PRINTK_INC).inc\" >> CFLAGS-$(EARLY_PRINTK) += -DEARLY_PRINTK_BAUD=$(EARLY_PRINTK_BAUD) >> +CFLAGS-$(EARLY_PRINTK) += -DEARLY_UART_BASE_ADDRESS=$(EARLY_UART_BASE_ADDRESS) >> endif >> diff --git a/xen/arch/arm/arm32/debug-exynos4210.inc b/xen/arch/arm/arm32/debug-exynos4210.inc >> index 4922148..d746c35 100644 >> --- a/xen/arch/arm/arm32/debug-exynos4210.inc >> +++ b/xen/arch/arm/arm32/debug-exynos4210.inc >> @@ -18,8 +18,6 @@ >> >> #include >> >> -#define EARLY_UART_BASE_ADDRESS 0x12c20000 >> - >> /* Exynos 5 UART initialization >> * rb: register which contains the UART base address >> * rc: scratch register 1 >> diff --git a/xen/arch/arm/arm32/debug-pl011.inc b/xen/arch/arm/arm32/debug-pl011.inc >> index 2d970ea..8b085b8 100644 >> --- a/xen/arch/arm/arm32/debug-pl011.inc >> +++ b/xen/arch/arm/arm32/debug-pl011.inc >> @@ -16,8 +16,6 @@ >> * GNU General Public License for more details. >> */ >> >> -#define EARLY_UART_BASE_ADDRESS 0x1c090000 >> - >> /* PL011 UART initialization >> * rb: register which contains the UART base address >> * rc: scratch register 1 >> diff --git a/xen/arch/arm/arm64/debug-pl011.inc b/xen/arch/arm/arm64/debug-pl011.inc >> index 7220940..b416235 100644 >> --- a/xen/arch/arm/arm64/debug-pl011.inc >> +++ b/xen/arch/arm/arm64/debug-pl011.inc >> @@ -18,8 +18,6 @@ >> >> #include >> >> -#define EARLY_UART_BASE_ADDRESS 0x1c090000 >> - >> /* PL011 UART initialization >> * xb: register which containts the UART base address >> * c: scratch register number */ > > > > _______________________________________________ > Xen-devel mailing list > Xen-devel@lists.xen.org > http://lists.xen.org/xen-devel