From: Jonas Gorski Date: Tue, 7 Feb 2017 18:08:04 +0000 (+0100) Subject: brcm63xx: fix lzma loader for BCM6362 X-Git-Tag: v17.01.0~65 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=02515f018799496a607216b7b765a1a60c2e22be;p=oweals%2Fopenwrt.git brcm63xx: fix lzma loader for BCM6362 BCM6362 and BCM3380 seem to share the same PRID. Disable serial output for them until we can find a way to tell them apart reliably. Fixes: 8f3cfe4ba2 ("brcm63xx: lzma-loader: add BCM3380 support") Signed-off-by: Jonas Gorski --- diff --git a/target/linux/brcm63xx/image/lzma-loader/src/board.c b/target/linux/brcm63xx/image/lzma-loader/src/board.c index 28b9c53f72..6a1b132254 100644 --- a/target/linux/brcm63xx/image/lzma-loader/src/board.c +++ b/target/linux/brcm63xx/image/lzma-loader/src/board.c @@ -71,7 +71,7 @@ void board_init(void) if ((prid & 0xff) == 0x04) chipid_reg = 0xfff8c000; else if ((prid & 0xff) == 0x70) - chipid_reg = 0xb4e00000; + return; /* FIXME: 0002a070 can be 6362 and 3380 */ else if ((prid & 0xff) >= 0x30) chipid_reg = 0xb0000000; else