From cd751b8b9e660d2c5153a4c7ec0d603c19ec4833 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 11 Oct 2015 20:56:53 +0200 Subject: [PATCH] Revert "ar71xx: remove WZR-600DHP from Buffalo WZR-HP-AG300H/WZR-600DHP model name string for now" This reverts commit 8ad3c88179734bf399f92daba927163122aa678a. --- ...WZR-600DHP-model-name-string-for-now.patch | 31 ------------------- targets/ar71xx-generic/profiles.mk | 4 +-- 2 files changed, 2 insertions(+), 33 deletions(-) delete mode 100644 patches/openwrt/0027-ar71xx-remove-WZR-600DHP-from-Buffalo-WZR-HP-AG300H-WZR-600DHP-model-name-string-for-now.patch diff --git a/patches/openwrt/0027-ar71xx-remove-WZR-600DHP-from-Buffalo-WZR-HP-AG300H-WZR-600DHP-model-name-string-for-now.patch b/patches/openwrt/0027-ar71xx-remove-WZR-600DHP-from-Buffalo-WZR-HP-AG300H-WZR-600DHP-model-name-string-for-now.patch deleted file mode 100644 index 3085dc79..00000000 --- a/patches/openwrt/0027-ar71xx-remove-WZR-600DHP-from-Buffalo-WZR-HP-AG300H-WZR-600DHP-model-name-string-for-now.patch +++ /dev/null @@ -1,31 +0,0 @@ -From: Matthias Schiffer -Date: Sun, 11 Oct 2015 20:27:28 +0200 -Subject: ar71xx: remove WZR-600DHP from Buffalo WZR-HP-AG300H/WZR-600DHP model name string for now - -We can't use the same image for these two devices, so as a workaround, -remove ZR-600DHP from the name for now, so the autoupdater can work and -users aren't confused. - -diff --git a/target/linux/ar71xx/base-files/lib/ar71xx.sh b/target/linux/ar71xx/base-files/lib/ar71xx.sh -index e1d03ea..1e50b5f 100755 ---- a/target/linux/ar71xx/base-files/lib/ar71xx.sh -+++ b/target/linux/ar71xx/base-files/lib/ar71xx.sh -@@ -886,7 +886,7 @@ ar71xx_board_detect() { - *"WZR-450HP2") - name="wzr-450hp2" - ;; -- *"WZR-HP-AG300H/WZR-600DHP") -+ *"WZR-HP-AG300H") - name="wzr-hp-ag300h" - ;; - *WZR-HP-G300NH) -diff --git a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c -index edd48f2..a016a3d 100644 ---- a/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c -+++ b/target/linux/ar71xx/files/arch/mips/ath79/mach-wzr-hp-ag300h.c -@@ -202,4 +202,4 @@ static void __init wzrhpag300h_setup(void) - } - - MIPS_MACHINE(ATH79_MACH_WZR_HP_AG300H, "WZR-HP-AG300H", -- "Buffalo WZR-HP-AG300H/WZR-600DHP", wzrhpag300h_setup); -+ "Buffalo WZR-HP-AG300H", wzrhpag300h_setup); diff --git a/targets/ar71xx-generic/profiles.mk b/targets/ar71xx-generic/profiles.mk index 09260745..7ea0590d 100644 --- a/targets/ar71xx-generic/profiles.mk +++ b/targets/ar71xx-generic/profiles.mk @@ -183,9 +183,9 @@ $(eval $(call GluonModel,WRT160NL,wrt160nl,linksys-wrt160nl)) $(eval $(call GluonProfile,WZRHPG450H)) $(eval $(call GluonModel,WZRHPG450H,wzr-hp-g450h,buffalo-wzr-hp-g450h)) -# WZR-HP-AG300H +# WZR-HP-AG300H/WZR-600DHP $(eval $(call GluonProfile,WZRHPAG300H)) -$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h,buffalo-wzr-hp-ag300h)) +$(eval $(call GluonModel,WZRHPAG300H,wzr-hp-ag300h,buffalo-wzr-hp-ag300h-wzr-600dhp)) # WHR-HP-G300N $(eval $(call GluonProfile,WHRHPG300N))