From 0f12f329966e064bd0eda38f36d1a1c0bf25693f Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 11 May 2016 12:21:45 +0200 Subject: [PATCH] ramips: convert mt7628 to new image building code Signed-off-by: John Crispin --- target/linux/ramips/image/mt7628.mk | 28 +++++++++++++------ .../ramips/mt7628/profiles/00-default.mk | 4 +-- target/linux/ramips/mt7628/profiles/xiaomi.mk | 18 ------------ 3 files changed, 20 insertions(+), 30 deletions(-) delete mode 100644 target/linux/ramips/mt7628/profiles/xiaomi.mk diff --git a/target/linux/ramips/image/mt7628.mk b/target/linux/ramips/image/mt7628.mk index 1e6b06c82c..8274e11f17 100644 --- a/target/linux/ramips/image/mt7628.mk +++ b/target/linux/ramips/image/mt7628.mk @@ -2,16 +2,26 @@ # MT7628 Profiles # -Image/Build/Profile/MIWIFI-NANO=$(call BuildFirmware/Default16M/$(1),$(1),miwifi-nano,MIWIFI-NANO) -Image/Build/Profile/MT7628=$(call BuildFirmware/Default4M/$(1),$(1),mt7628,MT7628) -Image/Build/Profile/WRTNODE2P=$(call BuildFirmware/Default16M/$(1),$(1),wrtnode2p,WRTNODE2P) +define Device/mt7628 + DTS := MT7628 + IMAGE_SIZE := $(ralink_default_fw_size_4M) + DEVICE_TITLE := MediaTek MT7628 EVB + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev +endef +TARGET_DEVICES += mt7628 -define Image/Build/Profile/Default - $(call Image/Build/Profile/MIWIFI-NANO,$(1)) - $(call Image/Build/Profile/MT7628,$(1)) - $(call Image/Build/Profile/WRTNODE2P,$(1)) +define Device/miwifi-nano + DTS := MIWIFI-NANO + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := Xiaomi MiWiFi Nano + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev endef +TARGET_DEVICES += miwifi-nano -define Image/Build/Profile/MiwifiNano - $(call Image/Build/Profile/MIWIFI-NANO,$(1)) +define Device/wrtnode2p + DTS := WRTNODE2P + IMAGE_SIZE := $(ralink_default_fw_size_16M) + DEVICE_TITLE := WRTnode 2P + DEVICE_PACKAGES := kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev endef +TARGET_DEVICES += wrtnode2p diff --git a/target/linux/ramips/mt7628/profiles/00-default.mk b/target/linux/ramips/mt7628/profiles/00-default.mk index 6c7d721444..55a85a69e9 100644 --- a/target/linux/ramips/mt7628/profiles/00-default.mk +++ b/target/linux/ramips/mt7628/profiles/00-default.mk @@ -7,9 +7,7 @@ define Profile/Default NAME:=Default Profile - PACKAGES:=\ - kmod-usb-core kmod-usb2 kmod-usb-ohci \ - kmod-ledtrig-usbdev + PACKAGES:= kmod-usb-core kmod-usb2 kmod-usb-ohci kmod-ledtrig-usbdev endef define Profile/Default/Description diff --git a/target/linux/ramips/mt7628/profiles/xiaomi.mk b/target/linux/ramips/mt7628/profiles/xiaomi.mk deleted file mode 100644 index 18e53c44b7..0000000000 --- a/target/linux/ramips/mt7628/profiles/xiaomi.mk +++ /dev/null @@ -1,18 +0,0 @@ -# -# Copyright (C) 2011 OpenWrt.org -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -define Profile/MiwifiNano - NAME:=Xiaomi MiWiFi Nano - PACKAGES:=\ - kmod-usb-core kmod-usb2 kmod-usb-ohci \ - kmod-ledtrig-usbdev -endef - -define Profile/Default/Description - Image for Xiaomi MiWiFi Nano -endef -$(eval $(call Profile,MiwifiNano)) -- 2.30.2