add reboot fix from #1312

[openwrt.git] / target / Makefile

diff --git a/target/Makefile b/target/Makefile
index 05d0023..1b6cbb5 100644 (file)
--- a/target/Makefile
+++ b/target/Makefile
@@ -1,94 +1,54 @@
+# 
+# Copyright (C) 2006 OpenWrt.org
+#
+# This is free software, licensed under the GNU General Public License v2.
+# See /LICENSE for more information.
+#
 include $(TOPDIR)/rules.mk
-
-# Default target skeleton stuff, may be overridden
-TARGET_SKEL_DIR=default/target_skeleton
+include $(INCLUDE_DIR)/target.mk
 
 all: install
 
-define BIN_template
-$(BIN_DIR)/openwrt-wrt54g-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-4MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       $(SED) "1s,^W54S,W54G," $$@
-       
-$(BIN_DIR)/openwrt-wrt54gs-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) addpattern -2 -i $$< -o $$@ -g
-       
-ifeq ($(BR2_TARGET_WRT54G),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54g-$(1).bin
-endif
-ifeq ($(BR2_TARGET_WRT54GS),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-wrt54gs-$(1).bin
-endif
+$(BIN_DIR):
+       mkdir -p $(BIN_DIR)
 
+linux-install: $(BIN_DIR)
+image_install: linux-install
 
-$(BIN_DIR)/openwrt-motorola-$(1).bin: $(BIN_DIR)/openwrt-brcm-2.4-$(patsubst jffs2,jffs2-8MB,$(1)).trx
-       PATH=$(TARGET_PATH) motorola-bin $$< $$@
+IMAGE_DIR:=linux/$(BOARD)-$(KERNEL)/image
 
-ifeq ($(BR2_TARGET_MOTOROLA),y)
-IMAGE_TARGETS += $(BIN_DIR)/openwrt-motorola-$(1).bin
-endif
-endef
+download: $(patsubst %,%-download,$(TARGETS-y))
+prepare: linux-prepare
+compile: linux-compile image_compile
+install: linux-install image_install 
 
-TARGET_DIRS:=
-TARGET_FS:=
-IMAGE_TARGETS:=
-ifeq ($(strip $(BR2_TARGET_ROOTFS_JFFS2)),y)
-TARGET_DIRS += jffs2
-TARGET_FS += jffs2
+ifeq ($(CONFIG_SDK),y)
+install: sdk_install
 endif
-ifeq ($(strip $(BR2_TARGET_ROOTFS_SQUASHFS_LZMA)),y)
-TARGET_DIRS += squashfs-lzma
-TARGET_FS += squashfs
+ifeq ($(CONFIG_IB),y)
+install: imagebuilder_install
 endif
-$(foreach fs,$(TARGET_FS),$(eval $(call BIN_template,$(fs))))
-
-INSTALL_TARGET_DIRS:=$(patsubst %,%-install,$(TARGET_DIRS))
-$(INSTALL_TARGET_DIRS): image_clean $(TARGET_DIR)/etc/sysconf $(BIN_DIR)
 
-prepare: $(patsubst %,%-prepare,$(TARGET_DIRS))
-       mkdir -p $(TARGET_DIR)
-       if [ -f "$(TARGET_SKELETON)" ] ; then \
-       zcat $(TARGET_SKELETON) | tar -C $(BUILD_DIR) -xf -; \
-       fi;
-       if [ -d "$(TARGET_SKEL_DIR)" ] ; then \
-               cp -a $(TARGET_SKEL_DIR)/* $(TARGET_DIR)/; \
-       fi;
-       mkdir -p $(TARGET_DIR)/jffs
-       mkdir -p $(TARGET_DIR)/dev
-       mkdir -p $(TARGET_DIR)/proc
-       mkdir -p $(TARGET_DIR)/tmp
-       mkdir -p $(TARGET_DIR)/lib
-       mkdir -p $(TARGET_DIR)/usr/lib
-       mkdir -p $(TARGET_DIR)/usr/bin
-       ln -sf /tmp/resolv.conf $(TARGET_DIR)/etc/resolv.conf
-       rm -rf $(TARGET_DIR)/var
-       ln -sf /tmp $(TARGET_DIR)/var
-       -find $(TARGET_DIR) -type d -name CVS | xargs rm -rf
-       -find $(TARGET_DIR) -type d -name .svn | xargs rm -rf
+clean: linux-clean sdk-clean imagebuilder-clean image_clean
 
-$(BIN_DIR):
-       mkdir -p $(BIN_DIR)
+prereq: FORCE
+       $(MAKE) -C linux/$(BOARD)-$(KERNEL) prereq
+       $(MAKE) -C $(IMAGE_DIR) prereq
 
-$(INSTALL_TARGET_DIRS): lzma-loader-compile linux-install
-$(IMAGE_TARGETS): $(patsubst %,%-install,$(TARGET_DIRS) linux)
-compile: $(patsubst %,%-compile,jffs2 lzma squashfs-lzma lzma-loader utils linux)
-install: utils-install lzma-install $(patsubst %,%-install,$(TARGET_DIRS) linux) $(IMAGE_TARGETS)
-clean: $(patsubst %,%-clean,$(TARGET_DIRS) linux) image_clean
+sdk_install: FORCE
+       $(MAKE) -C sdk install
 
-image_clean:
+image_clean: FORCE
+       $(MAKE) -C $(IMAGE_DIR) clean
        rm -f $(BIN_DIR)/openwrt-*
+       
+image_compile: FORCE
+       $(MAKE) -C $(IMAGE_DIR) compile
 
-$(TARGET_DIR)/etc/sysconf:
-       mkdir -p $(TARGET_DIR)/etc
-       -grep \^BR2_SYSCONF $(TOPDIR)/.config > $(TARGET_DIR)/etc/sysconf
-
-%-clean:
-       $(MAKE) -C $(patsubst %-clean,%,$@) clean
-%-prepare:
-       $(MAKE) -C $(patsubst %-prepare,%,$@) prepare
-%-compile: %-prepare
-       $(MAKE) -C $(patsubst %-compile,%,$@) compile
-%-install: %-compile
-       $(MAKE) -C $(patsubst %-install,%,$@) install
+image_install: image_compile
+       $(MAKE) -C $(IMAGE_DIR) install
 
+imagebuilder_install: image_install
+       $(MAKE) -C imagebuilder install
 
+$(eval $(call default_subtargets,))