Patchwork [U-Boot,v6,1/3] Prepare for TI816X : reuse existing code from TI814X

login
register
mail settings
Submitter TENART Antoine
Date July 2, 2013, 10:05 a.m.
Message ID <3465D313FDFB824F9A9C8CD24FA4F6BC0112AAAE@frontmail.adetel.com>
Download mbox | patch
Permalink /patch/256316/
State Accepted
Delegated to: Tom Rini
Headers show

Comments

TENART Antoine - July 2, 2013, 10:05 a.m.
Rename some CONFIG_TI814X to a more generic CONFIG_TI81XX

Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
---
 Makefile                                |    2 +-
 arch/arm/cpu/armv7/Makefile             |    2 +-
 arch/arm/cpu/armv7/omap-common/Makefile |    2 +-
 arch/arm/include/asm/arch-am33xx/cpu.h  |    2 +-
 arch/arm/include/asm/arch-am33xx/omap.h |    2 +-
 drivers/serial/ns16550.c                |    4 ++--
 spl/Makefile                            |    2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)
Tom Rini - July 2, 2013, 8:46 p.m.
On Tue, Jul 02, 2013 at 12:05:58PM +0200, TENART Antoine wrote:

> Rename some CONFIG_TI814X to a more generic CONFIG_TI81XX
> 
> Signed-off-by: Antoine Tenart <atenart@adeneo-embedded.com>
> ---
>  Makefile                                |    2 +-
>  arch/arm/cpu/armv7/Makefile             |    2 +-
>  arch/arm/cpu/armv7/omap-common/Makefile |    2 +-
>  arch/arm/include/asm/arch-am33xx/cpu.h  |    2 +-
>  arch/arm/include/asm/arch-am33xx/omap.h |    2 +-
>  drivers/serial/ns16550.c                |    4 ++--
>  spl/Makefile                            |    2 +-

OK, you had a hunk changing include/configs/ti814x_evm.h as well and
that seems to have been lost.
TENART Antoine - July 3, 2013, 8:23 a.m.
>> ---
>>   Makefile                                |    2 +-
>>   arch/arm/cpu/armv7/Makefile             |    2 +-
>>   arch/arm/cpu/armv7/omap-common/Makefile |    2 +-
>>   arch/arm/include/asm/arch-am33xx/cpu.h  |    2 +-
>>   arch/arm/include/asm/arch-am33xx/omap.h |    2 +-
>>   drivers/serial/ns16550.c                |    4 ++--
>>   spl/Makefile                            |    2 +-
>
> OK, you had a hunk changing include/configs/ti814x_evm.h as well and
> that seems to have been lost.

I do not recall a hunk changing include/configs/ti814x_evm.h.
I re-checked my previous cover letters and didn't find any.
Tom Rini - July 3, 2013, 12:23 p.m.
On Wed, Jul 03, 2013 at 10:23:02AM +0200, TENART Antoine wrote:
> >> ---
> >>   Makefile                                |    2 +-
> >>   arch/arm/cpu/armv7/Makefile             |    2 +-
> >>   arch/arm/cpu/armv7/omap-common/Makefile |    2 +-
> >>   arch/arm/include/asm/arch-am33xx/cpu.h  |    2 +-
> >>   arch/arm/include/asm/arch-am33xx/omap.h |    2 +-
> >>   drivers/serial/ns16550.c                |    4 ++--
> >>   spl/Makefile                            |    2 +-
> >
> > OK, you had a hunk changing include/configs/ti814x_evm.h as well and
> > that seems to have been lost.
> 
> I do not recall a hunk changing include/configs/ti814x_evm.h.
> I re-checked my previous cover letters and didn't find any.

Ah sorry, I mis-recalled how ti814x was setup already.

Patch

diff --git a/Makefile b/Makefile
index ba1c10b..1829565 100644
--- a/Makefile
+++ b/Makefile
@@ -338,7 +338,7 @@  LIBS-y += api/libapi.o
 LIBS-y += post/libpost.o
 LIBS-y += test/libtest.o
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),)
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif
 
diff --git a/arch/arm/cpu/armv7/Makefile b/arch/arm/cpu/armv7/Makefile
index 7a8c2d0..415ace8 100644
--- a/arch/arm/cpu/armv7/Makefile
+++ b/arch/arm/cpu/armv7/Makefile
@@ -32,7 +32,7 @@  COBJS	+= cache_v7.o
 COBJS	+= cpu.o
 COBJS	+= syslib.o
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TEGRA)$(CONFIG_MX6)$(CONFIG_TI81XX),)
 SOBJS	+= lowlevel_init.o
 endif
 
diff --git a/arch/arm/cpu/armv7/omap-common/Makefile b/arch/arm/cpu/armv7/omap-common/Makefile
index c4b9809..20586d3 100644
--- a/arch/arm/cpu/armv7/omap-common/Makefile
+++ b/arch/arm/cpu/armv7/omap-common/Makefile
@@ -37,7 +37,7 @@  COBJS	+= vc.o
 COBJS	+= abb.o
 endif
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),)
 COBJS	+= boot-common.o
 SOBJS	+= lowlevel_init.o
 endif
diff --git a/arch/arm/include/asm/arch-am33xx/cpu.h b/arch/arm/include/asm/arch-am33xx/cpu.h
index 3d3a7c8..13c0667 100644
--- a/arch/arm/include/asm/arch-am33xx/cpu.h
+++ b/arch/arm/include/asm/arch-am33xx/cpu.h
@@ -54,7 +54,7 @@ 
 /* Reset control */
 #ifdef CONFIG_AM33XX
 #define PRM_RSTCTRL			(PRCM_BASE + 0x0F00)
-#elif defined(CONFIG_TI814X)
+#elif defined(CONFIG_TI81XX)
 #define PRM_RSTCTRL			(PRCM_BASE + 0x00A0)
 #endif
 #define PRM_RSTST			(PRM_RSTCTRL + 8)
diff --git a/arch/arm/include/asm/arch-am33xx/omap.h b/arch/arm/include/asm/arch-am33xx/omap.h
index e7576c1..777a456 100644
--- a/arch/arm/include/asm/arch-am33xx/omap.h
+++ b/arch/arm/include/asm/arch-am33xx/omap.h
@@ -32,7 +32,7 @@ 
 #define NON_SECURE_SRAM_START	0x402F0400
 #define NON_SECURE_SRAM_END	0x40310000
 #define SRAM_SCRATCH_SPACE_ADDR	0x4030C000
-#elif defined(CONFIG_TI814X)
+#elif defined(CONFIG_TI81XX)
 #define NON_SECURE_SRAM_START	0x40300000
 #define NON_SECURE_SRAM_END	0x40320000
 #define SRAM_SCRATCH_SPACE_ADDR	0x4031B800
diff --git a/drivers/serial/ns16550.c b/drivers/serial/ns16550.c
index d77c25f..d659eb0 100644
--- a/drivers/serial/ns16550.c
+++ b/drivers/serial/ns16550.c
@@ -57,7 +57,7 @@  void NS16550_init(NS16550_t com_port, int baud_divisor)
 
 	serial_out(CONFIG_SYS_NS16550_IER, &com_port->ier);
 #if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \
-			defined(CONFIG_AM33XX) || defined(CONFIG_TI814X)
+			defined(CONFIG_AM33XX) || defined(CONFIG_TI81XX)
 	serial_out(0x7, &com_port->mdr1);	/* mode select reset TL16C750*/
 #endif
 	serial_out(UART_LCR_BKSE | UART_LCRVAL, &com_port->lcr);
@@ -72,7 +72,7 @@  void NS16550_init(NS16550_t com_port, int baud_divisor)
 	serial_out(UART_LCRVAL, &com_port->lcr);
 #if (defined(CONFIG_OMAP) && !defined(CONFIG_OMAP3_ZOOM2)) || \
 	defined(CONFIG_AM33XX) || defined(CONFIG_SOC_DA8XX) || \
-	defined(CONFIG_TI814X)
+	defined(CONFIG_TI81XX)
 
 	/* /16 is proper to hit 115200 with 48MHz */
 	serial_out(0, &com_port->mdr1);
diff --git a/spl/Makefile b/spl/Makefile
index 01873de..6a91239 100644
--- a/spl/Makefile
+++ b/spl/Makefile
@@ -84,7 +84,7 @@  LIBS-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/libphy.o
 LIBS-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/libusb_musb-new.o
 LIBS-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/libusb_gadget.o
 
-ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI814X),)
+ifneq ($(CONFIG_AM33XX)$(CONFIG_OMAP34XX)$(CONFIG_OMAP44XX)$(CONFIG_OMAP54XX)$(CONFIG_TI81XX),)
 LIBS-y += $(CPUDIR)/omap-common/libomap-common.o
 endif