Patchwork [U-Boot,v1] blackfin: Move blackfin serial driver out of blackfin arch folder.

login
register
mail settings
Submitter Sonic Zhang
Date April 7, 2013, 11:13 a.m.
Message ID <1365333210-7201-1-git-send-email-sonic.adi@gmail.com>
Download mbox | patch
Permalink /patch/234478/
State Accepted
Delegated to: Sonic Zhang
Headers show

Comments

Sonic Zhang - April 7, 2013, 11:13 a.m.
From: Sonic Zhang <sonic.zhang@analog.com>

- Move blackfin serial driver to the generic driver folder.
- Move blackfin serial headers to blackfin arch head folder.
- Update the include path to blackfin serial header in start up code.

Signed-off-by: Sonic Zhang <sonic.zhang@analog.com>
---
 arch/blackfin/cpu/Makefile                         |    1 -
 arch/blackfin/cpu/cpu.c                            |    2 +-
 arch/blackfin/cpu/initcode.c                       |    5 ++---
 arch/blackfin/cpu/start.S                          |    3 +--
 arch/blackfin/{cpu => include/asm}/serial.h        |    0
 arch/blackfin/{cpu => include/asm}/serial1.h       |    0
 arch/blackfin/{cpu => include/asm}/serial4.h       |    0
 drivers/serial/Makefile                            |    1 +
 .../cpu/serial.c => drivers/serial/serial_bfin.c   |    3 +--
 include/configs/bfin_adi_common.h                  |    3 +++
 10 files changed, 9 insertions(+), 9 deletions(-)
 rename arch/blackfin/{cpu => include/asm}/serial.h (100%)
 rename arch/blackfin/{cpu => include/asm}/serial1.h (100%)
 rename arch/blackfin/{cpu => include/asm}/serial4.h (100%)
 rename arch/blackfin/cpu/serial.c => drivers/serial/serial_bfin.c (99%)

Patch

diff --git a/arch/blackfin/cpu/Makefile b/arch/blackfin/cpu/Makefile
index 145f63e..929fc8b 100644
--- a/arch/blackfin/cpu/Makefile
+++ b/arch/blackfin/cpu/Makefile
@@ -23,7 +23,6 @@  COBJS-y  += interrupts.o
 COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
 COBJS-y  += os_log.o
 COBJS-y  += reset.o
-COBJS-y  += serial.o
 COBJS-y  += traps.o
 
 SRCS     := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
diff --git a/arch/blackfin/cpu/cpu.c b/arch/blackfin/cpu/cpu.c
index d841f64..218f57e 100644
--- a/arch/blackfin/cpu/cpu.c
+++ b/arch/blackfin/cpu/cpu.c
@@ -16,9 +16,9 @@ 
 #include <asm/mach-common/bits/core.h>
 #include <asm/mach-common/bits/ebiu.h>
 #include <asm/mach-common/bits/trace.h>
+#include <asm/serial.h>
 
 #include "cpu.h"
-#include "serial.h"
 #include "initcode.h"
 
 ulong bfin_poweron_retx;
diff --git a/arch/blackfin/cpu/initcode.c b/arch/blackfin/cpu/initcode.c
index 8ef0b92..8147943 100644
--- a/arch/blackfin/cpu/initcode.c
+++ b/arch/blackfin/cpu/initcode.c
@@ -15,10 +15,9 @@ 
 #include <asm/blackfin.h>
 #include <asm/mach-common/bits/bootrom.h>
 #include <asm/mach-common/bits/core.h>
+#include <asm/serial.h>
 
-#define BUG() while (1) { asm volatile("emuexcpt;"); }
-
-#include "serial.h"
+#define BUG() while (1) asm volatile("emuexcpt;");
 
 #ifndef __ADSPBF60x__
 #include <asm/mach-common/bits/ebiu.h>
diff --git a/arch/blackfin/cpu/start.S b/arch/blackfin/cpu/start.S
index 32b3ec7..63bffb4 100644
--- a/arch/blackfin/cpu/start.S
+++ b/arch/blackfin/cpu/start.S
@@ -34,8 +34,7 @@ 
 #include <asm/blackfin.h>
 #include <asm/mach-common/bits/core.h>
 #include <asm/mach-common/bits/pll.h>
-
-#include "serial.h"
+#include <asm/serial.h>
 
 /* It may seem odd that we make calls to functions even though we haven't
  * relocated ourselves yet out of {flash,ram,wherever}.  This is OK because
diff --git a/arch/blackfin/cpu/serial.h b/arch/blackfin/include/asm/serial.h
similarity index 100%
rename from arch/blackfin/cpu/serial.h
rename to arch/blackfin/include/asm/serial.h
diff --git a/arch/blackfin/cpu/serial1.h b/arch/blackfin/include/asm/serial1.h
similarity index 100%
rename from arch/blackfin/cpu/serial1.h
rename to arch/blackfin/include/asm/serial1.h
diff --git a/arch/blackfin/cpu/serial4.h b/arch/blackfin/include/asm/serial4.h
similarity index 100%
rename from arch/blackfin/cpu/serial4.h
rename to arch/blackfin/include/asm/serial4.h
diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile
index 5e8b648..f56fcd9 100644
--- a/drivers/serial/Makefile
+++ b/drivers/serial/Makefile
@@ -54,6 +54,7 @@  COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
 COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
 COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
 COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o
+COBJS-$(CONFIG_BFIN_SERIAL) += serial_bfin.o
 
 ifndef CONFIG_SPL_BUILD
 COBJS-$(CONFIG_USB_TTY) += usbtty.o
diff --git a/arch/blackfin/cpu/serial.c b/drivers/serial/serial_bfin.c
similarity index 99%
rename from arch/blackfin/cpu/serial.c
rename to drivers/serial/serial_bfin.c
index c453a03..0443b84 100644
--- a/arch/blackfin/cpu/serial.c
+++ b/drivers/serial/serial_bfin.c
@@ -43,13 +43,12 @@ 
 #include <serial.h>
 #include <linux/compiler.h>
 #include <asm/blackfin.h>
+#include <asm/serial.h>
 
 DECLARE_GLOBAL_DATA_PTR;
 
 #ifdef CONFIG_UART_CONSOLE
 
-#include "serial.h"
-
 #ifdef CONFIG_DEBUG_SERIAL
 static uart_lsr_t cached_lsr[256];
 static uart_lsr_t cached_rbr[256];
diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h
index 0bcccf8..c751dd7 100644
--- a/include/configs/bfin_adi_common.h
+++ b/include/configs/bfin_adi_common.h
@@ -111,6 +111,9 @@ 
 #ifndef CONFIG_BAUDRATE
 # define CONFIG_BAUDRATE	57600
 #endif
+#ifdef CONFIG_UART_CONSOLE
+# define CONFIG_BFIN_SERIAL
+#endif
 
 /*
  * Debug Settings