Remove BOARDLIBS usage completely

Signed-off-by: Stefan Roese <sr@denx.de>

Remove BOARDLIBS usage completely
Signed-off-by: Stefan Roese <sr@denx.de>
Stefan Roese
1 parent 37837828d8
Showing 9 changed files with 5 additions and 22 deletions Side-by-side Diff
Makefile
board/ixdp425/config.mk
board/mpc8360emds/config.mk
board/nc650/config.mk
board/prodrive/pdnb3/config.mk
cpu/ixp/npe/Makefile
doc/README.nand
include/configs/delta.h
include/configs/zylonite.h
@@ -197,6 +197,9 @@
 ifdef SOC
 LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
 endif
+ifeq ($(CPU),ixp)
+LIBS += cpu/ixp/npe/libnpe.a
+endif
 LIBS += lib_$(ARCH)/lib$(ARCH).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
@@ -219,7 +222,6 @@
 LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
 	"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
 LIBS += common/libcommon.a
-LIBS += $(BOARDLIBS)
  
 LIBS := $(addprefix $(obj),$(LIBS))
 .PHONY : $(LIBS)
 TEXT_BASE = 0x00f80000
-
-# include NPE ethernet driver
-BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a
@@ -26,9 +26,4 @@
 #
  
 TEXT_BASE = 0xFE000000
-
-#
-# Additional board-specific libraries
-#
-BOARDLIBS = libfdt/libfdt.a
@@ -27,5 +27,4 @@
 #
  
 TEXT_BASE = 0x40700000
-BOARDLIBS = $(obj)drivers/nand/libnand.a
 TEXT_BASE = 0x01f00000
-
-# include NPE ethernet driver
-BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a
@@ -87,7 +87,7 @@
  
 all:	$(LIB)
  
-$(LIB):	$(obj).depend $(OBJS)
+$(LIB):	$(OBJS)
 	$(AR) $(ARFLAGS) $@ $(OBJS)
  
 #########################################################################
@@ -192,12 +192,7 @@
 to only board-specific files and - unfortunately - to the DoC code
 (see below). A new configuration variable has been introduced:
 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
-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".
+that board uses legacy code.
  
 The necessary changes have been made to all affected boards, and no
 build breakage has been introduced, except for NETTA and NETTA_ISDN
@@ -188,7 +188,6 @@
 /*
  * NAND Flash
  */
-/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
 #undef CFG_NAND_LEGACY
  
 #define CFG_NAND0_BASE		0x0 /* 0x43100040 */ /* 0x10000000 */
@@ -174,7 +174,6 @@
 /*
  * NAND Flash
  */
-/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
 #define CONFIG_NEW_NAND_CODE
 #define CFG_NAND0_BASE		0x0
 #undef CFG_NAND1_BASE
...	...	@@ -197,6 +197,9 @@
197	197	ifdef SOC
198	198	LIBS += cpu/$(CPU)/$(SOC)/lib$(SOC).a
199	199	endif
	200	+ifeq ($(CPU),ixp)
	201	+LIBS += cpu/ixp/npe/libnpe.a
	202	+endif
200	203	LIBS += lib_$(ARCH)/lib$(ARCH).a
201	204	LIBS += fs/cramfs/libcramfs.a fs/fat/libfat.a fs/fdos/libfdos.a fs/jffs2/libjffs2.a \
202	205	fs/reiserfs/libreiserfs.a fs/ext2/libext2fs.a
...	...	@@ -219,7 +222,6 @@
219	222	LIBS += $(shell if [ -d post/board/$(BOARDDIR) ]; then echo \
220	223	"post/board/$(BOARDDIR)/libpost$(BOARD).a"; fi)
221	224	LIBS += common/libcommon.a
222		-LIBS += $(BOARDLIBS)
223	225
224	226	LIBS := $(addprefix $(obj),$(LIBS))
225	227	.PHONY : $(LIBS)
1	1	TEXT_BASE = 0x00f80000
2		-
3		-# include NPE ethernet driver
4		-BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a
...	...	@@ -26,9 +26,4 @@
26	26	#
27	27
28	28	TEXT_BASE = 0xFE000000
29		-
30		-#
31		-# Additional board-specific libraries
32		-#
33		-BOARDLIBS = libfdt/libfdt.a
...	...	@@ -27,5 +27,4 @@
27	27	#
28	28
29	29	TEXT_BASE = 0x40700000
30		-BOARDLIBS = $(obj)drivers/nand/libnand.a
1	1	TEXT_BASE = 0x01f00000
2		-
3		-# include NPE ethernet driver
4		-BOARDLIBS = $(obj)cpu/ixp/npe/libnpe.a
...	...	@@ -87,7 +87,7 @@
87	87
88	88	all: $(LIB)
89	89
90		-$(LIB): $(obj).depend $(OBJS)
	90	+$(LIB): $(OBJS)
91	91	$(AR) $(ARFLAGS) $@ $(OBJS)
92	92
93	93	#########################################################################
...	...	@@ -192,12 +192,7 @@
192	192	to only board-specific files and - unfortunately - to the DoC code
193	193	(see below). A new configuration variable has been introduced:
194	194	CFG_NAND_LEGACY, which has to be defined in the board config file if
195		-that board uses legacy code. If CFG_NAND_LEGACY is defined, the board
196		-specific config.mk file should also have "BOARDLIBS =
197		-drivers/nand_legacy/libnand_legacy.a". For boards using the new NAND
198		-approach (PPChameleon and netstar at the moment) no variable is
199		-necessary, but the config.mk should have "BOARDLIBS =
200		-drivers/nand/libnand.a".
	195	+that board uses legacy code.
201	196
202	197	The necessary changes have been made to all affected boards, and no
203	198	build breakage has been introduced, except for NETTA and NETTA_ISDN
...	...	@@ -188,7 +188,6 @@
188	188	/*
189	189	* NAND Flash
190	190	*/
191		-/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
192	191	#undef CFG_NAND_LEGACY
193	192
194	193	#define CFG_NAND0_BASE 0x0 /* 0x43100040 / / 0x10000000 */
...	...	@@ -174,7 +174,6 @@
174	174	/*
175	175	* NAND Flash
176	176	*/
177		-/* Use the new NAND code. (BOARDLIBS = drivers/nand/libnand.a required) */
178	177	#define CONFIG_NEW_NAND_CODE
179	178	#define CFG_NAND0_BASE 0x0
180	179	#undef CFG_NAND1_BASE