Merge branch 'open-vela:dev' into vendor_push

open-vela · Jan 22, 2025 · 0bb18a3 · 0bb18a3
2 parents e2a4415 + de5bc72
commit 0bb18a3
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 16 deletions.
diff --git a/boards/vela/configs/goldfish-x86_64-ap/defconfig b/boards/vela/configs/goldfish-x86_64-ap/defconfig
@@ -36,6 +36,8 @@ CONFIG_ARCH_X86_64=y
 CONFIG_BATTERY_CHARGER=y
 CONFIG_BATTERY_GAUGE=y
 CONFIG_BATTERY_MONITOR=y
+CONFIG_BOARDCTL_POWEROFF=y
+CONFIG_BOARDCTL_RESET=y
 CONFIG_BOARD_LATE_INITIALIZE=y
 CONFIG_BOARD_LOOPSPERMSEC=999
 CONFIG_BOOT_RUNFROMEXTSRAM=y
@@ -65,18 +67,24 @@ CONFIG_DRIVERS_VIDEO=y
 CONFIG_DRIVERS_VIRTIO=y
 CONFIG_DRIVERS_VIRTIO_BLK=y
 CONFIG_DRIVERS_VIRTIO_NET=y
+CONFIG_DRIVERS_VIRTIO_PCI=y
 CONFIG_DRIVERS_VIRTIO_RNG=y
+CONFIG_ETC_ROMFS=y
 CONFIG_EVENT_FD=y
 CONFIG_EXAMPLES_FB=y
 CONFIG_EXAMPLES_HELLO=y
 CONFIG_EXAMPLES_LVGLDEMO=y
 CONFIG_FASTDDS=y
 CONFIG_FASTDDS_HelloWorldExampleTCP=y
+CONFIG_FS_BINFS=y
 CONFIG_FS_FAT=y
+CONFIG_FS_FATFS=y
 CONFIG_FS_LOCK_BUCKET_SIZE=8
 CONFIG_FS_NAMED_SEMAPHORES=y
 CONFIG_FS_PROCFS=y
+CONFIG_FS_ROMFS=y
 CONFIG_FS_SHMFS=y
+CONFIG_FS_TMPFS=y
 CONFIG_GNSSUTILS_MINMEA_LIB=y
 CONFIG_GOLDFISH_BATTERY=y
 CONFIG_GOLDFISH_CAMERA=y
@@ -95,6 +103,7 @@ CONFIG_IOB_NCHAINS=64
 CONFIG_LIBCXX=y
 CONFIG_LIBCXXABI=y
 CONFIG_LIBC_ENVPATH=y
+CONFIG_LIBC_EXECFUNCS=y
 CONFIG_LIBC_LOCALTIME=y
 CONFIG_LIBC_MEMFD_ERROR=y
 CONFIG_LIBM=y
@@ -104,7 +113,6 @@ CONFIG_LIB_FREETYPE=y
 CONFIG_LIB_GOOGLEBENCHMARK_STACKSIZE=2048
 CONFIG_LIB_JSONC_STACKSIZE=2048
 CONFIG_LIB_TINYXML2=y
-CONFIG_LINE_MAX=256
 CONFIG_LV_BIN_DECODER_RAM_LOAD=y
 CONFIG_LV_CACHE_DEF_SIZE=8388608
 CONFIG_LV_DEF_REFR_PERIOD=16
@@ -118,6 +126,8 @@ CONFIG_LV_USE_LOG=y
 CONFIG_LV_USE_NUTTX=y
 CONFIG_LV_USE_NUTTX_LIBUV=y
 CONFIG_LV_USE_NUTTX_TOUCHSCREEN=y
+CONFIG_MM_PGALLOC=y
+CONFIG_NAME_MAX=64
 CONFIG_NET=y
 CONFIG_NETDB_DNSCLIENT=y
 CONFIG_NETDB_DNSCLIENT_ENTRIES=4
@@ -138,14 +148,9 @@ CONFIG_NETUTILS_TELNETD=y
 CONFIG_NETUTILS_TFTPC=y
 CONFIG_NETUTILS_WEBCLIENT=y
 CONFIG_NET_ALLOC_DEVIF_CALLBACKS=1
-CONFIG_NET_ARP_SEND=y
 CONFIG_NET_BROADCAST=y
 CONFIG_NET_E1000=y
-CONFIG_NET_E1000_82540EM=y
-CONFIG_NET_E1000_82574L=y
-CONFIG_NET_E1000_I219=y
 CONFIG_NET_ETH_PKTSIZE=1514
-CONFIG_NET_ICMP=y
 CONFIG_NET_ICMP_ALLOC_CONNS=1
 CONFIG_NET_ICMP_SOCKET=y
 CONFIG_NET_IGMP=y
@@ -176,6 +181,8 @@ CONFIG_NET_UDP_WRITE_BUFFERS=y
 CONFIG_NSH_ARCHINIT=y
 CONFIG_NSH_BUILTIN_APPS=y
 CONFIG_NSH_DISABLE_IFUPDOWN=y
+CONFIG_NSH_DISABLE_UNAME=y
+CONFIG_NSH_PROMPT_MAX=32
 CONFIG_PCI=y
 CONFIG_PCI_MSIX=y
 CONFIG_PCI_QEMU_EDU=y
@@ -185,9 +192,10 @@ CONFIG_PREALLOC_CHILDSTATUS=16
 CONFIG_PRIORITY_INHERITANCE=y
 CONFIG_PSEUDOFS_FILE=y
 CONFIG_PSEUDOFS_SOFTLINKS=y
+CONFIG_PSEUDOTERM=y
 CONFIG_PTHREAD_MUTEX_DEFAULT_PRIO_INHERIT=y
 CONFIG_PTHREAD_STACK_MIN=8192
-CONFIG_RAM_SIZE=268435456
+CONFIG_RAM_SIZE=1073741824
 CONFIG_RW_SPINLOCK=y
 CONFIG_SCHED_BACKTRACE=y
 CONFIG_SCHED_CHILD_STATUS=y
@@ -206,6 +214,7 @@ CONFIG_SENSORS_GNSS_RECV_BUFFERSIZE=4096
 CONFIG_SENSORS_GOLDFISH_GNSS=y
 CONFIG_SENSORS_GOLDFISH_SENSOR=y
 CONFIG_SIG_DEFAULT=y
+CONFIG_SPINLOCK=y
 CONFIG_STACK_COLORATION=y
 CONFIG_START_DAY=3
 CONFIG_START_MONTH=3

diff --git a/boards/vela/prebuilts/tools/run_emulator.sh b/boards/vela/prebuilts/tools/run_emulator.sh
@@ -91,7 +91,7 @@ hw.lcd.density = 420
 hw.lcd.height = 1280
 hw.lcd.width = 720
 hw.mainKeys = no
-hw.ramSize = 512
+hw.ramSize = 1024
 hw.sdCard = no
 hw.sensors.orientation = yes
 hw.sensors.proximity = yes
@@ -125,10 +125,14 @@ if [ ! -f ${AVD_PATH}/vela_data.bin ]; then
   cp ${TOP_DIR}/vendor/openvela/boards/vela/prebuilts/image/data.img ${AVD_PATH}/vela_data.bin
 fi
 
+if [ "$AVD_ARCH" == "x86_64" ]; then
+QEMU_OPTION="${QEMU_OPTION} -cpu Skylake-Client,-hle,-rtm,-mpx"
+else
 QEMU_OPTION="${QEMU_OPTION} \
 -netdev user,id=network,net=10.0.2.0/24,dhcpstart=10.0.2.16 \
 -device virtio-net-device,netdev=network,bus=virtio-mmio-bus.4 \
 -device virtio-snd,bus=virtio-mmio-bus.2 -allow-host-audio -semihosting"
+fi
 
 cp -a ${TOP_DIR}/vendor/openvela/boards/vela/prebuilts/tools/modem_simulator ${AVD_PATH}/
 

diff --git a/boards/vela/src/qemu_appinit.c b/boards/vela/src/qemu_appinit.c
@@ -65,14 +65,9 @@ int board_init_app(void)
   struct oneshot_lowerhalf_s *os = NULL;
 #endif
 
-#ifdef CONFIG_FS_PROCFS
-  /* Mount the procfs file system */
-
-  ret = nx_mount(NULL, "/proc", "procfs", 0, NULL);
-  if (ret < 0)
-    {
-      serr("ERROR: Failed to mount procfs at %s: %d\n", "/proc", ret);
-    }
+#ifdef CONFIG_PCI
+  /* Register the PCI bus drivers */
+  pci_register_drivers();
 #endif
 
 #ifdef CONFIG_ONESHOT