fix various compilation errors after pci code rebase

arch/x86_64/Kconfig

@@ -71,6 +71,7 @@ config ARCH_MULTIBOOT2
 		system to enable certain features like the low level framebuffer.
 
 if ARCH_MULTIBOOT2
+
 config MULTBOOT2_FB_TERM
 	bool "Multiboot2 framebuffer terminal"
 	default n

arch/x86_64/src/intel64/Make.defs

@@ -38,7 +38,7 @@ CHIP_CSRCS += intel64_serial.c intel64_rng.c intel64_check_capability.c
 
 # Configuration-dependent intel64 files
 
-ifeq ($(CONFIG_ARCH_MULTIBOOT2),y)
+ifeq ($(CONFIG_MULTBOOT2_FB_TERM),y)
 CHIP_CSRCS += intel64_mbfb.c
 endif
 

arch/x86_64/src/intel64/intel64_createstack.c

@@ -161,7 +161,7 @@ int up_create_stack(struct tcb_s *tcb, size_t stack_size, uint8_t ttype)
 
       if (!tcb->stack_alloc_ptr)
         {
-          serr("ERROR: Failed to allocate stack, size %d\n", stack_size);
+          serr("ERROR: Failed to allocate stack, size %zu\n", stack_size);
         }
 #endif
     }

arch/x86_64/src/intel64/intel64_lowsetup.c

@@ -62,6 +62,15 @@ uint32_t mb_info_struct __attribute__((section(".loader.bss")));
  * Private Functions
  ****************************************************************************/
 
+#ifdef CONFIG_ARCH_MULTIBOOT2
+/****************************************************************************
+ * Name: x86_64_mb2_config
+ *
+ * Description:
+ *   Parse multiboot2 info.
+ *
+ ****************************************************************************/
+
 static void x86_64_mb2_config(void)
 {
   struct multiboot_tag *tag;
@@ -82,18 +91,21 @@ static void x86_64_mb2_config(void)
               break;
             }
 
+#ifdef CONFIG_MULTBOOT2_FB_TERM
           case MULTIBOOT_TAG_TYPE_FRAMEBUFFER:
             {
               x86_64_mb2_fbinitialize(
                 (struct multiboot_tag_framebuffer *)tag);
               break;
             }
+#endif
 
           default:
             break;
         }
     }
 }
+#endif
 
 /****************************************************************************
  * Public Functions
@@ -133,9 +145,11 @@ void up_lowsetup(void)
 
   x86_64_check_and_enable_capability();
 
+#ifdef CONFIG_ARCH_MULTIBOOT2
   /* Handle multiboot2 info */
 
   x86_64_mb2_config();
+#endif
 
   /* Revoke the lower memory */
 

arch/x86_64/src/intel64/intel64_mbfb.c

@@ -34,7 +34,7 @@
 #include <nuttx/nx/nxfonts.h>
 #endif
 
-#include "up_internal.h"
+#include "x86_64_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

arch/x86_64/src/intel64/intel64_serial.c

@@ -82,6 +82,11 @@ void uart_putreg(uart_addrwidth_t base, unsigned int offset,
  *
  ****************************************************************************/
 
+void up_lowputc(char ch)
+{
+  fb_putc(ch);
+}
+
 int up_putc(int ch)
 {
   /* Check for LF */
@@ -90,19 +95,16 @@ int up_putc(int ch)
     {
       /* Add CR */
 
-      x86_64_lowputc('\r');
+      up_lowputc('\r');
     }
 
-  x86_64_lowputc(ch);
+  up_lowputc(ch);
   return ch;
 }
-
-void up_lowputc(char ch)
-{
-  fb_putc(ch);
-}
 #endif /* USE_SERIALDRIVER */
 
+#ifdef USE_EARLYSERIALINIT
+
 void x86_64_earlyserialinit(void)
 {
   u16550_earlyserialinit();
@@ -112,3 +114,4 @@ void x86_64_serialinit(void)
 {
   u16550_serialinit();
 }
+#endif

boards/x86_64/intel64/qemu-intel64/configs/pcitest/defconfig

@@ -30,6 +30,7 @@ CONFIG_DEBUG_PCI=y
 CONFIG_DEBUG_PCI_ERROR=y
 CONFIG_DEBUG_PCI_INFO=y
 CONFIG_DEBUG_PCI_WARN=y
+CONFIG_DEBUG_SYMBOLS=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_HELLO_STACKSIZE=4194304
 CONFIG_FS_PROCFS=y

boards/x86_64/intel64/qemu-intel64/src/qemu_pci.c

@@ -29,8 +29,7 @@
 
 #include <nuttx/pci/pci.h>
 
-#include "up_arch.h"
+#include "x86_64_internal.h"
-#include "up_internal.h"
 
 /****************************************************************************
  * Pre-processor Definitions

drivers/virt/qemu_edu.c

@@ -27,6 +27,7 @@
 #include <nuttx/irq.h>
 #include <nuttx/kmalloc.h>
 
+#include <debug.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>

drivers/virt/qemu_pci_test.c

@@ -25,6 +25,7 @@
 #include <nuttx/config.h>
 #include <nuttx/arch.h>
 
+#include <debug.h>
 #include <stdio.h>
 #include <stdint.h>
 #include <string.h>