[PATCH 0/2] x86 build fixes

[Mark Cave-Ayland]

Following up from the x86 build failures reported on-list by Jens, here are the
proper unsquashed versions.

Signed-off-by: Mark Cave-Ayland

Mark Cave-Ayland (2):
  pci: fix compilation for architectures where OFMEM isn't available
  x86: remove static declaration from mbheader definition

arch/x86/multiboot.c | 2 +-
 drivers/pci.c        | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

[PATCH 1/2] pci: fix compilation for architectures where OFMEM isn't available

[Mark Cave-Ayland]

Commit 0d3345f9 "pci: add ob_pci_unmap() to unmap PCI memory" accidentally
broke compilation for architectures where OFMEM is unavailable such as x86.

Add the appropriate #if defined(CONFIG_OFMEM)...#endif block to ob_pci_unmap()
so that compilation can at least succeed for these architectures.

Signed-off-by: Mark Cave-Ayland 
---
 drivers/pci.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/pci.c b/drivers/pci.c
index 672dcd0..01c4374 100644
--- a/drivers/pci.c
+++ b/drivers/pci.c
@@ -402,7 +402,9 @@ static ucell ob_pci_map(uint32_t ba, ucell size) {
 }

static void ob_pci_unmap(ucell virt, ucell size) {
+#if defined(CONFIG_OFMEM)
    ofmem_unmap(virt, size); 
+#endif
 }

/* ( pci-addr.lo pci-addr.mid pci-addr.hi size -- virt ) */

[PATCH 2/2] x86: remove static declaration from mbheader definition

[Mark Cave-Ayland]

Newer versions of gcc fail to compile OpenBIOS giving a
"error: ‘multiboot_header’ defined but not used" message when the default
build with -Werror enabled is used.

Remove the static declaration to enable compilation to succeed, which
incidentally matches the other copies of multiboot.c in the OpenBIOS
source tree.

Signed-off-by: Mark Cave-Ayland 
---
 arch/x86/multiboot.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/x86/multiboot.c b/arch/x86/multiboot.c
index 6f6b23d..7590dab 100644
--- a/arch/x86/multiboot.c
+++ b/arch/x86/multiboot.c
@@ -15,7 +15,7 @@ struct mbheader {
     unsigned int magic, flags, checksum;
 };

-static const struct mbheader multiboot_header
+const struct mbheader multiboot_header
    __attribute__((section (".hdr"))) =
 {
     MULTIBOOT_HEADER_MAGIC,

[Mark Cave-Ayland]

On 13/01/18 21:26, Mark Cave-Ayland wrote:
> Following up from the x86 build failures reported on-list by Jens, here are the
> proper unsquashed versions.
>
> Signed-off-by: Mark Cave-Ayland
>
> Mark Cave-Ayland (2):
>    pci: fix compilation for architectures where OFMEM isn't available
>    x86: remove static declaration from mbheader definition
>
> arch/x86/multiboot.c | 2 +-
>   drivers/pci.c        | 2 ++
>   2 files changed, 3 insertions(+), 1 deletion(-)

Applied to git master.

ATB,

Mark.