]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
powerpc/boot: Fix opal console in boot wrapper
authorJoel Stanley <joel@jms.id.au>
Tue, 9 Oct 2018 23:28:03 +0000 (09:58 +1030)
committerMarcelo Henrique Cerri <marcelo.cerri@canonical.com>
Fri, 17 Jan 2020 17:21:14 +0000 (14:21 -0300)
commited9eefd2fb37a2ea9e7bab542b2414991072e52e
tree4cff2aee46ddea86fa5a9515a99664c19fe80cc4
parent65d3e3c4f24555131b61862bb8fe677d6a028558
powerpc/boot: Fix opal console in boot wrapper

BugLink: https://bugs.launchpad.net/bugs/1854975
[ Upstream commit 1a855eaccf353f7ed1d51a3d4b3af727ccbd81ca ]

As of commit 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit
boot wrapper") the opal code is hidden behind CONFIG_PPC64_BOOT_WRAPPER,
but the boot wrapper avoids include/linux, so it does not get the normal
Kconfig flags.

We can drop the guard entirely as in commit f8e8e69cea49 ("powerpc/boot:
Only build OPAL code when necessary") the makefile only includes opal.c
in the build if CONFIG_PPC64_BOOT_WRAPPER is set.

Fixes: 10c77dba40ff ("powerpc/boot: Fix build failure in 32-bit boot wrapper")
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Kamal Mostafa <kamal@canonical.com>
Signed-off-by: Kleber Sacilotto de Souza <kleber.souza@canonical.com>
arch/powerpc/boot/opal.c