mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-03-18 21:21:37 +00:00
[MIPS] cpu/mips/Makefile: Split [CS]OBJS onto separate lines
Also get rid of some #ifdefs in *.c files. Signed-off-by: Shinya Kuribayashi <skuribay@ruby.dti.ne.jp>
This commit is contained in:
parent
8bde63eb3f
commit
79b51ff820
5 changed files with 10 additions and 18 deletions
|
@ -25,13 +25,16 @@ include $(TOPDIR)/config.mk
|
||||||
|
|
||||||
LIB = $(obj)lib$(CPU).a
|
LIB = $(obj)lib$(CPU).a
|
||||||
|
|
||||||
START = start.o
|
SOBJS-y = cache.o
|
||||||
COBJS = asc_serial.o au1x00_serial.o au1x00_eth.o au1x00_usb_ohci.o \
|
COBJS-y = cpu.o interrupts.o
|
||||||
cpu.o interrupts.o incaip_clock.o
|
|
||||||
SOBJS = incaip_wdt.o cache.o
|
|
||||||
|
|
||||||
SRCS := $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
|
SOBJS-$(CONFIG_INCA_IP) += incaip_wdt.o
|
||||||
OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS))
|
COBJS-$(CONFIG_INCA_IP) += asc_serial.o incaip_clock.o
|
||||||
|
COBJS-$(CONFIG_PURPLE) += asc_serial.o
|
||||||
|
COBJS-$(CONFIG_SOC_AU1X00) += au1x00_eth.o au1x00_serial.o au1x00_usb_ohci.o
|
||||||
|
|
||||||
|
SRCS := $(START:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
|
||||||
|
OBJS := $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
|
||||||
START := $(addprefix $(obj),$(START))
|
START := $(addprefix $(obj),$(START))
|
||||||
|
|
||||||
all: $(obj).depend $(START) $(LIB)
|
all: $(obj).depend $(START) $(LIB)
|
||||||
|
|
|
@ -4,8 +4,6 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#if defined(CONFIG_PURPLE) || defined(CONFIG_INCA_IP)
|
|
||||||
|
|
||||||
#ifdef CONFIG_PURPLE
|
#ifdef CONFIG_PURPLE
|
||||||
#define serial_init asc_serial_init
|
#define serial_init asc_serial_init
|
||||||
#define serial_putc asc_serial_putc
|
#define serial_putc asc_serial_putc
|
||||||
|
@ -368,4 +366,3 @@ int serial_tstc (void)
|
||||||
|
|
||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_PURPLE || CONFIG_INCA_IP */
|
|
||||||
|
|
|
@ -23,8 +23,6 @@
|
||||||
*/
|
*/
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#ifdef CONFIG_SOC_AU1X00
|
|
||||||
|
|
||||||
#if defined(CFG_DISCOVER_PHY)
|
#if defined(CFG_DISCOVER_PHY)
|
||||||
#error "PHY not supported yet"
|
#error "PHY not supported yet"
|
||||||
/* We just assume that we are running 100FD for now */
|
/* We just assume that we are running 100FD for now */
|
||||||
|
@ -307,5 +305,3 @@ int au1x00_enet_initialize(bd_t *bis){
|
||||||
|
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif /* CONFIG_SOC_AU1X00 */
|
|
||||||
|
|
|
@ -26,9 +26,6 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#ifdef CONFIG_SOC_AU1X00
|
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
#include <asm/au1x00.h>
|
#include <asm/au1x00.h>
|
||||||
|
|
||||||
|
@ -132,4 +129,3 @@ int serial_tstc (void)
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
#endif /* CONFIG_SOC_AU1X00 */
|
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
|
|
||||||
#include <config.h>
|
#include <config.h>
|
||||||
|
|
||||||
#if defined(CONFIG_SOC_AU1X00) && defined(CONFIG_USB_OHCI)
|
#ifdef CONFIG_USB_OHCI
|
||||||
|
|
||||||
/* #include <pci.h> no PCI on the AU1x00 */
|
/* #include <pci.h> no PCI on the AU1x00 */
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue