blackfin: Move blackfin serial driver out of blackfin arch folder.
PATCH 1/1 blackfin: Move blackfin serial driver out of blackfin arch folder.
From: Sonic Zhang <[email protected]>
- 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 <[email protected]>
---
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%)arch/blackfin/cpu/Makefile +0 -1
@@ -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)
arch/blackfin/cpu/cpu.c +1 -1
@@ -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;
arch/blackfin/cpu/initcode.c +2 -3
@@ -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>
arch/blackfin/cpu/start.S +1 -2
@@ -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
arch/blackfin/include/asm/serial.h renamed from arch/blackfin/cpu/serial.h +0 -0
arch/blackfin/include/asm/serial1.h renamed from arch/blackfin/cpu/serial1.h +0 -0
arch/blackfin/include/asm/serial4.h renamed from arch/blackfin/cpu/serial4.h +0 -0
drivers/serial/Makefile +1 -0
@@ -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
drivers/serial/serial_bfin.c renamed from arch/blackfin/cpu/serial.c +1 -2
@@ -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 ];
include/configs/bfin_adi_common.h +3 -0
@@ -111,6 +111,9 @@#ifndef CONFIG_BAUDRATE # define CONFIG_BAUDRATE 57600#endif +#ifdef CONFIG_UART_CONSOLE +# define CONFIG_BFIN_SERIAL +#endif /* * Debug Settings
Signature · 1 line
1.7.0.4