]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770
authorPaul Cercueil <paul@crapouillou.net>
Wed, 28 Mar 2018 15:38:12 +0000 (17:38 +0200)
committerKleber Sacilotto de Souza <kleber.souza@canonical.com>
Mon, 27 Aug 2018 14:40:05 +0000 (16:40 +0200)
commit5878ea8c01181afcf3984c0ef6518917f49f0d44
tree2a5bbfea6f1cc57aeefae619c2ceb0ff1636a2b0
parentbd27bd9f76aef41dde966781495d37f9b7d2543e
MIPS: Fix build with DEBUG_ZBOOT and MACH_JZ4770

BugLink: http://bugs.launchpad.net/bugs/1786352
commit c60128ce97674fd05adb8b5ae79eb6745a03192e upstream.

The debug definitions were missing for MACH_JZ4770, resulting in a build
failure when DEBUG_ZBOOT was set.

Since the UART addresses are the same across all Ingenic SoCs, we just
use a #ifdef CONFIG_MACH_INGENIC instead of checking for individual
Ingenic SoCs.

Additionally, I added a #define for the UART0 address in-code and
dropped the <asm/mach-jz4740/base.h> include, for the reason that this
include file is slowly being phased out as the whole platform is being
moved to devicetree.

Fixes: 9be5f3e92ed5 ("MIPS: ingenic: Initial JZ4770 support")
Signed-off-by: Paul Cercueil <paul@crapouillou.net>
Cc: Ralf Baechle <ralf@linux-mips.org>
Cc: linux-mips@linux-mips.org
Cc: <stable@vger.kernel.org> # 4.16
Patchwork: https://patchwork.linux-mips.org/patch/18957/
Signed-off-by: James Hogan <jhogan@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Khalid Elmously <khalid.elmously@canonical.com>
arch/mips/boot/compressed/uart-16550.c