ramips: revert faulty 4.4 config change from 9c242270907

[oweals/openwrt.git] / target / linux / ath25 / image / Makefile

diff --git a/target/linux/ath25/image/Makefile b/target/linux/ath25/image/Makefile
index 6bdb3c475507bc60a87efdc05a698b2b15fe864d..5144ed8a0a9c5b3f53dff50b6e38b8cea34c0f5e 100644 (file)
--- a/target/linux/ath25/image/Makefile
+++ b/target/linux/ath25/image/Makefile
@@ -7,54 +7,101 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-define Image/BuildKernel
-       cp $(KDIR)/vmlinux.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
-       gzip -9n -c $(KDIR)/vmlinux > $(KDIR)/vmlinux.bin.gz
-       $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.l7
-       dd if=$(KDIR)/vmlinux.bin.l7 of=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma bs=65536 conv=sync
-       dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.gz bs=65536 conv=sync
-endef
-
-define Image/Build/squashfs
-    $(call prepare_generic_squashfs,$(KDIR)/root.squashfs)
-endef
-
-define Image/Build
-       $(call Image/Build/$(1))
-       dd if=$(KDIR)/root.$(1) of=$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) bs=128k conv=sync
-
-       -$(STAGING_DIR_HOST)/bin/mkfwimage \
-               -B XS2 -v XS2.ar2316.OpenWrt.$(REVISION) \
-               -k $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma \
-               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-               -o $(BIN_DIR)/$(IMG_PREFIX)-ubnt2-$(1).bin
-
-       -$(STAGING_DIR_HOST)/bin/mkfwimage \
-               -B XS5 -v XS5.ar2313.OpenWrt.$(REVISION) \
-               -k $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma \
-               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-               -o $(BIN_DIR)/$(IMG_PREFIX)-ubnt5-$(1).bin
-
-       -$(STAGING_DIR_HOST)/bin/mkfwimage \
-               -B XS2-8 -v XS2.ar2316.OpenWrt.$(REVISION) \
-               -k $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma \
-               -r $(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-               -o $(BIN_DIR)/$(IMG_PREFIX)-ubnt2-pico2-$(1).bin
-
-       -$(STAGING_DIR_HOST)/bin/mkmylofw -B np25g \
-               -p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
-               -p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-               $(BIN_DIR)/$(IMG_PREFIX)-np25g-$(1).bin
-
-       -$(STAGING_DIR_HOST)/bin/mkmylofw -B wpe53g \
-               -p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/vmlinux.bin.gz  \
-               -p0x150000:0x2a0000:::rootfs:$(BIN_DIR)/$(IMG_PREFIX)-root.$(1) \
-               $(BIN_DIR)/$(IMG_PREFIX)-wpe53g-$(1).bin
+define Build/mkfwimage
+       $(STAGING_DIR_HOST)/bin/mkfwimage \
+               -B $(1).OpenWrt.$(REVISION) \
+               -k $(IMAGE_KERNEL) \
+               -r $(IMAGE_ROOTFS) \
+               -o $@.new && \
+       mv $@.new $@
+endef
 
+define Build/combined-image
        -sh $(TOPDIR)/scripts/combined-image.sh \
-               "$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma" \
-               "$(BIN_DIR)/$(IMG_PREFIX)-root.$(1)" \
-               "$(BIN_DIR)/$(IMG_PREFIX)-combined.$(1).img"
+               "$(IMAGE_KERNEL)" \
+               "$(IMAGE_ROOTFS)" \
+               "$@.new" && \
+       mv $@.new $@
+endef
+
+define Build/mkmylofw
+       $(STAGING_DIR_HOST)/bin/mkmylofw -B $(1) \
+               -p0x020000:0x130000:ah:0x80041000:linux:$(IMAGE_KERNEL) \
+               -p0x150000:0x2a0000:::rootfs:$(IMAGE_ROOTFS) \
+               $@.new && \
+       mv $@.new $@
+endef
+
+define Build/gzip-kernel
+       gzip -9n -c $@ > $@.gz
+       dd if=$@.gz of=$@ bs=65536 conv=sync
+endef
+
+define Build/lzma-kernel
+       $(STAGING_DIR_HOST)/bin/lzma e $@ $@.l7
+       dd if=$@.l7 of=$@ bs=65536 conv=sync
+endef
+
+define Build/copy-kernel
+       rm -f $@ $@.elf
+       cp $< $@
+       cp $< $@.elf
+endef
+
+define Build/elf-kernel
+       cp $(IMAGE_KERNEL).elf $@
+endef
+
+
+define Device/Default
+  PROFILES = Default $$(DEVICE_NAME)
+  KERNEL := copy-kernel | lzma-kernel
+  IMAGES := sysupgrade.bin
+  FILESYSTEMS := squashfs
+endef
+
+define Device/generic
+  DEVICE_TITLE := Generic Images
+  IMAGES := kernel.lzma kernel.elf kernel.gz rootfs.bin sysupgrade.bin
+  IMAGE/kernel.gz := elf-kernel | gzip-kernel
+  IMAGE/kernel.elf := elf-kernel
+  IMAGE/kernel.lzma := elf-kernel | lzma-kernel
+  IMAGE/rootfs.bin := append-rootfs | pad-rootfs | pad-to 128k
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | combined-image
+  IMAGE_NAME = $$(IMAGE_PREFIX)-$$(if $$(findstring kernel,$$(2)),,$$(1)-)$$(2)
+endef
+TARGET_DEVICES += generic
+
+define Device/ubnt2-pico2
+  DEVICE_TITLE := Ubiquiti XS2-8
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2-8 -v XS2.ar2316
+endef
+TARGET_DEVICES += ubnt2-pico2
+
+define Device/ubnt2
+  DEVICE_TITLE := Ubiquiti XS2
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS2 -v XS2.ar2316
+endef
+TARGET_DEVICES += ubnt2
+
+define Device/ubnt5
+  DEVICE_TITLE := Ubiquiti XS5
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkfwimage XS5 -v XS5.ar2313
+endef
+TARGET_DEVICES += ubnt5
+
+define Device/np25g
+  DEVICE_TITLE := np25g
+  KERNEL := kernel-bin | gzip-kernel
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw np25g
+endef
+#TARGET_DEVICES += np25g
+
+define Device/wpe53g
+  DEVICE_TITLE := wpe53g
+  KERNEL := kernel-bin | gzip-kernel
+  IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw wpe53g
 endef
+#TARGET_DEVICES += wpe53g
 
 $(eval $(call BuildImage))