From 621fa91a8295b50dfdfac22290200064afaeec4e Mon Sep 17 00:00:00 2001 From: Mathias Kresin Date: Thu, 12 Jul 2018 06:29:43 +0200 Subject: [PATCH] ar71xx: move boards to tiny subtarget Move boards to the tiny subtarget which break the build if the kernel is set to "Optimize for performance". Signed-off-by: Mathias Kresin --- target/linux/ar71xx/generic/config-default | 2 -- target/linux/ar71xx/image/Makefile | 1 + target/linux/ar71xx/image/generic.mk | 33 ---------------------- target/linux/ar71xx/image/tiny.mk | 33 ++++++++++++++++++++++ target/linux/ar71xx/tiny/config-default | 2 ++ 5 files changed, 36 insertions(+), 35 deletions(-) create mode 100644 target/linux/ar71xx/image/tiny.mk diff --git a/target/linux/ar71xx/generic/config-default b/target/linux/ar71xx/generic/config-default index b7a7e4060da..7e137d76b47 100644 --- a/target/linux/ar71xx/generic/config-default +++ b/target/linux/ar71xx/generic/config-default @@ -35,7 +35,6 @@ CONFIG_ATH79_MACH_ARCHER_C60_V2=y CONFIG_ATH79_MACH_ARCHER_C7=y CONFIG_ATH79_MACH_ARDUINO_YUN=y CONFIG_ATH79_MACH_AW_NR580=y -CONFIG_ATH79_MACH_BHR_4GRV2=y CONFIG_ATH79_MACH_BHU_BXU2000N2_A=y CONFIG_ATH79_MACH_BSB=y CONFIG_ATH79_MACH_C55=y @@ -199,7 +198,6 @@ CONFIG_ATH79_MACH_WZR_HP_G300NH=y CONFIG_ATH79_MACH_WZR_HP_G300NH2=y CONFIG_ATH79_MACH_WZR_HP_G450H=y CONFIG_ATH79_MACH_XD3200=y -CONFIG_ATH79_MACH_ZBT_WE1526=y CONFIG_ATH79_MACH_ZCN_1523H=y CONFIG_ATH79_NVRAM=y CONFIG_ATH79_PCI_ATH9K_FIXUP=y diff --git a/target/linux/ar71xx/image/Makefile b/target/linux/ar71xx/image/Makefile index 1eaf1e457c8..c429eb39d9c 100644 --- a/target/linux/ar71xx/image/Makefile +++ b/target/linux/ar71xx/image/Makefile @@ -20,6 +20,7 @@ include ./generic-tp-link.mk include ./generic-ubnt.mk endif ifeq ($(SUBTARGET),tiny) +include ./tiny.mk include ./tiny-tp-link.mk include ./tiny-legacy-devices.mk endif diff --git a/target/linux/ar71xx/image/generic.mk b/target/linux/ar71xx/image/generic.mk index 613bec84263..0ff0850621e 100644 --- a/target/linux/ar71xx/image/generic.mk +++ b/target/linux/ar71xx/image/generic.mk @@ -16,14 +16,6 @@ define Build/append-string echo -n $(1) >> $@ endef -define Build/mkbuffaloimg - $(STAGING_DIR_HOST)/bin/mkbuffaloimg -B $(BOARDNAME) \ - -R $$(($(subst k, * 1024,$(ROOTFS_SIZE)))) \ - -K $$(($(subst k, * 1024,$(KERNEL_SIZE)))) \ - -i $@ -o $@.new - mv $@.new $@ -endef - define Build/mkwrggimg $(STAGING_DIR_HOST)/bin/mkwrggimg -b \ -i $@ -o $@.imghdr -d /dev/mtdblock/1 \ @@ -1190,19 +1182,6 @@ define Device/dap-2695-a1 endef TARGET_DEVICES += dap-2695-a1 -define Device/bhr-4grv2 - DEVICE_TITLE := Buffalo BHR-4GRV2 - BOARDNAME := BHR-4GRV2 - ROOTFS_SIZE := 14528k - KERNEL_SIZE := 1472k - IMAGE_SIZE := 16000k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) - IMAGES := sysupgrade.bin factory.bin - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) - IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | mkbuffaloimg -endef -TARGET_DEVICES += bhr-4grv2 - define Device/wam250 DEVICE_TITLE := Samsung WAM250 DEVICE_PACKAGES := kmod-usb-core kmod-usb2 -swconfig @@ -1294,18 +1273,6 @@ define Device/wrtnode2q endef TARGET_DEVICES += wrtnode2q -define Device/zbt-we1526 - DEVICE_TITLE := Zbtlink ZBT-WE1526 - DEVICE_PACKAGES := kmod-usb-core kmod-usb2 - BOARDNAME := ZBT-WE1526 - IMAGE_SIZE := 16000k - KERNEL_SIZE := 1472k - ROOTFS_SIZE := 14528k - MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) - IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) -endef -TARGET_DEVICES += zbt-we1526 - define Device/AVM DEVICE_PACKAGES := fritz-tffs -uboot-envtools KERNEL := kernel-bin | patch-cmdline | lzma | eva-image diff --git a/target/linux/ar71xx/image/tiny.mk b/target/linux/ar71xx/image/tiny.mk new file mode 100644 index 00000000000..d96a7cd92d0 --- /dev/null +++ b/target/linux/ar71xx/image/tiny.mk @@ -0,0 +1,33 @@ +define Build/mkbuffaloimg + $(STAGING_DIR_HOST)/bin/mkbuffaloimg -B $(BOARDNAME) \ + -R $$(($(subst k, * 1024,$(ROOTFS_SIZE)))) \ + -K $$(($(subst k, * 1024,$(KERNEL_SIZE)))) \ + -i $@ -o $@.new + mv $@.new $@ +endef + + +define Device/bhr-4grv2 + DEVICE_TITLE := Buffalo BHR-4GRV2 + BOARDNAME := BHR-4GRV2 + ROOTFS_SIZE := 14528k + KERNEL_SIZE := 1472k + IMAGE_SIZE := 16000k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) + IMAGES := sysupgrade.bin factory.bin + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-rootfs | pad-rootfs | mkbuffaloimg +endef +TARGET_DEVICES += bhr-4grv2 + +define Device/zbt-we1526 + DEVICE_TITLE := Zbtlink ZBT-WE1526 + DEVICE_PACKAGES := kmod-usb-core kmod-usb2 + BOARDNAME := ZBT-WE1526 + IMAGE_SIZE := 16000k + KERNEL_SIZE := 1472k + ROOTFS_SIZE := 14528k + MTDPARTS := spi0.0:256k(u-boot)ro,64k(u-boot-env)ro,14528k(rootfs),1472k(kernel),64k(art)ro,16000k@0x50000(firmware) + IMAGE/sysupgrade.bin := append-rootfs | pad-rootfs | pad-to $$$$(ROOTFS_SIZE) | append-kernel | check-size $$$$(IMAGE_SIZE) +endef +TARGET_DEVICES += zbt-we1526 \ No newline at end of file diff --git a/target/linux/ar71xx/tiny/config-default b/target/linux/ar71xx/tiny/config-default index 2e9031a24cb..c9368ec6a1c 100644 --- a/target/linux/ar71xx/tiny/config-default +++ b/target/linux/ar71xx/tiny/config-default @@ -8,6 +8,7 @@ CONFIG_ATH79_DEV_M25P80=y CONFIG_ATH79_DEV_SPI=y CONFIG_ATH79_DEV_USB=y CONFIG_ATH79_DEV_WMAC=y +CONFIG_ATH79_MACH_BHR_4GRV2=y CONFIG_ATH79_MACH_DIR_600_A1=y CONFIG_ATH79_MACH_DIR_615_C1=y CONFIG_ATH79_MACH_DIR_615_I1=y @@ -51,6 +52,7 @@ CONFIG_ATH79_MACH_WNR2000_V3=y CONFIG_ATH79_MACH_WNR2000_V4=y CONFIG_ATH79_MACH_WP543=y CONFIG_ATH79_MACH_WPE72=y +CONFIG_ATH79_MACH_ZBT_WE1526=y CONFIG_ATH79_NVRAM=y CONFIG_ATH79_PCI_ATH9K_FIXUP=y CONFIG_BLK_MQ_PCI=y -- 2.30.2