diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-06 16:12:21 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-08-06 23:06:12 +0200 |
| commit | f41a40001af80ff73415e3617655b1fc85c8171f (patch) | |
| tree | 508a1c6c040b84927a45e68106381305ce215dd4 /target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch | |
| parent | 9fb1d4ce8a9134ee4cae6e8191c8ba902b7ee192 (diff) | |
| download | upstream-f41a40001af80ff73415e3617655b1fc85c8171f.tar.gz upstream-f41a40001af80ff73415e3617655b1fc85c8171f.tar.bz2 upstream-f41a40001af80ff73415e3617655b1fc85c8171f.zip | |
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>
Diffstat (limited to 'target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch index 7069c231de..db30de2183 100644 --- a/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch +++ b/target/linux/bcm63xx/patches-5.4/368-MIPS-BCM63XX-add-support-for-matching-the-board_info.patch @@ -16,8 +16,8 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- a/arch/mips/bcm63xx/boards/board_bcm963xx.c +++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c -@@ -695,6 +695,10 @@ static const struct board_info __initcon - #endif +@@ -692,6 +692,10 @@ static const struct board_info __initcon + #endif /* CONFIG_BCM63XX_CPU_6358 */ }; +static struct of_device_id const bcm963xx_boards_dt[] = { @@ -27,7 +27,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* * early init callback, read nvram data from flash and checksum it */ -@@ -706,6 +710,7 @@ void __init board_bcm963xx_init(void) +@@ -703,6 +707,7 @@ void __init board_bcm963xx_init(void) char *board_name = NULL; u32 val; struct bcm_hcs *hcs; @@ -35,7 +35,7 @@ Signed-off-by: Jonas Gorski <jogo@openwrt.org> /* read base address of boot chip select (0) * 6328/6362 do not have MPI but boot from a fixed address -@@ -745,6 +750,16 @@ void __init board_bcm963xx_init(void) +@@ -742,6 +747,16 @@ void __init board_bcm963xx_init(void) } else { board_name = bcm63xx_nvram_get_name(); } |