diff options
| author | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-06-07 18:59:38 +0200 |
|---|---|---|
| committer | Álvaro Fernández Rojas <noltari@gmail.com> | 2020-06-07 20:26:17 +0200 |
| commit | 6fca1646dd5bd3eb9998ef115e85a12def92cce9 (patch) | |
| tree | af6050c13d75be5dd17943b1472ac56a72b99ec9 /target/linux | |
| parent | ff2c96333f418c0c06ebf0bd947b449f579dda7c (diff) | |
| download | upstream-6fca1646dd5bd3eb9998ef115e85a12def92cce9.tar.gz upstream-6fca1646dd5bd3eb9998ef115e85a12def92cce9.tar.bz2 upstream-6fca1646dd5bd3eb9998ef115e85a12def92cce9.zip | |
bcm63xx: bcm6328: switch to upstream boot sel patch
BCM6328 boot selection fix has been upstreamed.
Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux')
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/010-v5.8-MIPS-BCM63xx-fix-6328-boot-selection-bit.patch | 30 | ||||
| -rw-r--r-- | target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch | 13 |
2 files changed, 30 insertions, 13 deletions
diff --git a/target/linux/bcm63xx/patches-5.4/010-v5.8-MIPS-BCM63xx-fix-6328-boot-selection-bit.patch b/target/linux/bcm63xx/patches-5.4/010-v5.8-MIPS-BCM63xx-fix-6328-boot-selection-bit.patch new file mode 100644 index 0000000000..b279a53de0 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/010-v5.8-MIPS-BCM63xx-fix-6328-boot-selection-bit.patch @@ -0,0 +1,30 @@ +From 2038e0416518b30bb40857fbafa3733a6bae93ca Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> +Date: Tue, 26 May 2020 13:03:24 +0200 +Subject: [PATCH] MIPS: BCM63xx: fix 6328 boot selection bit +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +MISC_STRAP_BUS_BOOT_SEL_SHIFT is 18 according to Broadcom's GPL source code. + +Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com> +Acked-by: Florian Fainelli <f.fainelli@gmail.com> +Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de> +--- + arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h ++++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h +@@ -1367,8 +1367,8 @@ + #define MISC_STRAPBUS_6328_REG 0x240 + #define STRAPBUS_6328_FCVO_SHIFT 7 + #define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT) +-#define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 28) +-#define STRAPBUS_6328_BOOT_SEL_NAND (0 << 28) ++#define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 18) ++#define STRAPBUS_6328_BOOT_SEL_NAND (0 << 18) + + /************************************************************************* + * _REG relative to RSET_PCIE diff --git a/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch b/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch deleted file mode 100644 index 17e9d7e888..0000000000 --- a/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch +++ /dev/null @@ -1,13 +0,0 @@ ---- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_regs.h -@@ -1367,8 +1367,8 @@ - #define MISC_STRAPBUS_6328_REG 0x240 - #define STRAPBUS_6328_FCVO_SHIFT 7 - #define STRAPBUS_6328_FCVO_MASK (0x1f << STRAPBUS_6328_FCVO_SHIFT) --#define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 28) --#define STRAPBUS_6328_BOOT_SEL_NAND (0 << 28) -+#define STRAPBUS_6328_BOOT_SEL_SERIAL (1 << 18) -+#define STRAPBUS_6328_BOOT_SEL_NAND (0 << 18) - - /************************************************************************* - * _REG relative to RSET_PCIE |