diff options
| author | Russell Senior <russell@personaltelco.net> | 2016-05-16 00:52:24 -0700 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-05-23 11:56:38 +0200 |
| commit | f89a20a89aebe4767c606b4e04a6a3906e1ee26c (patch) | |
| tree | 87d0ae9a08aa7b42cad3d2fe9cb632211d834ff9 /target/linux/ath25/image | |
| parent | c7efbd7dbb29238631efb7e8565c507284877644 (diff) | |
| download | master-31e0f0ae-f89a20a89aebe4767c606b4e04a6a3906e1ee26c.tar.gz master-31e0f0ae-f89a20a89aebe4767c606b4e04a6a3906e1ee26c.tar.bz2 master-31e0f0ae-f89a20a89aebe4767c606b4e04a6a3906e1ee26c.zip | |
ath25: update kernel from 3.18 to 4.4
Summary of changes:
* moved config-3.18 to config-4.4 and patches-3.18 to patches-4.4
* removed most of the first two patches, that seem to be upstream already
* changed deprecated/removed IRQF_DISABLED to zero following examples in upstream kernel patches
* added config line to disable device-tree to satisfy kernel configuration
* add new image generation code
Build tested and run tested on an Accton MR3201A.
Signed-off-by: Russell Senior <russell@personaltelco.net>
Signed-off-by: Sergey Ryazanov <ryazanov.s.a@gmail.com>
Signed-off-by: John Crispin <john@phrozen.org>
Diffstat (limited to 'target/linux/ath25/image')
| -rw-r--r-- | target/linux/ath25/image/Makefile | 116 |
1 files changed, 83 insertions, 33 deletions
diff --git a/target/linux/ath25/image/Makefile b/target/linux/ath25/image/Makefile index 6bdb3c4755..94d38e8d69 100644 --- a/target/linux/ath25/image/Makefile +++ b/target/linux/ath25/image/Makefile @@ -7,54 +7,104 @@ include $(TOPDIR)/rules.mk include $(INCLUDE_DIR)/image.mk +DEVICE_VARS += KERNEL_PREFIX FILESYSTEMS + 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 + $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $(KDIR)/vmlinux.bin.lzma dd if=$(KDIR)/vmlinux.bin.gz of=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.gz bs=65536 conv=sync + dd if=$(KDIR)/vmlinux.bin.lzma of=$(BIN_DIR)/$(IMG_PREFIX)-vmlinux.lzma bs=65536 conv=sync endef define Image/Build/squashfs - $(call prepare_generic_squashfs,$(KDIR)/root.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 +endef + +define Device/Default + PROFILES = Default $$(DEVICE_NAME) + KERNEL := lzma-kernel + IMAGES := sysupgrade.bin + FILESYSTEMS := squashfs +endef - -$(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 $(KDIR)/$(KERNEL_IMAGE) \ + -r $@ \ + -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" + "$(KDIR)/$(KERNEL_IMAGE)" \ + "$@" \ + "$@.new" && \ + mv $@.new $@ +endef + +define Build/mkmylofw + $(STAGING_DIR_HOST)/bin/mkmylofw -B $(1) \ + -p0x020000:0x130000:ah:0x80041000:linux:$(KDIR)/$(KERNEL_IMAGE) \ + -p0x150000:0x2a0000:::rootfs:$@ \ + $@.new && \ + mv $@.new $@ +endef + +define Build/gzip-kernel + gzip -9n -c $(KDIR)/vmlinux > $@ + dd if=$@ of=$@.new bs=65536 conv=sync + mv $@.new $@ +endef + +define Build/lzma-kernel + $(STAGING_DIR_HOST)/bin/lzma e $(KDIR)/vmlinux $@.l7 + dd if=$@.l7 of=$@ bs=65536 conv=sync +endef + +define Device/combined + DEVICE_TITLE := Combined Image + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | combined-image +endef +TARGET_DEVICES += combined + +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 := 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 := gzip-kernel + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to 128k | mkmylofw wpe53g endef +#TARGET_DEVICES += wpe53g $(eval $(call BuildImage)) |