mpc85xx: 6.18: refresh patches

Refresh patches for the 6.18 kernel.

Link: https://github.com/openwrt/openwrt/pull/22732
Signed-off-by: Nick Hainke <vincent@systemli.org>

diff --git a/target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch b/target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
index 9e3f57f066d8c5fec930fb4aa88ddbb8b2a2b178..6cb7422a91c699041a1e22dfb842890d053e698f 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
+++ b/target/linux/mpc85xx/patches-6.18/010-powerpc-add-compressed-zImage-for-mpc85xx.patch
@@ -23,8 +23,8 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 +src-plat-$(CONFIG_PPC_ZIMAGE_LA3000000) += fixed-head.S
  src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
- src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
-@@ -332,6 +333,7 @@ image-$(CONFIG_MPC834x_ITX)                += cuImage.
+ src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
+@@ -329,6 +330,7 @@ image-$(CONFIG_MPC834x_ITX)                += cuImage.
  image-$(CONFIG_ASP834x)                       += dtbImage.asp834x-redboot
  
  # Board ports in arch/powerpc/platform/85xx/Kconfig
@@ -34,7 +34,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
                                           cuImage.mpc8572ds
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -256,6 +256,11 @@ if [ -n "$esm_blob" -a "$platform" != "p
+@@ -252,6 +252,11 @@ if [ -n "$esm_blob" -a "$platform" != "p
  fi
  
  case "$platform" in

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 1ff6a981f099d8ea14d0b1970657a6491c17befe..237aa0e8c921bb1d435db81bb0ede8fe50cf6ebf 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
@@ -19,15 +19,15 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -177,6 +177,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie
+@@ -176,6 +176,7 @@ src-plat-$(CONFIG_PPC_ZIMAGE_LA3000000)
+ src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
- src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
 +src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
  
  src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
  
-@@ -343,7 +344,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
+@@ -340,7 +341,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
  image-$(CONFIG_TQM8555)                       += cuImage.tqm8555
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
@@ -38,7 +38,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,11 @@ adder875-redboot)
+@@ -339,6 +339,11 @@ adder875-redboot)
      platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;
@@ -52,7 +52,7 @@ Signed-off-by: Pawel Dembicki <paweldembicki@gmail.com>
      binary=y
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -176,6 +176,18 @@ config STX_GP3
+@@ -155,6 +155,18 @@ config STX_GP3
        select CPM2
        select DEFAULT_UIMAGE
  

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 79b9da4821dbb1f8f01e3076ffeb775b434ac168..cc0569abc942c0eed76508671fa8ae481943bb65 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
@@ -5,18 +5,18 @@
          Manufacturer : Freescale Semiconductor, Inc
  
 +config HIVEAP_330
-+    bool "Aerohive HiveAP-330"
-+    select DEFAULT_UIMAGE
-+    select ARCH_REQUIRE_GPIOLIB
-+    select GPIO_MPC8XXX
-+    help
-+      This option enables support for the Aerohive HiveAP-330 board.
++      bool "Aerohive HiveAP-330"
++      select DEFAULT_UIMAGE
++      select ARCH_REQUIRE_GPIOLIB
++      select GPIO_MPC8XXX
++      help
++        This option enables support for the Aerohive HiveAP-330 board.
 +
-+      This board is a Concurrent Dual-Band wireless access point with a
-+      Freescale P1020 SoC.
++        This board is a Concurrent Dual-Band wireless access point with a
++        Freescale P1020 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile
@@ -30,15 +30,15 @@
  obj-$(CONFIG_MPC85xx_DS)  += mpc85xx_ds.o $(obj8259-y)
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -177,6 +177,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie
+@@ -176,6 +176,7 @@ src-plat-$(CONFIG_PPC_ZIMAGE_LA3000000)
+ src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
- src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
 +src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
  
  src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
-@@ -344,6 +345,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
+@@ -341,6 +342,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
  image-$(CONFIG_TQM8555)                       += cuImage.tqm8555
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
@@ -48,7 +48,7 @@
  image-$(CONFIG_MVME7100)                += dtbImage.mvme7100
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,7 @@ adder875-redboot)
+@@ -339,6 +339,7 @@ adder875-redboot)
      platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;

diff --git a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
index e7fb4bcd1b64c309497c0bd72691ada515b57203..2fe98ff9ad306089a229e28b091a9dbfb931331e 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
+++ b/target/linux/mpc85xx/patches-6.18/102-powerpc-add-cmdline-override.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/Kconfig
 +++ b/arch/powerpc/Kconfig
-@@ -1001,6 +1001,14 @@ config CMDLINE_FORCE
+@@ -1017,6 +1017,14 @@ config CMDLINE_FORCE
  
  endchoice
  
@@ -17,7 +17,7 @@
        help
 --- a/drivers/of/fdt.c
 +++ b/drivers/of/fdt.c
-@@ -1053,6 +1053,17 @@ int __init early_init_dt_scan_chosen(cha
+@@ -1120,6 +1120,17 @@ int __init early_init_dt_scan_chosen(cha
        if (p != NULL && l > 0)
                strlcat(cmdline, p, min_t(int, strlen(cmdline) + (int)l, COMMAND_LINE_SIZE));
  

diff --git a/target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch b/target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch
index 551f306e562eaa803c756d5d114a30821c4d5574..cf05793877d820550812001532fa4c772bc027c0 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch
+++ b/target/linux/mpc85xx/patches-6.18/103-powerpc-85xx-red-15w-rev1.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -179,6 +179,16 @@ config XES_MPC85xx
+@@ -158,6 +158,16 @@ config XES_MPC85xx
          Manufacturer: Extreme Engineering Solutions, Inc.
          URL: <https://www.xes-inc.com/>
  

diff --git a/target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch b/target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch
index e463c495399461137d53889fcaad60f37d61b90c..13d168ad3f8883d73ac7e8e836264fda8df7deb2 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/105-powerpc-85xx-panda-support.patch
@@ -1,8 +1,8 @@
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
 @@ -51,6 +51,17 @@ config HIVEAP_330
-       This board is a Concurrent Dual-Band wireless access point with a
-       Freescale P1020 SoC.
+         This board is a Concurrent Dual-Band wireless access point with a
+         Freescale P1020 SoC.
  
 +config PANDA
 +      bool "OCEDO PANDA"
@@ -15,8 +15,8 @@
 +        This board is a Concurrent Dual-Band wireless access point with a
 +        Freescale P1020 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile

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 98c865f37d7d263ff2bd169ba871b5aa874faf59..0f0c0f8f2ff9ac421748f8f048d214411cdc7f37 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
@@ -15,8 +15,8 @@
 +        This board is a Concurrent Dual-Band wireless access point with a
 +        Freescale P1020 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile
@@ -30,7 +30,7 @@
  obj-$(CONFIG_RED_15W_REV1)    += red15w_rev1.o
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -179,6 +179,7 @@ src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) +=
+@@ -178,6 +178,7 @@ src-plat-$(CONFIG_PPC_POWERNV) += pserie
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
  src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
@@ -38,7 +38,7 @@
  
  src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
  
-@@ -347,6 +348,7 @@ image-$(CONFIG_TQM8560)                    += cuImage.tqm
+@@ -344,6 +345,7 @@ image-$(CONFIG_TQM8560)                    += cuImage.tqm
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
  image-$(CONFIG_HIVEAP_330)            += simpleImage.hiveap-330
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
@@ -48,7 +48,7 @@
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -349,7 +349,8 @@ adder875-redboot)
+@@ -340,7 +340,8 @@ adder875-redboot)
      binary=y
      ;;
  simpleboot-hiveap-330|\

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 e53d0db8ee2496c513ae2cba3ee4179a22a6da89..97e96526014b658503d93136b45ebe385dd09fea 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
@@ -22,8 +22,8 @@ WS-AP3825i AP.
 +        This board is a Concurrent Dual-Band wireless access point with a
 +        Freescale P1020 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile
@@ -37,7 +37,7 @@ WS-AP3825i AP.
  obj-$(CONFIG_RED_15W_REV1)    += red15w_rev1.o
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -180,6 +180,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h
+@@ -179,6 +179,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h
  src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_WS_AP3710I) += simpleboot.c fixed-head.S
@@ -45,7 +45,7 @@ WS-AP3825i AP.
  
  src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
  
-@@ -349,6 +350,7 @@ image-$(CONFIG_KSI8560)                    += cuImage.ksi
+@@ -346,6 +347,7 @@ image-$(CONFIG_KSI8560)                    += cuImage.ksi
  image-$(CONFIG_HIVEAP_330)            += simpleImage.hiveap-330
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  image-$(CONFIG_WS_AP3710I)            += simpleImage.ws-ap3710i
@@ -55,7 +55,7 @@ WS-AP3825i AP.
  
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -355,6 +355,11 @@ simpleboot-ws-ap3710i)
+@@ -346,6 +346,11 @@ simpleboot-ws-ap3710i)
      link_address='0x1500000'
      binary=y
      ;;

diff --git a/target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch b/target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch
index 402a6138347a3a1512a11740d7bbc63de70874b6..c255c3bbfd83a6ffbd8f209e1c4cc75f43db6675 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/108-powerpc-85xx-firebox-t10-t15-support.patch
@@ -14,8 +14,8 @@
 +        This option enables support for the Watchguard Firebox T10/T15 board.
 +        This board is a VPN Gateway-Router with a Freescale P1010 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile

diff --git a/target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch b/target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch
index 761c4d95094c07991a4ceb8cfe1569865964e4e8..23190590f6aeb9cf2dee89ab53835f89a214ba9e 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/109-powerpc-85xx-add-ws-ap3715i-support.patch
@@ -30,7 +30,7 @@
  obj-$(CONFIG_CORENET_GENERIC)   += corenet_generic.o
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -180,6 +180,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h
+@@ -179,6 +179,7 @@ src-plat-$(CONFIG_MVME7100) += motload-h
  src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_WS_AP3710I) += simpleboot.c fixed-head.S
@@ -38,7 +38,7 @@
  src-plat-$(CONFIG_WS_AP3825I) += simpleboot.c fixed-head.S
  
  src-plat-$(CONFIG_PPC_MICROWATT) += fixed-head.S microwatt.c
-@@ -350,6 +351,7 @@ image-$(CONFIG_KSI8560)                    += cuImage.ksi
+@@ -347,6 +348,7 @@ image-$(CONFIG_KSI8560)                    += cuImage.ksi
  image-$(CONFIG_HIVEAP_330)            += simpleImage.hiveap-330
  image-$(CONFIG_TL_WDR4900_V1)         += simpleImage.tl-wdr4900-v1
  image-$(CONFIG_WS_AP3710I)            += simpleImage.ws-ap3710i

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 a50e28bdcfa392060764ec0f724383e031edd985..8f0a176caa9912a53964434f33485fae4dc30520 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
@@ -15,8 +15,8 @@
 +      This board is a wireless router with a Freescale P1011 SoC.
 +
  config HIVEAP_330
-     bool "Aerohive HiveAP-330"
-     select DEFAULT_UIMAGE
+       bool "Aerohive HiveAP-330"
+       select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile
 @@ -12,6 +12,7 @@ obj-y += common.o
@@ -29,15 +29,15 @@
  obj8259-$(CONFIG_PPC_I8259)   += mpc85xx_8259.o
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -177,6 +177,7 @@ src-plat-$(CONFIG_PPC_PSERIES) += pserie
+@@ -176,6 +176,7 @@ src-plat-$(CONFIG_PPC_ZIMAGE_LA3000000)
+ src-plat-$(CONFIG_PPC_PSERIES) += pseries-head.S
  src-plat-$(CONFIG_PPC_POWERNV) += pseries-head.S
- src-plat-$(CONFIG_PPC_IBM_CELL_BLADE) += pseries-head.S
  src-plat-$(CONFIG_MVME7100) += motload-head.S mvme7100.c
 +src-plat-$(CONFIG_BR200_WP) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_HIVEAP_330) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_TL_WDR4900_V1) += simpleboot.c fixed-head.S
  src-plat-$(CONFIG_WS_AP3710I) += simpleboot.c fixed-head.S
-@@ -348,6 +349,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
+@@ -345,6 +346,7 @@ image-$(CONFIG_TQM8548)                    += cuImage.tqm
  image-$(CONFIG_TQM8555)                       += cuImage.tqm8555
  image-$(CONFIG_TQM8560)                       += cuImage.tqm8560
  image-$(CONFIG_KSI8560)                       += cuImage.ksi8560
@@ -47,7 +47,7 @@
  image-$(CONFIG_WS_AP3710I)            += simpleImage.ws-ap3710i
 --- a/arch/powerpc/boot/wrapper
 +++ b/arch/powerpc/boot/wrapper
-@@ -348,6 +348,7 @@ adder875-redboot)
+@@ -339,6 +339,7 @@ adder875-redboot)
      platformo="$object/fixed-head.o $object/redboot-8xx.o"
      binary=y
      ;;

diff --git a/target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch b/target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch
index f9761d444760d73fa827bb2ea5a2649fa38302bb..574d5f7ff53e3ad42b99255eff6c707f05021ea5 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch
+++ b/target/linux/mpc85xx/patches-6.18/111-powerpc-85xx-hpe-msm-support.patch
@@ -16,8 +16,8 @@
 +        This board is a Concurrent Dual-Band wireless access point with a
 +        Freescale P1020 SoC.
 +
- config MPC8540_ADS
-       bool "Freescale MPC8540 ADS"
+ config MPC85xx_MDS
+       bool "Freescale MPC8568 MDS / MPC8569 MDS / P1021 MDS"
        select DEFAULT_UIMAGE
 --- a/arch/powerpc/platforms/85xx/Makefile
 +++ b/arch/powerpc/platforms/85xx/Makefile

diff --git a/target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch b/target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
index 95716c984f2aa2d0405fec8a0fdd59f2badb9574..99ea21d966d64288b7c54e8b93c2d35c787160be 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
+++ b/target/linux/mpc85xx/patches-6.18/112-powerpc-85xx-add-zimage-la3000-to-p2020.patch
@@ -1,6 +1,6 @@
 --- a/arch/powerpc/platforms/85xx/Kconfig
 +++ b/arch/powerpc/platforms/85xx/Kconfig
-@@ -187,6 +187,7 @@ config PPC_P2020
+@@ -166,6 +166,7 @@ config PPC_P2020
        default y if MPC85xx_DS || MPC85xx_RDB
        select DEFAULT_UIMAGE
        select SWIOTLB

diff --git a/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
index dd5b7bb4872fe8545519ada14326f8dff7e8aa9e..5f9fb1ff4fde47fa7b13848e56441a31720746eb 100644 (file)
--- a/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
+++ b/target/linux/mpc85xx/patches-6.18/900-powerpc-bootwrapper-disable-uImage-generation.patch
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -291,7 +291,6 @@ image-$(CONFIG_PPC_CHRP)           += zImage.chrp
+@@ -288,7 +288,6 @@ image-$(CONFIG_PPC_CHRP)           += zImage.chrp
  image-$(CONFIG_PPC_EFIKA)             += zImage.chrp
  image-$(CONFIG_PPC_PMAC)              += zImage.pmac
  image-$(CONFIG_PPC_HOLLY)             += dtbImage.holly
@@ -24,7 +24,7 @@ Signed-off-by: David Bauer <mail@david-bauer.net>
  image-$(CONFIG_EPAPR_BOOT)            += zImage.epapr
  
  #
-@@ -413,15 +412,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
+@@ -410,15 +409,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
  $(obj)/vmlinux.strip: vmlinux
        $(STRIP) -s -R .comment $< -o $@