blackfin: Move blackfin serial driver out of blackfin arch folder.
- 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>
This commit is contained in:
parent
e9a389a184
commit
9d803fc812
@ -23,7 +23,6 @@ COBJS-y += interrupts.o
|
|||||||
COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
|
COBJS-$(CONFIG_JTAG_CONSOLE) += jtag-console.o
|
||||||
COBJS-y += os_log.o
|
COBJS-y += os_log.o
|
||||||
COBJS-y += reset.o
|
COBJS-y += reset.o
|
||||||
COBJS-y += serial.o
|
|
||||||
COBJS-y += traps.o
|
COBJS-y += traps.o
|
||||||
|
|
||||||
SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
|
SRCS := $(SEXTRA:.o=.S) $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
|
||||||
|
@ -16,9 +16,9 @@
|
|||||||
#include <asm/mach-common/bits/core.h>
|
#include <asm/mach-common/bits/core.h>
|
||||||
#include <asm/mach-common/bits/ebiu.h>
|
#include <asm/mach-common/bits/ebiu.h>
|
||||||
#include <asm/mach-common/bits/trace.h>
|
#include <asm/mach-common/bits/trace.h>
|
||||||
|
#include <asm/serial.h>
|
||||||
|
|
||||||
#include "cpu.h"
|
#include "cpu.h"
|
||||||
#include "serial.h"
|
|
||||||
#include "initcode.h"
|
#include "initcode.h"
|
||||||
|
|
||||||
ulong bfin_poweron_retx;
|
ulong bfin_poweron_retx;
|
||||||
|
@ -16,10 +16,9 @@
|
|||||||
#include <asm/mach-common/bits/watchdog.h>
|
#include <asm/mach-common/bits/watchdog.h>
|
||||||
#include <asm/mach-common/bits/bootrom.h>
|
#include <asm/mach-common/bits/bootrom.h>
|
||||||
#include <asm/mach-common/bits/core.h>
|
#include <asm/mach-common/bits/core.h>
|
||||||
|
#include <asm/serial.h>
|
||||||
|
|
||||||
#define BUG() while (1) { asm volatile("emuexcpt;"); }
|
#define BUG() while (1) asm volatile("emuexcpt;");
|
||||||
|
|
||||||
#include "serial.h"
|
|
||||||
|
|
||||||
#ifndef __ADSPBF60x__
|
#ifndef __ADSPBF60x__
|
||||||
#include <asm/mach-common/bits/ebiu.h>
|
#include <asm/mach-common/bits/ebiu.h>
|
||||||
|
@ -35,8 +35,7 @@
|
|||||||
#include <asm/mach-common/bits/watchdog.h>
|
#include <asm/mach-common/bits/watchdog.h>
|
||||||
#include <asm/mach-common/bits/core.h>
|
#include <asm/mach-common/bits/core.h>
|
||||||
#include <asm/mach-common/bits/pll.h>
|
#include <asm/mach-common/bits/pll.h>
|
||||||
|
#include <asm/serial.h>
|
||||||
#include "serial.h"
|
|
||||||
|
|
||||||
/* It may seem odd that we make calls to functions even though we haven't
|
/* 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
|
* relocated ourselves yet out of {flash,ram,wherever}. This is OK because
|
||||||
|
@ -52,6 +52,7 @@ COBJS-$(CONFIG_XILINX_UARTLITE) += serial_xuartlite.o
|
|||||||
COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
|
COBJS-$(CONFIG_SANDBOX_SERIAL) += sandbox.o
|
||||||
COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
|
COBJS-$(CONFIG_SCIF_CONSOLE) += serial_sh.o
|
||||||
COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o
|
COBJS-$(CONFIG_ZYNQ_SERIAL) += serial_zynq.o
|
||||||
|
COBJS-$(CONFIG_BFIN_SERIAL) += serial_bfin.o
|
||||||
|
|
||||||
ifndef CONFIG_SPL_BUILD
|
ifndef CONFIG_SPL_BUILD
|
||||||
COBJS-$(CONFIG_USB_TTY) += usbtty.o
|
COBJS-$(CONFIG_USB_TTY) += usbtty.o
|
||||||
|
@ -43,13 +43,12 @@
|
|||||||
#include <serial.h>
|
#include <serial.h>
|
||||||
#include <linux/compiler.h>
|
#include <linux/compiler.h>
|
||||||
#include <asm/blackfin.h>
|
#include <asm/blackfin.h>
|
||||||
|
#include <asm/serial.h>
|
||||||
|
|
||||||
DECLARE_GLOBAL_DATA_PTR;
|
DECLARE_GLOBAL_DATA_PTR;
|
||||||
|
|
||||||
#ifdef CONFIG_UART_CONSOLE
|
#ifdef CONFIG_UART_CONSOLE
|
||||||
|
|
||||||
#include "serial.h"
|
|
||||||
|
|
||||||
#ifdef CONFIG_DEBUG_SERIAL
|
#ifdef CONFIG_DEBUG_SERIAL
|
||||||
static uart_lsr_t cached_lsr[256];
|
static uart_lsr_t cached_lsr[256];
|
||||||
static uart_lsr_t cached_rbr[256];
|
static uart_lsr_t cached_rbr[256];
|
@ -111,6 +111,9 @@
|
|||||||
#ifndef CONFIG_BAUDRATE
|
#ifndef CONFIG_BAUDRATE
|
||||||
# define CONFIG_BAUDRATE 57600
|
# define CONFIG_BAUDRATE 57600
|
||||||
#endif
|
#endif
|
||||||
|
#ifdef CONFIG_UART_CONSOLE
|
||||||
|
# define CONFIG_BFIN_SERIAL
|
||||||
|
#endif
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Debug Settings
|
* Debug Settings
|
||||||
|
Loading…
Reference in New Issue
Block a user