minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

FSL: Clean up board/freescale/common/Makefile

Browse Source 
Each file that can be built here now follows some
CONFIG_ option so that they are appropriately built
or not, as needed.  And CONFIG_ defines were added
to various board config files to make sure that happens.

The other board/freescale/*/Makefiles no longer need
to reach up and over into ../common to build their
individually needed files any more.

Boards that are CDS specific were renamed with cds_ prefix.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2008-03-19 15:02:07 -05:00 committed by Andrew Fleming-AFLEMING
parent a5af4b358a
commit 25eedb2c19
12 changed files with 43 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
board/freescale/common/Makefile
View File

@ -29,10 +29,18 @@ endif
LIB = $(obj)lib$(VENDOR).a LIB = $(obj)lib$(VENDOR).a
COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o COBJS-${CONFIG_FSL_CADMUS} += cadmus.o
COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o COBJS-${CONFIG_FSL_CDS_EEPROM} += cds_eeprom.o
COBJS-${CONFIG_FSL_VIA} += cds_via.o
COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o
COBJS-${CONFIG_FSL_PIXIS} += pixis.o COBJS-${CONFIG_FSL_PIXIS} += pixis.o
COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o
COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o
COBJS-${CONFIG_MPC8541CDS} += cds_pci_ft.o
COBJS-${CONFIG_MPC8548CDS} += cds_pci_ft.o
COBJS-${CONFIG_MPC8555CDS} += cds_pci_ft.o
SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS-y)) OBJS := $(addprefix $(obj),$(COBJS-y))

0
board/freescale/common/eeprom.c → board/freescale/common/cds_eeprom.c
View File

0
board/freescale/common/ft_board.c → board/freescale/common/cds_pci_ft.c
View File

0
board/freescale/common/via.c → board/freescale/common/cds_via.c
View File

17
board/freescale/mpc8541cds/Makefile
View File

@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)

17
board/freescale/mpc8548cds/Makefile
View File

@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)

17
board/freescale/mpc8555cds/Makefile
View File

@ -23,21 +23,16 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o tlb.o \ COBJS-y += $(BOARD).o
../common/cadmus.o \ COBJS-y += law.o
../common/eeprom.o \ COBJS-y += tlb.o
../common/ft_board.o \
../common/via.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS-y))
$(LIB): $(obj).depend $(OBJS) $(SOBJS) $(LIB): $(obj).depend $(OBJS) $(SOBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)

3
board/freescale/mpc8568mds/Makefile
View File

@ -23,9 +23,6 @@
# #
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a

4
board/freescale/mpc8610hpcd/Makefile
View File

@ -21,10 +21,6 @@
include $(TOPDIR)/config.mk include $(TOPDIR)/config.mk
ifneq ($(OBJTREE),$(SRCTREE))
$(shell mkdir -p $(obj)../common)
endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o law.o COBJS := $(BOARD).o law.o

5
include/configs/MPC8541CDS.h
View File

@ -49,6 +49,9 @@
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_FSL_LAW 1 /* Use common FSL init code */
#define CONFIG_FSL_VIA
#define CONFIG_FSL_CDS_EEPROM
/* /*
* When initializing flash, if we cannot find the manufacturer ID, * When initializing flash, if we cannot find the manufacturer ID,
* assume this is the AMD flash associated with the CDS board. * assume this is the AMD flash associated with the CDS board.
@ -274,6 +277,8 @@ extern unsigned long get_clock_freq(void);
* 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7 * 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7
*/ */
#define CONFIG_FSL_CADMUS
#define CADMUS_BASE_ADDR 0xf8000000 #define CADMUS_BASE_ADDR 0xf8000000
#define CFG_BR3_PRELIM 0xf8000801 #define CFG_BR3_PRELIM 0xf8000801
#define CFG_OR3_PRELIM 0xfff00ff7 #define CFG_OR3_PRELIM 0xfff00ff7

5
include/configs/MPC8548CDS.h
View File

@ -57,6 +57,9 @@
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_FSL_LAW 1 /* Use common FSL init code */
#define CONFIG_FSL_VIA
#define CONFIG_FSL_CDS_EEPROM
/* /*
* When initializing flash, if we cannot find the manufacturer ID, * When initializing flash, if we cannot find the manufacturer ID,
* assume this is the AMD flash associated with the CDS board. * assume this is the AMD flash associated with the CDS board.
@ -297,6 +300,8 @@ extern unsigned long get_clock_freq(void);
* 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7 * 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7
*/ */
#define CONFIG_FSL_CADMUS
#define CADMUS_BASE_ADDR 0xf8000000 #define CADMUS_BASE_ADDR 0xf8000000
#define CFG_BR3_PRELIM 0xf8000801 #define CFG_BR3_PRELIM 0xf8000801
#define CFG_OR3_PRELIM 0xfff00ff7 #define CFG_OR3_PRELIM 0xfff00ff7

5
include/configs/MPC8555CDS.h
View File

@ -49,6 +49,9 @@
#define CONFIG_FSL_LAW 1 /* Use common FSL init code */ #define CONFIG_FSL_LAW 1 /* Use common FSL init code */
#define CONFIG_FSL_VIA
#define CONFIG_FSL_CDS_EEPROM
/* /*
* When initializing flash, if we cannot find the manufacturer ID, * When initializing flash, if we cannot find the manufacturer ID,
* assume this is the AMD flash associated with the CDS board. * assume this is the AMD flash associated with the CDS board.
@ -274,6 +277,8 @@ extern unsigned long get_clock_freq(void);
* 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7 * 1111 1111 1111 0000 0000 1111 1111 0111 = fff00ff7
*/ */
#define CONFIG_FSL_CADMUS
#define CADMUS_BASE_ADDR 0xf8000000 #define CADMUS_BASE_ADDR 0xf8000000
#define CFG_BR3_PRELIM 0xf8000801 #define CFG_BR3_PRELIM 0xf8000801
#define CFG_OR3_PRELIM 0xfff00ff7 #define CFG_OR3_PRELIM 0xfff00ff7