diff --git a/arm_virt/liteos_a/README.md b/arm_virt/liteos_a/README.md index 495ad2da7bd237095df3f3424c0e4cb98ba633f8..5dab873e0a7af00ce4e0cce7da66b7b22cbc4d7a 100644 --- a/arm_virt/liteos_a/README.md +++ b/arm_virt/liteos_a/README.md @@ -8,7 +8,7 @@ The Arm Virt platform is a `qemu-system-arm` target device that simulates a gene The board whose **machine** is **virt** in QEMU is configurable. For example, you can select the core type and quantity, memory size, and security extensions when configuring the board. This tutorial guides you through the configuration of a board based on the Cortex-A7 architecture, with one CPU, extended secure features, Generic Interrupt Controller versions 2 (GICv2), and 1 GB memory. -The system memory is hardcoded to 32 MB. +The system memory is hardcoded to 64 MB. ## 2. Setting Up the Environment @@ -59,7 +59,7 @@ to the options. -n, --net-enable enable net -l, --local-desktop no VNC -b, --bootargs additional boot arguments(-bk1=v1,k2=v2...) - -g, --gdb enable gdb for kernel + -g, --gdb enable gdb for kernel -h, --help print help info By default, flash.img will not be rebuilt if exists, and net will not @@ -68,7 +68,7 @@ to the options. Simulated network interface is wireless card wlan0, but has no real wifi functions. By default, the network will not be automatically configured if no parameter is specified. If the root directory image file **flash.img** exists, the image will not be re-created. -Note: On the first run, script will also create a MMC image mainly for system and user data files. It is stored at OHOS source tree 'out' sub-directory, named 'smallmmc.img'. Whenever it exists, script will never try to touch it again. More information please refer to `vendor/ohemu/qemu_small_system_demo/qemu_run.sh`. +Note: On the first run, script will also create a MMC image mainly for system and user data files. The 1st partition will be mounted at /sdcard, 2nd at /userdata, and 3rd is reserved. It is stored at OHOS source tree 'out' sub-directory, named 'smallmmc.img'. Whenever it exists, script will never try to touch it again. More information please refer to `vendor/ohemu/qemu_small_system_demo/qemu_run.sh`. c) Exit QEMU. @@ -124,7 +124,7 @@ More GDB related debugging can refer to [GDB instruction manual](https://sourcew - [Running the Graphic Demo](example.md#simple_ui_demo) -- [Observe dsoftbus discovery](example.md#dsoftbus_discover) +- [Observe dsoftbus Discovery](example.md#dsoftbus_discover) ## FAQ: 1. How do I locate a network configuration problem? @@ -174,7 +174,7 @@ More GDB related debugging can refer to [GDB instruction manual](https://sourcew -device virtio-blk-device,drive=mmc \ -netdev bridge,id=net0 \ -device virtio-net-device,netdev=net0,mac=12:22:33:44:55:66 \ - -device virtio-gpu-device,xres=800,yres=480 \ + -device virtio-gpu-device,xres=960,yres=480 \ -device virtio-tablet-device \ -device virtio-rng-device \ -vnc :20 \ @@ -195,7 +195,7 @@ More GDB related debugging can refer to [GDB instruction manual](https://sourcew -device virtio-gpu-device GPU device -device virtio-tablet-device Input device -device virtio-rng-device Random generator device - -vnc: 20 [optional] Remote desktop connection, port 5920 + -vnc: 20 [recommend] Remote desktop connection, port 5920 -s -S [optional] gdb single step debug -global QEMU configuration parameter, which cannot be changed ``` diff --git a/arm_virt/liteos_a/README_zh.md b/arm_virt/liteos_a/README_zh.md index a0b91ef2a6ea62931e1d256224e04aba350cf179..902df4d2564e0653aa15fa3a6831f60f0b26c5b6 100644 --- a/arm_virt/liteos_a/README_zh.md +++ b/arm_virt/liteos_a/README_zh.md @@ -8,7 +8,7 @@ ARM 虚拟化平台是一个 `qemu-system-arm` 的目标设备，通过它来模 Qemu中machine为 **virt** 的单板就是这种可配置的，例如：选择核的类型、核的个数、内存的大小和安全特性等，单板设备的配置。 这次模拟的配置是：Cortex-A7架构，1个CPU，带安全扩展，GICv2，1G内存。 -提示: 系统内存硬编码为32MB。 +提示: 系统内存硬编码为64MB。 ## 2. 环境搭建 @@ -64,7 +64,7 @@ to the options. -n, --net-enable enable net -l, --local-desktop no VNC -b, --bootargs additional boot arguments(-bk1=v1,k2=v2...) - -g, --gdb enable gdb for kernel + -g, --gdb enable gdb for kernel -h, --help print help info By default, flash.img will not be rebuilt if exists, and net will not @@ -73,7 +73,7 @@ to the options. 网卡模拟的是无线网卡wlan0，但无真的wifi功能；默认不加参数的情况下，网络不会自动配置。当根目录镜像文件flash.img存在时，镜像不会被重新制作。 -提示：初次运行脚本时，系统还会生成MMC镜像，主要内容为系统和用户数据文件。镜像存放在OHOS源码树的out目录下，文件名为smallmmc.img。只要不被删除，后续就不再重新制作该镜像。具体请见vendor/ohemu/qemu_small_system_demo/qemu_run.sh。 +提示：初次运行脚本时，系统还会生成MMC镜像，主要内容为系统和用户数据文件，第1个分区将安装在/sdcard目录，第2个分区安装在/userdata目录，第3个分区保留。镜像存放在OHOS源码树的out目录下，文件名为smallmmc.img。只要不被删除，后续就不再重新制作该镜像。具体请见vendor/ohemu/qemu_small_system_demo/qemu_run.sh。 c) 退出qemu环境 @@ -179,7 +179,7 @@ gdb-multiarch out/arm_virt/qemu_small_system_demo/OHOS_Image -device virtio-blk-device,drive=mmc \ -netdev bridge,id=net0 \ -device virtio-net-device,netdev=net0,mac=12:22:33:44:55:66 \ - -device virtio-gpu-device,xres=800,yres=480 \ + -device virtio-gpu-device,xres=960,yres=480 \ -device virtio-tablet-device \ -device virtio-rng-device \ -vnc :20 \ @@ -200,7 +200,7 @@ gdb-multiarch out/arm_virt/qemu_small_system_demo/OHOS_Image -device virtio-gpu-device GPU设备 -device virtio-tablet-device 输入设备 -device virtio-rng-device 随机数设备 - -vnc :20 [可选]远程桌面连接，端口5920 + -vnc :20 [推荐]远程桌面连接，端口5920 -s -S [可选]gdb单步调试 -global QEMU配置参数，不可调整 ``` diff --git a/arm_virt/liteos_a/board/target_config.h b/arm_virt/liteos_a/board/target_config.h index 155a63c1a2b4f9c6d9138c5b3ad1f45e3f7db45d..0e1b84c1d3a9a419718971be4b27a60ab4531ad8 100644 --- a/arm_virt/liteos_a/board/target_config.h +++ b/arm_virt/liteos_a/board/target_config.h @@ -39,7 +39,7 @@ extern "C" { #define PERIPH_PMM_BASE 0x00000000 #define PERIPH_PMM_SIZE 0x0F000000 -#define SYS_MEM_SIZE_DEFAULT 0x2000000 +#define SYS_MEM_SIZE_DEFAULT 0x4000000 /* hwi */ diff --git a/hardware/display/display_layer.c b/hardware/display/display_layer.c index 66c4fd4f749e096c077bf354eeca269afaf70863..ad1995ee269334ca94ee82e66c1f88a5360d4218 100644 --- a/hardware/display/display_layer.c +++ b/hardware/display/display_layer.c @@ -25,7 +25,7 @@ #define DEV_ID 0 #define LAYER_ID 0 #define FB_PATH "/dev/fb0" -#define DISP_WIDTH 800 +#define DISP_WIDTH 960 #define DISP_HEIGHT 480 #define BITS_PER_PIXEL 32 #define BITS_TO_BYTE 8