mpc85xx: unify wrapper address of simple image devices

The wrapper address of simple image devices should have been changed
at commit 6a8b831 , but only TL-WDR4900 and BR200-WP are changed at
that time, and now the wrapper address changes are split among patches
for specific devices. More importantly, commit 6a8b831 forgot to
change Enterasys WS-AP3715i, causing
https://github.com/openwrt/openwrt/issues/23112 .

This commit will gather the change of wrapper address of simple image
devices into a dedicated patch file.

Tested: Both WS-AP3715i and TL-WDR4900 v1 boot well.

Fixes: https://github.com/openwrt/openwrt/issues/23112
Signed-off-by: Edward Chow <equu@openmail.cc>
Link: https://github.com/openwrt/openwrt/pull/23121
Signed-off-by: Robert Marko <robimarko@gmail.com>

diff --git a/target/linux/mpc85xx/patches-6.12/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch b/target/linux/mpc85xx/patches-6.12/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch
new file mode 100644 (file)
index 0000000..8888121
--- /dev/null
+++ b/target/linux/mpc85xx/patches-6.12/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -351,6 +351,7 @@ adder875-redboot)
+ simpleboot-*)
+     platformo="$object/fixed-head.o $object/simpleboot.o"
+     binary=y
++    link_address='0x1500000'
+     ;;
+ asp834x-redboot)
+     platformo="$object/fixed-head.o $object/redboot-83xx.o"

diff --git a/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch
index 1ff6a981f099d8ea14d0b1970657a6491c17befe..8412f653bef4a5115f1b8b0512038445db261807 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch
+++ b/target/linux/mpc85xx/patches-6.12/100-powerpc-85xx-tl-wdr4900-v1-support.patch
@@ -12,10 +12,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
 ---
  arch/powerpc/boot/Makefile           |  3 ++-
- arch/powerpc/boot/wrapper            |  5 +++++
  arch/powerpc/platforms/85xx/Kconfig  | 12 ++++++++++++
  arch/powerpc/platforms/85xx/Makefile |  1 +
- 4 files changed, 20 insertions(+), 1 deletion(-)
+ 4 files changed, 15 insertions(+), 1 deletion(-)
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
@@ -36,20 +35,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,11 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/simpleboot.o"
-+    link_address='0x1500000'
-+    binary=y
-+    ;;
- simpleboot-*)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     binary=y
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -176,6 +176,18 @@ config STX_GP3

diff --git a/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch
index 79b9da4821dbb1f8f01e3076ffeb775b434ac168..f8ff82921e455c184c29fa970ca018639d1ce943 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch
+++ b/target/linux/mpc85xx/patches-6.12/101-powerpc-85xx-hiveap-330-support.patch
@@ -46,13 +46,3 @@
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,7 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-hiveap-330|\
- simpleboot-tl-wdr4900-v1)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     link_address='0x1500000'

diff --git a/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch
index 98c865f37d7d263ff2bd169ba871b5aa874faf59..bef2052b1f4f0636be452e9cbbce37cdda0f3977 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch
+++ b/target/linux/mpc85xx/patches-6.12/106-powerpc-85xx-ws-ap3710i-support.patch
@@ -46,15 +46,3 @@
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -349,7 +349,8 @@ adder875-redboot)
-     binary=y
-     ;;
- simpleboot-hiveap-330|\
--simpleboot-tl-wdr4900-v1)
-+simpleboot-tl-wdr4900-v1|\
-+simpleboot-ws-ap3710i)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     link_address='0x1500000'
-     binary=y

diff --git a/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch
index e53d0db8ee2496c513ae2cba3ee4179a22a6da89..4abc4da44cacde3e58b48e01259d6ba462e9138f 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch
+++ b/target/linux/mpc85xx/patches-6.12/107-powerpc-85xx-add-ws-ap3825i-support.patch
@@ -55,8 +55,8 @@ WS-AP3825i AP.
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -355,6 +355,11 @@ simpleboot-ws-ap3710i)
-     link_address='0x1500000'
+@@ -348,6 +348,11 @@ adder875-redboot)
+     platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;
 +simpleboot-ws-ap3825i)

diff --git a/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch b/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch
index a50e28bdcfa392060764ec0f724383e031edd985..cdbe4c34141c2a483fb54d986331cebfa5ef9069 100644 (file)
--- a/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch
+++ b/target/linux/mpc85xx/patches-6.12/110-powerpc-85xx-br200-wp-support.patch
@@ -45,13 +45,3 @@
  image-$(CONFIG_HIVEAP_330)            += simpleImage.hiveap-330
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  image-$(CONFIG_WS_AP3710I)            += simpleImage.ws-ap3710i
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,7 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-br200-wp|\
- simpleboot-hiveap-330|\
- simpleboot-tl-wdr4900-v1|\
- simpleboot-ws-ap3710i)

diff --git a/target/linux/mpc85xx/patches-6.18/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch b/target/linux/mpc85xx/patches-6.18/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch
new file mode 100644 (file)
index 0000000..b49d1bf
--- /dev/null
+++ b/target/linux/mpc85xx/patches-6.18/099-mpc85xx-p1010-change-wrapper-address-of-simple-image-devices.patch
@@ -0,0 +1,10 @@
+--- a/arch/powerpc/boot/wrapper
++++ b/arch/powerpc/boot/wrapper
+@@ -342,6 +342,7 @@ adder875-redboot)
+ simpleboot-*)
+     platformo="$object/fixed-head.o $object/simpleboot.o"
+     binary=y
++    link_address='0x1500000'
+     ;;
+ asp834x-redboot)
+     platformo="$object/fixed-head.o $object/redboot-83xx.o"

diff --git a/target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch b/target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch
index 237aa0e8c921bb1d435db81bb0ede8fe50cf6ebf..0e1a71ea5e899d4c2ab4f1b253dfd60eb75f55cc 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/100-powerpc-85xx-tl-wdr4900-v1-support.patch
@@ -12,10 +12,9 @@ Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
 Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
 ---
  arch/powerpc/boot/Makefile           |  3 ++-
- arch/powerpc/boot/wrapper            |  5 +++++
  arch/powerpc/platforms/85xx/Kconfig  | 12 ++++++++++++
  arch/powerpc/platforms/85xx/Makefile |  1 +
- 4 files changed, 20 insertions(+), 1 deletion(-)
+ 4 files changed, 15 insertions(+), 1 deletion(-)
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
@@ -36,20 +35,6 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -339,6 +339,11 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-tl-wdr4900-v1)
-+    platformo="$object/fixed-head.o $object/simpleboot.o"
-+    link_address='0x1500000'
-+    binary=y
-+    ;;
- simpleboot-*)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     binary=y
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -155,6 +155,18 @@ config STX_GP3

diff --git a/target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch b/target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch
index cc0569abc942c0eed76508671fa8ae481943bb65..24f4f6e6984b009e4447eac9a1f42f6a915a408d 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/101-powerpc-85xx-hiveap-330-support.patch
@@ -46,13 +46,3 @@
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -339,6 +339,7 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-hiveap-330|\
- simpleboot-tl-wdr4900-v1)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     link_address='0x1500000'

diff --git a/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch b/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch
index 0f0c0f8f2ff9ac421748f8f048d214411cdc7f37..6148027759c0e9c2cf52a03121997edf12dfe761 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/106-powerpc-85xx-ws-ap3710i-support.patch
@@ -46,15 +46,3 @@
  # Board ports in arch/powerpc/platform/86xx/Kconfig
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
  
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -340,7 +340,8 @@ adder875-redboot)
-     binary=y
-     ;;
- simpleboot-hiveap-330|\
--simpleboot-tl-wdr4900-v1)
-+simpleboot-tl-wdr4900-v1|\
-+simpleboot-ws-ap3710i)
-     platformo="$object/fixed-head.o $object/simpleboot.o"
-     link_address='0x1500000'
-     binary=y

diff --git a/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch b/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch
index 97e96526014b658503d93136b45ebe385dd09fea..f4893013fc5e83fc713828252df94ffb6fdab396 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/107-powerpc-85xx-add-ws-ap3825i-support.patch
@@ -55,8 +55,8 @@ WS-AP3825i AP.
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -346,6 +346,11 @@ simpleboot-ws-ap3710i)
-     link_address='0x1500000'
+@@ -339,6 +339,11 @@ adder875-redboot)
+     platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;
 +simpleboot-ws-ap3825i)

diff --git a/target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch b/target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch
index 8f0a176caa9912a53964434f33485fae4dc30520..3e7ed53ba7a9207ece46c17700fd2a1e942bfd1e 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/110-powerpc-85xx-br200-wp-support.patch
@@ -45,13 +45,3 @@
  image-$(CONFIG_HIVEAP_330)            += simpleImage.hiveap-330
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  image-$(CONFIG_WS_AP3710I)            += simpleImage.ws-ap3710i
---- a/arch/powerpc/boot/wrapper
-+++ b/arch/powerpc/boot/wrapper
-@@ -339,6 +339,7 @@ adder875-redboot)
-     platformo="$object/fixed-head.o $object/redboot-8xx.o"
-     binary=y
-     ;;
-+simpleboot-br200-wp|\
- simpleboot-hiveap-330|\
- simpleboot-tl-wdr4900-v1|\
- simpleboot-ws-ap3710i)