V3s_Allwinner
/
uboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

FSL: Convert board/freescale/common/Makefile to use CONFIG_ 

Convert the board/freescale/common/Makefile to use
CONFIG_* options to select which files to conditionally
compile into the board/freescale/common library rather
than conditionally compiling entire files.

Now handles::
    CONFIG_FSL_PIXIS
    CONFIG_FSL_DIU_FB
    CONFIG_PQ_MDS_PIB

CONFIG_ID_EEPROM is introduced until CFG_ID_EEPROM is gone.

Signed-off-by: Jon Loeliger <jdl@freescale.com>
This commit is contained in:
Jon Loeliger 2008-01-15 13:42:41 -06:00
parent 7c2221eb23
commit ad8f8687b7
8 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
board/freescale/common/Makefile
View File

@ -29,14 +29,13 @@ endif
LIB = $(obj)lib$(VENDOR).a LIB = $(obj)lib$(VENDOR).a
COBJS := sys_eeprom.o \ COBJS-${CONFIG_PQ_MDS_PIB} += pq-mds-pib.o
pixis.o \ COBJS-${CONFIG_ID_EEPROM} += sys_eeprom.o
pq-mds-pib.o \ COBJS-${CONFIG_FSL_DIU_FB} += fsl_diu_fb.o fsl_logo_bmp.o
fsl_logo_bmp.o \ COBJS-${CONFIG_FSL_PIXIS} += pixis.o
fsl_diu_fb.o
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS-y:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS-y))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS))
$(LIB): $(obj).depend $(OBJS) $(LIB): $(obj).depend $(OBJS)

3
board/freescale/common/fsl_diu_fb.c
View File

@ -27,8 +27,6 @@
#include <i2c.h> #include <i2c.h>
#include <malloc.h> #include <malloc.h>
#ifdef CONFIG_FSL_DIU_FB
#include "fsl_diu_fb.h" #include "fsl_diu_fb.h"
#ifdef DEBUG #ifdef DEBUG
@ -615,4 +613,3 @@ void fsl_diu_clear_screen(void)
memset(info->screen_base, 0, info->smem_len); memset(info->screen_base, 0, info->smem_len);
} }
#endif /* CONFIG_FSL_DIU_FB */

4
board/freescale/common/pixis.c
View File

@ -25,9 +25,8 @@
#include <common.h> #include <common.h>
#include <command.h> #include <command.h>
#include <watchdog.h> #include <watchdog.h>
#ifdef CONFIG_FSL_PIXIS
#include <asm/cache.h> #include <asm/cache.h>
#include "pixis.h" #include "pixis.h"
@ -474,4 +473,3 @@ U_BOOT_CMD(
" pixis_reset altbank cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n" " pixis_reset altbank cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"
" pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n" " pixis_reset cf <SYSCLK freq> <COREPLL ratio> <MPXPLL ratio>\n"
); );
#endif /* CONFIG_FSL_PIXIS */

3
board/freescale/common/pq-mds-pib.c
View File

@ -12,8 +12,6 @@
#include <i2c.h> #include <i2c.h>
#include <asm/io.h> #include <asm/io.h>
#ifdef CONFIG_PQ_MDS_PIB
#include "pq-mds-pib.h" #include "pq-mds-pib.h"
int pib_init(void) int pib_init(void)
@ -102,4 +100,3 @@ int pib_init(void)
i2c_set_bus_num(orig_i2c_bus); i2c_set_bus_num(orig_i2c_bus);
return 0; return 0;
} }
#endif /* CONFIG_PQ_MDS_PIB */

2
board/freescale/common/sys_eeprom.c
View File

@ -27,7 +27,6 @@
#include <i2c.h> #include <i2c.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#ifdef CFG_ID_EEPROM
typedef struct { typedef struct {
unsigned char id[4]; /* 0x0000 - 0x0003 */ unsigned char id[4]; /* 0x0000 - 0x0003 */
unsigned char sn[12]; /* 0x0004 - 0x000F */ unsigned char sn[12]; /* 0x0004 - 0x000F */
@ -253,4 +252,3 @@ int mac_read_from_eeprom(void)
} }
return 0; return 0;
} }
#endif /* CFG_ID_EEPROM */

12
board/freescale/mpc8610hpcd/Makefile
View File

@ -27,14 +27,14 @@ endif
LIB = $(obj)lib$(BOARD).a LIB = $(obj)lib$(BOARD).a
COBJS := $(BOARD).o \
../common/sys_eeprom.o \
../common/pixis.o \
mpc8610hpcd_diu.o \
../common/fsl_diu_fb.o
SOBJS := init.o SOBJS := init.o
COBJS := $(BOARD).o
COBJS-${CONFIG_FSL_DIU_FB} += mpc8610hpcd_diu.o
COBJS += ${COBJS-y}
SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c)
OBJS := $(addprefix $(obj),$(COBJS)) OBJS := $(addprefix $(obj),$(COBJS))
SOBJS := $(addprefix $(obj),$(SOBJS)) SOBJS := $(addprefix $(obj),$(SOBJS))

3
include/configs/MPC8610HPCD.h
View File

@ -141,6 +141,9 @@
#endif #endif
#define CFG_ID_EEPROM #define CFG_ID_EEPROM
#ifdef CFG_ID_EEPROM
#define CONFIG_ID_EEPROM
#endif
#define ID_EEPROM_ADDR 0x57 #define ID_EEPROM_ADDR 0x57

3
include/configs/MPC8641HPCN.h
View File

@ -152,6 +152,9 @@ extern unsigned long get_board_sys_clk(unsigned long dummy);
#endif #endif
#define CFG_ID_EEPROM 1 #define CFG_ID_EEPROM 1
#ifdef CFG_ID_EEPROM
#define CONFIG_ID_EEPROM
#endif
#define ID_EEPROM_ADDR 0x57 #define ID_EEPROM_ADDR 0x57
/* /*