From 97d0ed4faa30a9fc6a341dd5e48641536a21c1de Mon Sep 17 00:00:00 2001 From: Jonas Gorski Date: Mon, 11 Aug 2014 11:36:38 +0000 Subject: [PATCH] brcm63xx: make board patch context less ambiguous Make it less likely for quilt/patch to put boards into the "wrong" section. Signed-off-by: Jonas Gorski SVN-Revision: 42117 --- ...low_better_context_for_board_patches.patch | 56 +++++++++++++++++++ .../patches-3.14/500-board-D4PW.patch | 2 +- .../brcm63xx/patches-3.14/501-board-NB4.patch | 2 +- .../patches-3.14/502-board-96338W2_E7T.patch | 2 +- .../patches-3.14/505-board_spw500v.patch | 2 +- .../patches-3.14/507-board-MAGIC.patch | 2 +- .../patches-3.14/508-board_hw553.patch | 2 +- .../patches-3.14/509-board_rta1320_16m.patch | 2 +- .../patches-3.14/510-board_spw303v.patch | 2 +- .../patches-3.14/511-board_V2500V.patch | 2 +- ...63xx-add-support-for-96368MVWG-board.patch | 4 +- ...3xx-add-support-for-96368MVNgr-board.patch | 2 +- ...CM63XX-add-963281TAN-reference-board.patch | 2 +- .../524-board_dsl_274xb_rev_f.patch | 2 +- .../527-board_dva-g3810bn-tl-1.patch | 2 +- .../brcm63xx/patches-3.14/528-board_nb6.patch | 4 +- .../patches-3.14/533-board_rta770bw.patch | 2 +- .../patches-3.14/535-board_rta770w.patch | 2 +- .../patches-3.14/536-board_fast2704.patch | 2 +- .../patches-3.14/537-board_fast2504n.patch | 2 +- .../patches-3.14/555-board_96318ref.patch | 4 +- .../556-board_96318ref_p300.patch | 2 +- .../patches-3.14/557-board_bcm963269bhr.patch | 4 +- .../patches-3.14/559-board_vw6339gu.patch | 2 +- .../patches-3.14/561-board_WAP-5813n.patch | 2 +- .../patches-3.14/567-board_dsl-2751b_e1.patch | 2 +- 26 files changed, 85 insertions(+), 29 deletions(-) create mode 100644 target/linux/brcm63xx/patches-3.14/499-allow_better_context_for_board_patches.patch diff --git a/target/linux/brcm63xx/patches-3.14/499-allow_better_context_for_board_patches.patch b/target/linux/brcm63xx/patches-3.14/499-allow_better_context_for_board_patches.patch new file mode 100644 index 0000000000..ed13fc8595 --- /dev/null +++ b/target/linux/brcm63xx/patches-3.14/499-allow_better_context_for_board_patches.patch @@ -0,0 +1,56 @@ +--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c ++++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c +@@ -65,7 +65,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 +@@ -114,7 +114,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6328 */ + + /* + * known 6338 boards +@@ -203,7 +203,7 @@ static struct board_info __initdata boar + }, + }, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6338 */ + + /* + * known 6345 boards +@@ -215,7 +215,7 @@ static struct board_info __initdata boar + + .has_uart0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6345 */ + + /* + * known 6348 boards +@@ -548,7 +548,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6348 */ + + /* + * known 6358 boards +@@ -701,7 +701,7 @@ static struct board_info __initdata boar + + .has_ohci0 = 1, + }; +-#endif ++#endif /* CONFIG_BCM63XX_CPU_6358 */ + + /* + * all boards diff --git a/target/linux/brcm63xx/patches-3.14/500-board-D4PW.patch b/target/linux/brcm63xx/patches-3.14/500-board-D4PW.patch index 04fa4ca7dc..af1b593704 100644 --- a/target/linux/brcm63xx/patches-3.14/500-board-D4PW.patch +++ b/target/linux/brcm63xx/patches-3.14/500-board-D4PW.patch @@ -54,7 +54,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6348 */ /* @@ -729,6 +779,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch index 75291f5859..50da306d99 100644 --- a/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch +++ b/target/linux/brcm63xx/patches-3.14/501-board-NB4.patch @@ -629,7 +629,7 @@ + .spis = nb4_spi_devices, + .num_spis = ARRAY_SIZE(nb4_spi_devices), +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -787,6 +1398,11 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch index 25b28aa685..0aca645228 100644 --- a/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch +++ b/target/linux/brcm63xx/patches-3.14/502-board-96338W2_E7T.patch @@ -38,7 +38,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ /* @@ -1377,6 +1411,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch b/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch index a1a0c8c649..4a4e9c7b7a 100644 --- a/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch +++ b/target/linux/brcm63xx/patches-3.14/505-board_spw500v.patch @@ -65,7 +65,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6348 */ /* @@ -1573,6 +1634,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch index 0ebe03c521..772d78b3a4 100644 --- a/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch +++ b/target/linux/brcm63xx/patches-3.14/507-board-MAGIC.patch @@ -76,7 +76,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6348 */ /* @@ -1743,6 +1815,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch index 7c86759f2c..f3a1307cc6 100644 --- a/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch +++ b/target/linux/brcm63xx/patches-3.14/508-board_hw553.patch @@ -81,7 +81,7 @@ + .pci_dev = 1, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -1830,6 +1907,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch index 2244764af3..9ecc36f8b1 100644 --- a/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch +++ b/target/linux/brcm63xx/patches-3.14/509-board_rta1320_16m.patch @@ -43,7 +43,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6338 */ /* @@ -1875,6 +1914,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch index 7ab05a3e31..3e2fad64e6 100644 --- a/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch +++ b/target/linux/brcm63xx/patches-3.14/510-board_spw303v.patch @@ -70,7 +70,7 @@ + }, + } +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -1948,6 +2014,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch index d830d98a59..bc4409f9f1 100644 --- a/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch +++ b/target/linux/brcm63xx/patches-3.14/511-board_V2500V.patch @@ -63,7 +63,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6348 */ /* @@ -1999,6 +2058,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch index 22c0036346..83a476967a 100644 --- a/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch +++ b/target/linux/brcm63xx/patches-3.14/520-bcm63xx-add-support-for-96368MVWG-board.patch @@ -11,7 +11,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -2244,6 +2244,85 @@ static struct board_info __initdata boar - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ /* + * known 6368 boards @@ -90,7 +90,7 @@ Subject: [PATCH 32/63] bcm63xx: add support for 96368MVWG board. + .has_ohci0 = 1, + .has_ehci0 = 1, +}; -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6368 */ + +/* * all boards diff --git a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch index f604fae6a5..fc38142160 100644 --- a/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch +++ b/target/linux/brcm63xx/patches-3.14/521-bcm63xx-add-support-for-96368MVNgr-board.patch @@ -79,7 +79,7 @@ Subject: [PATCH 33/63] bcm63xx: add support for 96368MVNgr board. + .has_ohci0 = 1, + .has_ehci0 = 1, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -2380,6 +2446,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch index 2e7a9d79d6..0b6a868321 100644 --- a/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch +++ b/target/linux/brcm63xx/patches-3.14/523-MIPS-BCM63XX-add-963281TAN-reference-board.patch @@ -83,7 +83,7 @@ Subject: [PATCH] MIPS: BCM63XX: add 963281TAN reference board + + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ /* @@ -2429,6 +2499,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch index 298f3434f6..d0d7bc4c02 100644 --- a/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch +++ b/target/linux/brcm63xx/patches-3.14/524-board_dsl_274xb_rev_f.patch @@ -119,7 +119,7 @@ Subject: [PATCH 70/79] MIPS: BCM63XX: Add board definition for D-Link + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ /* @@ -2500,6 +2605,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch index 28a00e1a1a..05c82264c7 100644 --- a/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch +++ b/target/linux/brcm63xx/patches-3.14/527-board_dva-g3810bn-tl-1.patch @@ -71,7 +71,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ /* @@ -2830,6 +2897,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch index f706734c5d..cf69773cb5 100644 --- a/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch +++ b/target/linux/brcm63xx/patches-3.14/528-board_nb6.patch @@ -19,7 +19,7 @@ #define CT6373_74X164_GPIO_BASE 64 @@ -2694,6 +2697,104 @@ static struct board_info __initdata boar }; - #endif + #endif /* CONFIG_BCM63XX_CPU_6358 */ +#ifdef CONFIG_BCM63XX_CPU_6362 +static struct rtl8367_extif_config nb6_rtl8367_extif0_cfg = { @@ -117,7 +117,7 @@ + .devs = nb6_devices, + .num_devs = ARRAY_SIZE(nb6_devices), +}; -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6362 */ + /* * known 6368 boards diff --git a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch index 0e23f4af89..3a3cc6073a 100644 --- a/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch +++ b/target/linux/brcm63xx/patches-3.14/533-board_rta770bw.patch @@ -53,7 +53,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ /* @@ -3335,6 +3384,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch index 8cfbf097ab..1e0cc4b492 100644 --- a/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch +++ b/target/linux/brcm63xx/patches-3.14/535-board_rta770w.patch @@ -58,7 +58,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6345 */ /* @@ -3872,6 +3926,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch index ecd1e2ed7d..fd3eaca8fb 100644 --- a/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch +++ b/target/linux/brcm63xx/patches-3.14/536-board_fast2704.patch @@ -132,7 +132,7 @@ Signed-off-by: Marcin Jurkowski + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6328 */ /* @@ -3916,6 +4032,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch index b3a4d34d6f..05e7187ca4 100644 --- a/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch +++ b/target/linux/brcm63xx/patches-3.14/537-board_fast2504n.patch @@ -100,7 +100,7 @@ Signed-off-by: Max Staudt + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6362 */ /* @@ -4092,6 +4182,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch index 10b3102547..8c750a1ee7 100644 --- a/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch +++ b/target/linux/brcm63xx/patches-3.14/555-board_96318ref.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -90,6 +90,93 @@ static struct board_info __initdata boar - #endif + #endif /* CONFIG_BCM63XX_CPU_3368 */ /* + * known 6318 boards @@ -88,7 +88,7 @@ + }, + }, +}; -+#endif ++#endif /* CONFIG_BCM63XX_CPU_6318 */ + +/* * known 6328 boards diff --git a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch index 959f1900bb..bd43772265 100644 --- a/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch +++ b/target/linux/brcm63xx/patches-3.14/556-board_96318ref_p300.patch @@ -92,7 +92,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ /* @@ -4435,6 +4523,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch index 4a53980a52..59494a7a76 100644 --- a/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch +++ b/target/linux/brcm63xx/patches-3.14/557-board_bcm963269bhr.patch @@ -1,7 +1,7 @@ --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c @@ -4515,6 +4515,75 @@ static struct board_info __initdata boar - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ /* + * known 63268/63269 boards @@ -70,7 +70,7 @@ + }, + }, +}; -+#endif ++#endif /* CONFIG_BCM63XX_CPU_63268 */ + +/* * all boards diff --git a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch index 69685eb1cd..60855df187 100644 --- a/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch +++ b/target/linux/brcm63xx/patches-3.14/559-board_vw6339gu.patch @@ -106,7 +106,7 @@ + }, + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_63268 */ /* @@ -4716,6 +4818,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch index c24de1000f..a12f915323 100644 --- a/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch +++ b/target/linux/brcm63xx/patches-3.14/561-board_WAP-5813n.patch @@ -123,7 +123,7 @@ + .spis = WAP5813n_spi_devices, + .num_spis = ARRAY_SIZE(WAP5813n_spi_devices), +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6368 */ /* @@ -4940,6 +5052,7 @@ static const struct board_info __initcon diff --git a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch index 11cee3b086..8ee6e98c3f 100644 --- a/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch +++ b/target/linux/brcm63xx/patches-3.14/567-board_dsl-2751b_e1.patch @@ -139,7 +139,7 @@ + .num_board_fixups = ARRAY_SIZE(dsl2751b_e1_fixups), + }, +}; - #endif + #endif /* CONFIG_BCM63XX_CPU_6318 */ /* @@ -5426,6 +5561,7 @@ static const struct board_info __initcon -- 2.30.2