netarm: move serial driver to drivers/serial

add CONFIG_NETARM_SERIAL to activate the driver

Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
master
Jean-Christophe PLAGNIOL-VILLARD 15 years ago
parent 412ab70588
commit 9ea91c9fef
  1. 2
      cpu/arm720t/Makefile
  2. 1
      drivers/serial/Makefile
  3. 5
      drivers/serial/serial_netarm.c
  4. 1
      include/configs/modnet50.h

@ -26,7 +26,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a
START = start.o
COBJS = serial.o serial_netarm.o interrupts.o cpu.o
COBJS = serial.o interrupts.o cpu.o
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS) $(SOBJS))

@ -35,6 +35,7 @@ COBJS-$(CONFIG_S3C64XX) += s3c64xx.o
COBJS-$(CONFIG_SYS_NS16550_SERIAL) += serial.o
COBJS-$(CONFIG_IXP_SERIAL) += serial_ixp.o
COBJS-$(CONFIG_MAX3100_SERIAL) += serial_max3100.o
COBJS-$(CONFIG_NETARM_SERIAL) += serial_netarm.o
COBJS-$(CONFIG_PL010_SERIAL) += serial_pl01x.o
COBJS-$(CONFIG_PL011_SERIAL) += serial_pl01x.o
COBJS-$(CONFIG_SA1100_SERIAL) += serial_sa1100.o

@ -29,9 +29,6 @@
*/
#include <common.h>
#ifdef CONFIG_NETARM
#include <asm/hardware.h>
DECLARE_GLOBAL_DATA_PTR;
@ -196,5 +193,3 @@ void serial_puts (const char *s)
serial_putc (*s++);
}
}
#endif /* CONFIG_NETARM */

@ -56,6 +56,7 @@
/*
* select serial console configuration
*/
#define CONFIG_NETARM_SERIAL
#define CONFIG_SERIAL1 1 /* we use Serial line 1 */
/* allow to overwrite serial and ethaddr */

Loading…
Cancel
Save