From f996377a265895a30265c10edb63e56e60a67f14 Mon Sep 17 00:00:00 2001 From: =?utf8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= Date: Tue, 19 May 2020 13:27:16 +0200 Subject: [PATCH] bcm63xx: bcm6328: fix strapbus boot sel MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Boot selection bit is 18, not 28. Signed-off-by: Álvaro Fernández Rojas --- ...mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch | 13 +++++++++++++ ...MIPS-BCM63XX-Register-SPI-flash-if-present.patch | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch 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 new file mode 100644 index 0000000000..17e9d7e888 --- /dev/null +++ b/target/linux/bcm63xx/patches-5.4/150-mips-bcm63xx-bcm6328-fix-strapbus-boot-sel.patch @@ -0,0 +1,13 @@ +--- 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/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch index 7912c26696..0a3b34b743 100644 --- a/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch +++ b/target/linux/bcm63xx/patches-5.4/411-MIPS-BCM63XX-Register-SPI-flash-if-present.patch @@ -153,4 +153,4 @@ Signed-off-by: Jonas Gorski +#define STRAPBUS_6328_HSSPI_CLK_FAST (1 << 4) #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_SERIAL (1 << 18) -- 2.30.2