Remove BOARDLIBS usage completely

Signed-off-by: Stefan Roese <sr@denx.de>
This commit is contained in:
Stefan Roese 2007-04-23 12:00:22 +02:00
parent 37837828d8
commit 323bfa8f43
9 changed files with 5 additions and 22 deletions

View File

@ -197,6 +197,9 @@ LIBS += cpu/$(CPU)/lib$(CPU).a
ifdef SOC ifdef SOC
LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
endif endif
ifeq ($(CPU),ixp)
LIBS += cpu/ixp/npe/libnpe.a
endif
LIBS += lib_$(ARCH)/lib$(ARCH).a LIBS += lib_$(ARCH)/lib$(ARCH).a
LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \ LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
@ -219,7 +222,6 @@ LIBS += $(shell if [ -d post/cpu/$(CPU) ]; then echo \
LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \ LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi) "post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
LIBS += common/libcommon.a LIBS += common/libcommon.a
LIBS += $(BOARDLIBS)
LIBS := $(addprefix $(obj),$(LIBS)) LIBS := $(addprefix $(obj),$(LIBS))
.PHONY : $(LIBS) .PHONY : $(LIBS)

View File

@ -1,4 +1 @@
TEXT_BASE = 0x00f80000 TEXT_BASE = 0x00f80000
# include NPE ethernet driver
BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a

View File

@ -26,8 +26,3 @@
# #
TEXT_BASE = 0xFE000000 TEXT_BASE = 0xFE000000
#
# Additional board-specific libraries
#
BOARDLIBS = libfdt/libfdt.a

View File

@ -27,4 +27,3 @@
# #
TEXT_BASE = 0x40700000 TEXT_BASE = 0x40700000
BOARDLIBS = $(obj)drivers/nand/libnand.a

View File

@ -1,4 +1 @@
TEXT_BASE = 0x01f00000 TEXT_BASE = 0x01f00000
# include NPE ethernet driver
BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a

View File

@ -87,7 +87,7 @@ START := $(addprefix $(obj),$(START))
all: $(LIB) all: $(LIB)
$(LIB): $(obj).depend $(OBJS) $(LIB): $(OBJS)
$(AR) $(ARFLAGS) $@ $(OBJS) $(AR) $(ARFLAGS) $@ $(OBJS)
######################################################################### #########################################################################

View File

@ -192,12 +192,7 @@ The old NAND handling code has been re-factored and is now confined
to only board-specific files and - unfortunately - to the DoC code to only board-specific files and - unfortunately - to the DoC code
(see below). A new configuration variable has been introduced: (see below). A new configuration variable has been introduced:
CFG_NAND_LEGACY, which has to be defined in the board config file if CFG_NAND_LEGACY, which has to be defined in the board config file if
that board uses legacy code. If CFG_NAND_LEGACY is defined, the board that board uses legacy code.
specific config.mk file should also have "BOARDLIBS =
drivers/nand_legacy/libnand_legacy.a". For boards using the new NAND
approach (PPChameleon and netstar at the moment) no variable is
necessary, but the config.mk should have "BOARDLIBS =
drivers/nand/libnand.a".
The necessary changes have been made to all affected boards, and no The necessary changes have been made to all affected boards, and no
build breakage has been introduced, except for NETTA and NETTA_ISDN build breakage has been introduced, except for NETTA and NETTA_ISDN

View File

@ -188,7 +188,6 @@
/* /*
* NAND Flash * NAND Flash
*/ */
/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
#undef CFG_NAND_LEGACY #undef CFG_NAND_LEGACY
#define CFG_NAND0_BASE 0x0 /* 0x43100040 */ /* 0x10000000 */ #define CFG_NAND0_BASE 0x0 /* 0x43100040 */ /* 0x10000000 */

View File

@ -174,7 +174,6 @@
/* /*
* NAND Flash * NAND Flash
*/ */
/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
#define CONFIG_NEW_NAND_CODE #define CONFIG_NEW_NAND_CODE
#define CFG_NAND0_BASE 0x0 #define CFG_NAND0_BASE 0x0
#undef CFG_NAND1_BASE #undef CFG_NAND1_BASE