From 84ea696e031eb88f1f57700f24ca315fb2a3372c Mon Sep 17 00:00:00 2001
From: Jonas Gorski <jogo@openwrt.org>
Date: Mon, 18 Aug 2014 21:50:37 +0000
Subject: [PATCH] brcm63xx: move generic profiles to top dir and remove smp
 profiles
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Use generic profiles for brcm63xx instead of having similar profiles for
each subtarget.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Signed-off-by: Jonas Gorski <jogo@openwrt.org>

SVN-Revision: 42208
---
 .../{generic => }/profiles/100-Broadcom.mk    |  0
 .../{generic => }/profiles/101-Broadcom-wl.mk |  0
 .../{generic => }/profiles/102-Atheros.mk     |  0
 .../{generic => }/profiles/103-Ralink.mk      |  0
 .../{generic => }/profiles/104-No-WiFi.mk     |  0
 .../profiles/105-Broadcom-brcmsmac.mk         |  0
 .../{generic => }/profiles/200-GW6X00.mk      |  0
 .../{generic => }/profiles/201-Huawei.mk      |  0
 .../{generic => }/profiles/202-Sagemcom.mk    |  0
 .../brcm63xx/smp/profiles/100-Broadcom.mk     | 17 -----------------
 .../brcm63xx/smp/profiles/101-Broadcom-wl.mk  | 19 -------------------
 .../brcm63xx/smp/profiles/102-Atheros.mk      | 17 -----------------
 .../linux/brcm63xx/smp/profiles/103-Ralink.mk | 13 -------------
 .../brcm63xx/smp/profiles/104-No-WiFi.mk      | 17 -----------------
 .../smp/profiles/105-Broadcom-brcmsmac.mk     | 17 -----------------
 15 files changed, 100 deletions(-)
 rename target/linux/brcm63xx/{generic => }/profiles/100-Broadcom.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/101-Broadcom-wl.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/102-Atheros.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/103-Ralink.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/104-No-WiFi.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/105-Broadcom-brcmsmac.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/200-GW6X00.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/201-Huawei.mk (100%)
 rename target/linux/brcm63xx/{generic => }/profiles/202-Sagemcom.mk (100%)
 delete mode 100644 target/linux/brcm63xx/smp/profiles/100-Broadcom.mk
 delete mode 100644 target/linux/brcm63xx/smp/profiles/101-Broadcom-wl.mk
 delete mode 100644 target/linux/brcm63xx/smp/profiles/102-Atheros.mk
 delete mode 100644 target/linux/brcm63xx/smp/profiles/103-Ralink.mk
 delete mode 100644 target/linux/brcm63xx/smp/profiles/104-No-WiFi.mk
 delete mode 100644 target/linux/brcm63xx/smp/profiles/105-Broadcom-brcmsmac.mk

diff --git a/target/linux/brcm63xx/generic/profiles/100-Broadcom.mk b/target/linux/brcm63xx/profiles/100-Broadcom.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/100-Broadcom.mk
rename to target/linux/brcm63xx/profiles/100-Broadcom.mk
diff --git a/target/linux/brcm63xx/generic/profiles/101-Broadcom-wl.mk b/target/linux/brcm63xx/profiles/101-Broadcom-wl.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/101-Broadcom-wl.mk
rename to target/linux/brcm63xx/profiles/101-Broadcom-wl.mk
diff --git a/target/linux/brcm63xx/generic/profiles/102-Atheros.mk b/target/linux/brcm63xx/profiles/102-Atheros.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/102-Atheros.mk
rename to target/linux/brcm63xx/profiles/102-Atheros.mk
diff --git a/target/linux/brcm63xx/generic/profiles/103-Ralink.mk b/target/linux/brcm63xx/profiles/103-Ralink.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/103-Ralink.mk
rename to target/linux/brcm63xx/profiles/103-Ralink.mk
diff --git a/target/linux/brcm63xx/generic/profiles/104-No-WiFi.mk b/target/linux/brcm63xx/profiles/104-No-WiFi.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/104-No-WiFi.mk
rename to target/linux/brcm63xx/profiles/104-No-WiFi.mk
diff --git a/target/linux/brcm63xx/generic/profiles/105-Broadcom-brcmsmac.mk b/target/linux/brcm63xx/profiles/105-Broadcom-brcmsmac.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/105-Broadcom-brcmsmac.mk
rename to target/linux/brcm63xx/profiles/105-Broadcom-brcmsmac.mk
diff --git a/target/linux/brcm63xx/generic/profiles/200-GW6X00.mk b/target/linux/brcm63xx/profiles/200-GW6X00.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/200-GW6X00.mk
rename to target/linux/brcm63xx/profiles/200-GW6X00.mk
diff --git a/target/linux/brcm63xx/generic/profiles/201-Huawei.mk b/target/linux/brcm63xx/profiles/201-Huawei.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/201-Huawei.mk
rename to target/linux/brcm63xx/profiles/201-Huawei.mk
diff --git a/target/linux/brcm63xx/generic/profiles/202-Sagemcom.mk b/target/linux/brcm63xx/profiles/202-Sagemcom.mk
similarity index 100%
rename from target/linux/brcm63xx/generic/profiles/202-Sagemcom.mk
rename to target/linux/brcm63xx/profiles/202-Sagemcom.mk
diff --git a/target/linux/brcm63xx/smp/profiles/100-Broadcom.mk b/target/linux/brcm63xx/smp/profiles/100-Broadcom.mk
deleted file mode 100644
index bc68f14937..0000000000
--- a/target/linux/brcm63xx/smp/profiles/100-Broadcom.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Broadcom
-  NAME:=Broadcom WiFi (default)
-  PACKAGES:=kmod-b43 wpad-mini
-endef
-
-define Profile/Broadcom/Description
-	Package set compatible with hardware using Broadcom WiFi cards
-endef
-$(eval $(call Profile,Broadcom))
-
diff --git a/target/linux/brcm63xx/smp/profiles/101-Broadcom-wl.mk b/target/linux/brcm63xx/smp/profiles/101-Broadcom-wl.mk
deleted file mode 100644
index 4f2d605eb7..0000000000
--- a/target/linux/brcm63xx/smp/profiles/101-Broadcom-wl.mk
+++ /dev/null
@@ -1,19 +0,0 @@
-#
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Broadcom-wl
-  NAME:=Broadcom BCM43xx WiFi (wl, proprietary)
-  PACKAGES:= kmod-brcm-wl wlc nas
-endef
-
-define Profile/Broadcom-wl/Description
-	Package set compatible with hardware using Broadcom BCM43xx cards
-	using the proprietary broadcom wireless "wl" driver.
-endef
-
-$(eval $(call Profile,Broadcom-wl))
-
diff --git a/target/linux/brcm63xx/smp/profiles/102-Atheros.mk b/target/linux/brcm63xx/smp/profiles/102-Atheros.mk
deleted file mode 100644
index b214185c5d..0000000000
--- a/target/linux/brcm63xx/smp/profiles/102-Atheros.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Atheros
-  NAME:=Atheros WiFi (default)
-  PACKAGES:=kmod-ath5k kmod-ath9k wpad-mini
-endef
-
-define Profile/Atheros/Description
-	Package set compatible with hardware using Atheros WiFi cards
-endef
-$(eval $(call Profile,Atheros))
-
diff --git a/target/linux/brcm63xx/smp/profiles/103-Ralink.mk b/target/linux/brcm63xx/smp/profiles/103-Ralink.mk
deleted file mode 100644
index 412c5a45ad..0000000000
--- a/target/linux/brcm63xx/smp/profiles/103-Ralink.mk
+++ /dev/null
@@ -1,13 +0,0 @@
-#
-# Copyright (C) 2006 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Ralink
-  NAME:=Ralink WiFi
-  PACKAGES:=kmod-rt61-pci wpad-mini
-endef
-$(eval $(call Profile,Ralink))
-
diff --git a/target/linux/brcm63xx/smp/profiles/104-No-WiFi.mk b/target/linux/brcm63xx/smp/profiles/104-No-WiFi.mk
deleted file mode 100644
index 0f5ec37cf6..0000000000
--- a/target/linux/brcm63xx/smp/profiles/104-No-WiFi.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2009 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/NoWiFi
-  NAME:=No WiFi
-  PACKAGES:=
-endef
-
-define Profile/NoWiFi/description
-  Package set compatible with BCM63xx routers without Wi-Fi.
-endef
-
-$(eval $(call Profile,NoWiFi))
diff --git a/target/linux/brcm63xx/smp/profiles/105-Broadcom-brcmsmac.mk b/target/linux/brcm63xx/smp/profiles/105-Broadcom-brcmsmac.mk
deleted file mode 100644
index bb558d1390..0000000000
--- a/target/linux/brcm63xx/smp/profiles/105-Broadcom-brcmsmac.mk
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# Copyright (C) 2012 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-
-define Profile/Broadcom-brcmsmac
-  NAME:=Broadcom WiFi (brcmsmac)
-  PACKAGES:=kmod-brcmsmac wpad-mini
-endef
-
-define Profile/Broadcom-brcmsmac/Description
-	Package set compatible with hardware using Broadcom WiFi cards
-endef
-$(eval $(call Profile,Broadcom-brcmsmac))
-
-- 
GitLab