fix xscale compile (#1495)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@6827 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 20 insertions, 40 deletions

diff --git a/target/linux/ixp4xx-2.6/image/Makefile b/target/linux/ixp4xx-2.6/image/Makefile
index 52cca6668a..617bc15c20 100644
--- a/target/linux/ixp4xx-2.6/image/Makefile
+++ b/target/linux/ixp4xx-2.6/image/Makefile
@@ -11,11 +11,11 @@ define Build/Compile
 	$(MAKE) -C apex \
 		BUILD_DIR="$(KDIR)" \
 		TARGET="$(KDIR)" \
-		install
+		compile	
 	$(MAKE) -C npe-ucode \
 		BUILD_DIR="$(KDIR)" \
 		TARGET="$(KDIR)" \
-		install
+		compile
 endef
 
 define Build/Clean
diff --git a/target/linux/ixp4xx-2.6/image/apex/Makefile b/target/linux/ixp4xx-2.6/image/apex/Makefile
index e950aa09b8..7b781cfbdb 100644
--- a/target/linux/ixp4xx-2.6/image/apex/Makefile
+++ b/target/linux/ixp4xx-2.6/image/apex/Makefile
@@ -17,22 +17,9 @@ PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=ftp://ftp.buici.com/pub/apex/ \
 	ftp://metalab.unc.edu/pub/Linux/system/boot/apex/
 PKG_MD5SUM:=ed2183311aacf5714afbd825f3671417
-PKG_CAT:=zcat
-
-PKG_INSTALL_DIR:=$(TARGET)
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/apex-nslu2
-  TITLE:=apex-nslu2
-  DESCRIPTION:=\
-	The Apex Bootloader (compiled for the Linksys NSLU2).
-  URL:=http://wiki.buici.com/twiki/bin/view/Main/ApexBootloader
-  SECTION:=base
-  CATEGORY:=Boot Loaders
-  DEPENDS:=@LINUX_2_6_IXP4XX
-endef
-
 define Build/Configure
 	$(MAKE) -C $(PKG_BUILD_DIR) \
 		ARCH=arm \
@@ -46,11 +33,8 @@ define Build/Compile
 		all
 endef
 
-compile-targets: ${PKG_BUILD_DIR}/.built
-
-ifneq ($(TARGET),)
-install: compile
+define Build/InstallDev
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/apex.bin $(TARGET)/apex-nslu2-armeb.bin
-endif
+endef
 
-$(eval $(call BuildPackage,apex-nslu2))
+$(eval $(call Build/DefaultTargets))
diff --git a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
index 1f61570dc4..4559f56804 100644
--- a/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
+++ b/target/linux/ixp4xx-2.6/image/npe-ucode/Makefile
@@ -14,31 +14,27 @@ PKG_RELEASE:=1
 
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=IPL_ixp400NpeLibrary-2_3.zip
-PKG_UNPACK:=unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 
-include $(INCLUDE_DIR)/unpack.mk
+include $(INCLUDE_DIR)/package.mk
 
-$(PKG_BUILD_DIR)/.prepared:
-	mkdir $(PKG_BUILD_DIR)
-	$(PKG_UNPACK)
+define Build/Prepare
+	rm -rf $(PKG_BUILD_DIR)
+	mkdir -p $(PKG_BUILD_DIR)
+	unzip -d $(PKG_BUILD_DIR)/ $(DL_DIR)/$(PKG_SOURCE)
 	mv $(PKG_BUILD_DIR)/ixp400_xscale_sw/src/npeDl/IxNpeMicrocode.c $(PKG_BUILD_DIR)/
 	rm -rf $(PKG_BUILD_DIR)/ixp400_xscale_sw
 	$(CP) ./src/* $(PKG_BUILD_DIR)/
-	touch $@
-
-$(PKG_BUILD_DIR)/NPE-B: $(PKG_BUILD_DIR)/.prepared
-	( cd $(PKG_BUILD_DIR) ; \
-	  $(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode ; \
-	  ./IxNpeMicrocode -be )
+endef
 
-download: $(DL_DIR)/$(PKG_SOURCE)
-prepare: $(PKG_BUILD_DIR)/.prepared
-compile: $(PKG_BUILD_DIR)/NPE-B
+define Build/Compile
+	(cd $(PKG_BUILD_DIR); \
+		$(HOSTCC) -Wall IxNpeMicrocode.c -o IxNpeMicrocode; \
+		./IxNpeMicrocode -be \
+	)
+endef
 
-ifneq ($(TARGET),)
-install: compile
+define Build/InstallDev
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/NPE-B $(TARGET)/
-endif
+endef
 
-clean:
-	rm -rf $(PKG_BUILD_DIR)
+$(eval $(call Build/DefaultTargets))