brcm47xx: use proper region code in image name

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

diff --git a/target/linux/ipq806x/image/Makefile b/target/linux/ipq806x/image/Makefile
index f67e6b23efcc8ca8c2c4a2f142e15b46d8047fd8..aeea04cefd235f2eb7ab0840a9bc46531d1f3282 100644 (file)
--- a/target/linux/ipq806x/image/Makefile
+++ b/target/linux/ipq806x/image/Makefile
@@ -6,11 +6,11 @@ include $(INCLUDE_DIR)/image.mk
 UBIFS_OPTS = -m 2048 -e 124KiB -c 4096 -U -F
 
 define Image/Prepare
-       $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/$(IMG_PREFIX)-vmlinux.elf
+       $(CP) $(LINUX_DIR)/vmlinux $(KDIR)/vmlinux-unstripped.elf
 endef
 
 define Image/BuildKernel
-       $(CP) $(KDIR)/$(IMG_PREFIX)-vmlinux.elf $(BIN_DIR)
+       $(CP) $(KDIR)/vmlinux-unstripped.elf $(BIN_DIR)/$(IMG_PREFIX)-vmlinux.elf
 endef
 
 define Image/Build/squashfs
@@ -79,12 +79,12 @@ define Device/TpSafeImage
        KERNEL_SUFFIX := -uImage
        KERNEL = kernel-bin | append-dtb | uImage none
        KERNEL_NAME := zImage
-       TPLINK_BOARD_NAME :=
+       TPLINK_BOARD_ID :=
        IMAGES := factory.bin sysupgrade.bin
        IMAGE/factory.bin := append-rootfs | tplink-safeloader factory
        IMAGE/sysupgrade.bin := append-rootfs | tplink-safeloader sysupgrade | append-metadata
 endef
-DEVICE_VARS += TPLINK_BOARD_NAME
+DEVICE_VARS += TPLINK_BOARD_ID
 
 define Device/ZyXELImage
        PROFILES += $$(DEVICE_NAME)
@@ -102,6 +102,7 @@ define Device/AP148
        $(call Device/FitImage)
        $(call Device/UbiFit)
        DEVICE_DTS := qcom-ipq8064-ap148
+       KERNEL_INSTALL := 1
        BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := ap148
@@ -126,7 +127,7 @@ define Device/C2600
        BLOCKSIZE := 128k
        PAGESIZE := 2048
        BOARD_NAME := c2600
-       TPLINK_BOARD_NAME := C2600
+       TPLINK_BOARD_ID := C2600
        DEVICE_TITLE := TP-Link Archer C2600
        DEVICE_PACKAGES := ath10k-firmware-qca99x0
 endef
@@ -181,7 +182,7 @@ define Device/FRITZ4040
        IMAGE_SIZE := 29753344
        IMAGES = sysupgrade.bin
        IMAGE/sysupgrade.bin := append-kernel | append-rootfs | pad-rootfs | append-metadata
-       DEVICE_PACKAGES := kmod-usb-phy-qcom-ipq4019 ipq-wifi-fritz4040 fritz-tools u-boot-fritz4040
+       DEVICE_PACKAGES := kmod-usb-phy-qcom-ipq4019 ipq-wifi-fritz4040 fritz-tffs fritz-caldata u-boot-fritz4040
 endef
 
 define Device/R7500
@@ -229,7 +230,7 @@ define Device/NBG6817
        BLOCKSIZE := 64k
        BOARD_NAME := nbg6817
        DEVICE_TITLE := ZyXEL NBG6817
-       DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs losetup
+       DEVICE_PACKAGES := ath10k-firmware-qca9984 e2fsprogs kmod-fs-ext4 losetup
        $(call Device/ZyXELImage)
 endef
 
@@ -250,7 +251,36 @@ define Device/VR2600v
        IMAGE/sysupgrade.bin := pad-extra 512 | append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
 endef
 
+define Device/AP-DK01.1-C1
+       PROFILES += $$(DEVICE_NAME)
+       DEVICE_TITLE := QCA AP-DK01.1-C1
+       BOARD_NAME := ap-dk01.1-c1
+       DEVICE_DTS := qcom-ipq4019-ap.dk01.1-c1
+       KERNEL_LOADADDR := 0x80208000
+       KERNEL_INSTALL := 1
+       KERNEL_SIZE := 4096k
+       IMAGE_SIZE := 26624k
+       FILESYSTEMS := squashfs
+       $(call Device/FitImage)
+       IMAGES := sysupgrade.bin
+       IMAGE/sysupgrade.bin := append-kernel | pad-to $$$${KERNEL_SIZE} | append-rootfs | pad-rootfs | append-metadata
+       DEVICE_PACKAGES := ath10k-firmware-qca4019
+endef
+
+define Device/AP-DK04.1-C1
+       $(call Device/FitImage)
+       $(call Device/UbiFit)
+       DEVICE_DTS := qcom-ipq4019-ap.dk04.1-c1
+       KERNEL_LOADADDR := 0x80208000
+       KERNEL_INSTALL := 1
+       KERNEL_SIZE := 4048k
+       BLOCKSIZE := 128k
+       PAGESIZE := 2048
+       BOARD_NAME := ap-dk04.1-c1
+       DEVICE_TITLE := QCA AP-DK04.1-C1
+endef
+
 TARGET_DEVICES += AP148 AP148-legacy C2600 D7800 DB149 EA8500 FRITZ4040 R7500 \
-                 R7500v2 R7800 NBG6817 VR2600v
+                 R7500v2 R7800 NBG6817 VR2600v AP-DK01.1-C1 AP-DK04.1-C1
 
 $(eval $(call BuildImage))