[openwrt/openwrt] mpc85xx: Refresh patches

LEDE Commits lede-commits at lists.infradead.org
Thu Mar 23 16:44:41 PDT 2023


hauke pushed a commit to openwrt/openwrt.git, branch master:
https://git.openwrt.org/af5aa110173b653b5103f20c985fd5ae062f3140

commit af5aa110173b653b5103f20c985fd5ae062f3140
Author: Hauke Mehrtens <hauke at hauke-m.de>
AuthorDate: Fri Mar 24 00:42:04 2023 +0100

    mpc85xx: Refresh patches
    
    Make the patches apply cleanly again.
    
    Fixes: ed82189339b8 ("mpc85xx: use bootwrapper for ws-ap3825i")
    Signed-off-by: Hauke Mehrtens <hauke at hauke-m.de>
---
 .../900-powerpc-bootwrapper-disable-uImage-generation.patch           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch
index ea5f5ab062..dfd26a6603 100644
--- a/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch
+++ b/target/linux/mpc85xx/patches-5.15/900-powerpc-bootwrapper-disable-uImage-generation.patch
@@ -16,7 +16,7 @@ Signed-off-by: David Bauer <mail at david-bauer.net>
 
 --- a/arch/powerpc/boot/Makefile
 +++ b/arch/powerpc/boot/Makefile
-@@ -272,7 +272,6 @@ image-$(CONFIG_PPC_CHRP)		+= zImage.chrp
+@@ -273,7 +273,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 at david-bauer.net>
  image-$(CONFIG_EPAPR_BOOT)		+= zImage.epapr
  
  #
-@@ -404,15 +403,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
+@@ -406,15 +405,6 @@ $(obj)/dtbImage.%: vmlinux $(wrapperbits
  $(obj)/vmlinux.strip: vmlinux
  	$(STRIP) -s -R .comment $< -o $@
  




More information about the lede-commits mailing list