ar71xx: ag71xx: remove unused mii_ctrl field from struct ag71xx

[openwrt.git] / target / linux / kirkwood / image / Makefile

diff --git a/target/linux/kirkwood/image/Makefile b/target/linux/kirkwood/image/Makefile
index 0989d35..c93be67 100644 (file)
--- a/target/linux/kirkwood/image/Makefile
+++ b/target/linux/kirkwood/image/Makefile
@@ -7,25 +7,7 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 

-JFFS2OPTS_NAND += --little-endian --pagesize=0x800 --no-cleanmarkers --pad
-
-define Image/mkfs/jffs2/sub/sub
-       $(STAGING_DIR_HOST)/bin/mkfs.jffs2 $(3) \
-               -e $(patsubst %k,%KiB,$(1)) -o $(KDIR)/root.jffs2-$(1)-$(2) -d $(TARGET_DIR) -v 2>&1 1>/dev/null | awk '/^.+$$$$/'
-endef
-
-define Image/mkfs/jffs2/sub
-       # Do not remov this line
-       $(call Image/mkfs/jffs2/sub/sub,$(1),nor,$(JFFS2OPTS))
-       ( \
-               dd if=$(KDIR)/uImage bs=4096k conv=sync; \
-               dd if=$(KDIR)/root.jffs2-$(1)-nor bs=128k conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nor.img
-
-       $(call Image/mkfs/jffs2/sub/sub,$(1),nand,$(JFFS2OPTS) $(JFFS2OPTS_NAND))
-       $(call add_jffs2_mark,$(KDIR)/root.jffs2-$(1)-nand)
-       cp $(KDIR)/root.jffs2-$(1)-nand $(BIN_DIR)/$(IMG_PREFIX)-jffs2-$(1)-nand.img
-endef
+JFFS2OPTS += --little-endian --pagesize=0x800 --no-cleanmarkers --pad

 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage
 
 define Image/Prepare
        cp $(LINUX_DIR)/arch/arm/boot/uImage $(KDIR)/uImage


@@ -37,16 +19,15 @@ define Image/BuildKernel
 endef
 
 define Image/Build
 endef
 
 define Image/Build

-       $(call Image/Build/$(1),$(1))
+       $(if $(Image/Build/$(1)), \
+               $(call Image/Build/$(1),$(1)), \
+               $(CP) $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img \
+       )

 endef
 
 define Image/Build/jffs2-128k
 endef
 
 define Image/Build/jffs2-128k

-       ( \
-               dd if=$(KDIR)/uImage bs=4096k conv=sync; \
-               dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
-       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nor.img
-
-       cp $(KDIR)/root.$(1) $(BIN_DIR)/$(IMG_PREFIX)-$(1)-nand.img
+       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img \
+               bs=2048 conv=sync

 endef
 
 define Image/Build/squashfs
 endef
 
 define Image/Build/squashfs


@@ -54,7 +35,7 @@ define Image/Build/squashfs
        ( \
                dd if=$(KDIR)/uImage bs=4096k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \
        ( \
                dd if=$(KDIR)/uImage bs=4096k conv=sync; \
                dd if=$(KDIR)/root.$(1) bs=128k conv=sync; \

-       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(1).img
+       ) > $(BIN_DIR)/$(IMG_PREFIX)-$(PROFILE)-$(1).img

 endef
 
 $(eval $(call BuildImage))
 endef
 
 $(eval $(call BuildImage))