mediatek: fix image building

[openwrt/staging/mkresin.git] / target / linux / mediatek / image / Makefile

diff --git a/target/linux/mediatek/image/Makefile b/target/linux/mediatek/image/Makefile
index ddf4e435c71e82e24ff70d1db17117f2e82c1032..385277fd3dec26aa2c50eebf3e51788f56ee3950 100644 (file)
--- a/target/linux/mediatek/image/Makefile
+++ b/target/linux/mediatek/image/Makefile
@@ -8,18 +8,6 @@
 include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/image.mk
 
-# for arm
-KERNEL_LOADADDR := 0x80008000
-
-# for arm64
-ifeq ($(SUBTARGET),mt7622)
-KERNEL_LOADADDR = 0x41080000
-endif
-
-ifeq ($(SUBTARGET),mt7629)
-KERNEL_LOADADDR = 0x40008000
-endif
-
 define Build/sysupgrade-emmc
        rm -f $@.recovery
        mkfs.fat -C $@.recovery 3070
@@ -37,7 +25,7 @@ define Device/Default
   FILESYSTEMS := squashfs
   DEVICE_DTS_DIR := $(DTS_DIR)
   IMAGES := sysupgrade.bin
-  IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
+  IMAGE/sysupgrade.bin := append-kernel | pad-to 128k | append-rootfs | pad-rootfs | append-metadata
   SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
 ifeq ($(SUBTARGET),mt7623)
   KERNEL_NAME := zImage
@@ -50,17 +38,7 @@ else
 endif
 endef
 
-ifeq ($(SUBTARGET),mt7622)
-include mt7622.mk
-endif
-
-ifeq ($(SUBTARGET),mt7623)
-include mt7623.mk
-endif
-
-ifeq ($(SUBTARGET),mt7629)
-include mt7629.mk
-endif
+include $(SUBTARGET).mk
 
 define Image/Build
        $(call Image/Build/$(1),$(1))