leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sh: Move SuperH PCI driver from cpu/sh4 to drivers/pci

Browse Source 
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Nobuhiro Iwamatsu 2008-03-24 02:11:26 +09:00
parent 5669332781
commit ab8f4d40d0
5 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cpu/sh4/Makefile
View File

@ -29,8 +29,7 @@ include $(TOPDIR)/config.mk
LIB = $(obj)lib$(CPU).a LIB = $(obj)lib$(CPU).a
START = start.o START = start.o
OBJS = cpu.o interrupts.o watchdog.o time.o cache.o \ OBJS = cpu.o interrupts.o watchdog.o time.o cache.o
pci-sh4.o pci-sh7780.o
all: .depend $(START) $(LIB) all: .depend $(START) $(LIB)

2
drivers/pci/Makefile
View File

@ -31,6 +31,8 @@ COBJS-y += pci_auto.o
COBJS-y += pci_indirect.o COBJS-y += pci_indirect.o
COBJS-y += tsi108_pci.o COBJS-y += tsi108_pci.o
COBJS-y += w83c553f.o COBJS-y += w83c553f.o
COBJS-$(CONFIG_SH4_PCI) += pci_sh4.o
COBJS-$(CONFIG_SH7780_PCI) +=pci_sh7780.o
COBJS := $(COBJS-y) COBJS := $(COBJS-y)
SRCS := $(COBJS:.o=.c) SRCS := $(COBJS:.o=.c)

7
cpu/sh4/pci-sh4.c → drivers/pci/pci_sh4.c
View File

@ -1,7 +1,7 @@
/* /*
* SH4 PCI Controller (PCIC) for U-Boot. * SH4 PCI Controller (PCIC) for U-Boot.
* (C) Dustin McIntire (dustin@sensoria.com) * (C) Dustin McIntire (dustin@sensoria.com)
* (C) 2007 Nobuhiro Iwamatsu * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* (C) 2008 Yusuke Goda <goda.yusuke@renesas.com> * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
* *
* u-boot/cpu/sh4/pci-sh4.c * u-boot/cpu/sh4/pci-sh4.c
@ -27,9 +27,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_PCI) && \
defined(CONFIG_SH4_PCI)
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <asm/pci.h> #include <asm/pci.h>
@ -77,5 +74,3 @@ int pci_sh4_init(struct pci_controller *hose)
hose->last_busno = pci_hose_scan(hose); hose->last_busno = pci_hose_scan(hose);
return 0; return 0;
} }
#endif /* defined(CONFIG_PCI) && defined(CONFIG_SH4_PCI) */

6
cpu/sh4/pci-sh7780.c → drivers/pci/pci_sh7780.c
View File

@ -1,7 +1,7 @@
/* /*
* SH7780 PCI Controller (PCIC) for U-Boot. * SH7780 PCI Controller (PCIC) for U-Boot.
* (C) Dustin McIntire (dustin@sensoria.com) * (C) Dustin McIntire (dustin@sensoria.com)
* (C) 2007 Nobuhiro Iwamatsu * (C) 2007,2008 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
* (C) 2008 Yusuke Goda <goda.yusuke@renesas.com> * (C) 2008 Yusuke Goda <goda.yusuke@renesas.com>
* *
* See file CREDITS for list of people who contributed to this * See file CREDITS for list of people who contributed to this
@ -25,9 +25,6 @@
#include <common.h> #include <common.h>
#if defined(CONFIG_PCI) && defined(CONFIG_SH4_PCI) \
&& defined(CONFIG_CPU_SH7780)
#include <asm/processor.h> #include <asm/processor.h>
#include <asm/io.h> #include <asm/io.h>
#include <pci.h> #include <pci.h>
@ -108,4 +105,3 @@ int pci_sh7780_init(struct pci_controller *hose)
pci_sh4_init(hose); pci_sh4_init(hose);
return 0; return 0;
} }
#endif /* defined(CONFIG_PCI) && defined(CONFIG_CPU_SH7780) */

1
include/configs/r7780mp.h
View File

@ -125,6 +125,7 @@
#if defined(CONFIG_CMD_PCI) #if defined(CONFIG_CMD_PCI)
#define CONFIG_PCI #define CONFIG_PCI
#define CONFIG_SH4_PCI #define CONFIG_SH4_PCI
#define CONFIG_SH7780_PCI
#define CONFIG_PCI_PNP #define CONFIG_PCI_PNP
#define CONFIG_PCI_SCAN_SHOW 1 #define CONFIG_PCI_SCAN_SHOW 1
#define __io #define __io