bcm63xx: switch to upstream endif comments patch

This allows better context for board patches and we no longer need a
downstream patch for that.

Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>

1 files changed, 155 insertions, 0 deletions

diff --git a/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch
new file mode 100644
index 0000000000..bb56363e39
--- /dev/null
+++ b/target/linux/bcm63xx/patches-5.4/031-v5.9-MIPS-BCM63xx-add-endif-comments.patch
@@ -0,0 +1,155 @@
+From c425423a075718eac625c78351fa5907d4f3a9de Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
+Date: Mon, 8 Jun 2020 12:18:28 +0200
+Subject: [PATCH] MIPS: BCM63xx: add endif comments
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+There are plenty of ifdefs in board_bcm963xx.c without endif comments.
+Let's make the code easier to follow by adding proper comments.
+
+Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
+Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
+---
+ arch/mips/bcm63xx/boards/board_bcm963xx.c | 33 +++++++++++------------
+ 1 file changed, 15 insertions(+), 18 deletions(-)
+
+--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c
++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c
+@@ -67,7 +67,7 @@ static struct board_info __initdata boar
+ 	.ephy_reset_gpio		= 36,
+ 	.ephy_reset_gpio_flags		= GPIOF_INIT_HIGH,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_3368 */
+ 
+ /*
+  * known 6328 boards
+@@ -115,7 +115,7 @@ static struct board_info __initdata boar
+ 		},
+ 	},
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6328 */
+ 
+ /*
+  * known 6338 boards
+@@ -204,7 +204,7 @@ static struct board_info __initdata boar
+ 		},
+ 	},
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6338 */
+ 
+ /*
+  * known 6345 boards
+@@ -216,7 +216,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_uart0			= 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6345 */
+ 
+ /*
+  * known 6348 boards
+@@ -464,7 +464,6 @@ static struct board_info __initdata boar
+ 	},
+ };
+ 
+-
+ static struct board_info __initdata board_DV201AMR = {
+ 	.name				= "DV201AMR",
+ 	.expected_cpu_id		= 0x6348,
+@@ -505,7 +504,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_ohci0 = 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6348 */
+ 
+ /*
+  * known 6358 boards
+@@ -530,7 +529,6 @@ static struct board_info __initdata boar
+ 		.force_duplex_full	= 1,
+ 	},
+ 
+-
+ 	.has_ohci0 = 1,
+ 	.has_pccard = 1,
+ 	.has_ehci0 = 1,
+@@ -654,7 +652,7 @@ static struct board_info __initdata boar
+ 
+ 	.has_ohci0			= 1,
+ };
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6358 */
+ 
+ /*
+  * all boards
+@@ -662,17 +660,17 @@ static struct board_info __initdata boar
+ static const struct board_info __initconst *bcm963xx_boards[] = {
+ #ifdef CONFIG_BCM63XX_CPU_3368
+ 	&board_cvg834g,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_3368 */
+ #ifdef CONFIG_BCM63XX_CPU_6328
+ 	&board_96328avng,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6328 */
+ #ifdef CONFIG_BCM63XX_CPU_6338
+ 	&board_96338gw,
+ 	&board_96338w,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6338 */
+ #ifdef CONFIG_BCM63XX_CPU_6345
+ 	&board_96345gw2,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6345 */
+ #ifdef CONFIG_BCM63XX_CPU_6348
+ 	&board_96348r,
+ 	&board_96348gw,
+@@ -682,14 +680,13 @@ static const struct board_info __initcon
+ 	&board_DV201AMR,
+ 	&board_96348gw_a,
+ 	&board_rta1025w_16,
+-#endif
+-
++#endif /* CONFIG_BCM63XX_CPU_6348 */
+ #ifdef CONFIG_BCM63XX_CPU_6358
+ 	&board_96358vw,
+ 	&board_96358vw2,
+ 	&board_AGPFS0,
+ 	&board_DWVS0,
+-#endif
++#endif /* CONFIG_BCM63XX_CPU_6358 */
+ };
+ 
+ /*
+@@ -728,7 +725,7 @@ int bcm63xx_get_fallback_sprom(struct ss
+ 		return -EINVAL;
+ 	}
+ }
+-#endif
++#endif /* CONFIG_SSB_PCIHOST */
+ 
+ /*
+  * return board name for /proc/cpuinfo
+@@ -807,7 +804,7 @@ void __init board_prom_init(void)
+ 		if (BCMCPU_IS_6348())
+ 			val |= GPIO_MODE_6348_G2_PCI;
+ 	}
+-#endif
++#endif /* CONFIG_PCI */
+ 
+ 	if (board.has_pccard) {
+ 		if (BCMCPU_IS_6348())
+@@ -892,7 +889,7 @@ int __init board_register_devices(void)
+ 				&bcm63xx_get_fallback_sprom) < 0)
+ 			pr_err("failed to register fallback SPROM\n");
+ 	}
+-#endif
++#endif /* CONFIG_SSB_PCIHOST */
+ 
+ 	bcm63xx_spi_register();
+