aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/ixp4xx/image/Makefile
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-04-06 09:56:30 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-04-06 09:56:30 +0000
commitc237309a3a077ab0cf81c9c29e6437f49ec0ab63 (patch)
treedce62e287fbe731c3768d7f99aabafe3a0b1a785 /target/linux/ixp4xx/image/Makefile
parentf0971cead83e1fef42c136ae539f8017401d2e2c (diff)
downloadupstream-c237309a3a077ab0cf81c9c29e6437f49ec0ab63.tar.gz
upstream-c237309a3a077ab0cf81c9c29e6437f49ec0ab63.tar.bz2
upstream-c237309a3a077ab0cf81c9c29e6437f49ec0ab63.zip
ixp4xx: make apex optional, clean up the makefile - fixes spurious recompilation issues
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15115 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ixp4xx/image/Makefile')
-rw-r--r--target/linux/ixp4xx/image/Makefile22
1 files changed, 6 insertions, 16 deletions
diff --git a/target/linux/ixp4xx/image/Makefile b/target/linux/ixp4xx/image/Makefile
index 53d2ef0f63..82f2e96d58 100644
--- a/target/linux/ixp4xx/image/Makefile
+++ b/target/linux/ixp4xx/image/Makefile
@@ -7,18 +7,20 @@
include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/image.mk
-define Image/Build/Linksys
+ifdef CONFIG_PACKAGE_apex
+ define Image/Build/Linksys
BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
- -L $(BIN_DIR)/apex-$(2)-armeb.bin \
+ -L $(BIN_DIR)/apex/apex-$(2)-armeb.bin \
-k $(BIN_DIR)/openwrt-$(2)-zImage \
-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \
-p -o $(BIN_DIR)/openwrt-$(2)-$(1).bin
BIN_DIR=$(BIN_DIR) $(TOPDIR)/scripts/slugimage.pl \
- -F -L $(BIN_DIR)/apex-$(2)-16mb-armeb.bin \
+ -F -L $(BIN_DIR)/apex/apex-$(2)-16mb-armeb.bin \
-k $(BIN_DIR)/openwrt-$(2)-zImage \
-r rootfs:$(BIN_DIR)/openwrt-$(BOARD)-$(1).img \
-p -o $(BIN_DIR)/openwrt-$(2)-$(1)-16mb.bin
-endef
+ endef
+endif
define Image/Build/Freecom
$(INSTALL_DIR) $(TARGET_DIR)/boot
@@ -30,18 +32,6 @@ define Image/Build/Freecom
$(STAGING_DIR_HOST)/bin/encode_crc $(BIN_DIR)/openwrt-$(2)-$(1).img $(BIN_DIR)/openwrt-$(2)-$(1)-webupgrade.img
endef
-define Build/Compile
- mkdir -p $(BIN_DIR)
- $(MAKE) -C apex \
- BUILD_DIR="$(KDIR)" \
- TARGET="$(BIN_DIR)" \
- compile
-endef
-
-define Build/Clean
- $(MAKE) -C apex clean
-endef
-
define Image/Prepare
cp $(LINUX_DIR)/arch/arm/boot/zImage $(KDIR)/zImage
endef