From 3ec122416fe7d73829754293adc6c0cc249a9be1 Mon Sep 17 00:00:00 2001 From: yinjiaming Date: Fri, 11 Mar 2022 08:02:31 +0000 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=BA=90=E7=A0=81?= =?UTF-8?q?=E6=A3=80=E8=A7=86=E4=B8=AD=E7=9A=84=E9=97=AE=E9=A2=98=20?= =?UTF-8?q?=E3=80=90=E8=83=8C=E6=99=AF=E3=80=91=203.1=20=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=A3=80=E8=A7=86=E8=BF=87=E7=A8=8B=E4=B8=AD=E6=9C=89=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E9=97=AE=E9=A2=98=E9=9C=80=E8=A6=81=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 【修改方案】 更改了一些文件的权限 【影响】 对现有的产品编译不会有影响。 re #I4XC8T Signed-off-by: yinjiaming Change-Id: I010927375b536a630c5861835b7e1a225c77c925 --- .../board/hals/csky_driver/src/dw_gpio.c | 2 +- arm_mps2_an386/liteos_m/board/liteos.ld | 31 +++++++++++++++++++ arm_mps3_an547/BUILD.gn | 0 arm_mps3_an547/README.md | 0 arm_mps3_an547/README_zh.md | 0 arm_mps3_an547/liteos_m/BUILD.gn | 0 arm_mps3_an547/liteos_m/board/BUILD.gn | 0 .../board/driver/LICENSE-apache-2.0.txt | 0 .../liteos_m/board/driver/arm_uart_drv.c | 0 .../liteos_m/board/driver/arm_uart_drv.h | 0 arm_mps3_an547/liteos_m/board/driver/uart.c | 0 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c | 0 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h | 0 arm_mps3_an547/liteos_m/board/fs/fs_config.h | 0 arm_mps3_an547/liteos_m/board/include/soc.h | 0 arm_mps3_an547/liteos_m/board/include/uart.h | 0 arm_mps3_an547/liteos_m/board/libc/dprintf.c | 0 arm_mps3_an547/liteos_m/board/liteos.ld | 31 +++++++++++++++++++ arm_mps3_an547/liteos_m/board/main.c | 0 arm_mps3_an547/liteos_m/board/startup.s | 0 arm_mps3_an547/liteos_m/board/target_config.h | 0 .../liteos_m/board/test/matrix_example.c | 0 .../liteos_m/board/test/test_demo.c | 0 arm_mps3_an547/liteos_m/config.gni | 0 arm_mps3_an547/ohos.build | 0 arm_virt/linux/BUILD.gn | 0 arm_virt/linux/chipset/BUILD.gn | 0 .../linux/chipset/etc/fstab.qemu.arm.linux | 0 arm_virt/linux/chipset/etc/fstab.updater | 0 arm_virt/linux/chipset/ohos.its | 0 arm_virt/linux/images/BUILD.gn | 0 arm_virt/linux/images/system_image_conf.txt | 28 +++++++++++++++++ arm_virt/linux/images/userdata_image_conf.txt | 29 +++++++++++++++++ arm_virt/linux/images/vendor_image_conf.txt | 29 +++++++++++++++++ drivers/uart/uart_pl011.h | 2 +- drivers/virtio/virtrng.c | 2 +- riscv32_virt/liteos_m/board/driver/virtgpu.c | 4 +-- .../liteos_m/board/driver/virtinput.c | 2 +- .../board/hardware/display/display_gralloc.c | 2 +- riscv32_virt/liteos_m/board/liteos.ld | 31 +++++++++++++++++++ 40 files changed, 186 insertions(+), 7 deletions(-) mode change 100755 => 100644 arm_mps3_an547/BUILD.gn mode change 100755 => 100644 arm_mps3_an547/README.md mode change 100755 => 100644 arm_mps3_an547/README_zh.md mode change 100755 => 100644 arm_mps3_an547/liteos_m/BUILD.gn mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/BUILD.gn mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/driver/LICENSE-apache-2.0.txt mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/driver/uart.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/fs/fs_config.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/include/soc.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/include/uart.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/libc/dprintf.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/liteos.ld mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/main.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/startup.s mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/target_config.h mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/test/matrix_example.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/board/test/test_demo.c mode change 100755 => 100644 arm_mps3_an547/liteos_m/config.gni mode change 100755 => 100644 arm_mps3_an547/ohos.build mode change 100755 => 100644 arm_virt/linux/BUILD.gn mode change 100755 => 100644 arm_virt/linux/chipset/BUILD.gn mode change 100755 => 100644 arm_virt/linux/chipset/etc/fstab.qemu.arm.linux mode change 100755 => 100644 arm_virt/linux/chipset/etc/fstab.updater mode change 100755 => 100644 arm_virt/linux/chipset/ohos.its mode change 100755 => 100644 arm_virt/linux/images/BUILD.gn mode change 100755 => 100644 arm_virt/linux/images/system_image_conf.txt diff --git a/SmartL_E802/liteos_m/board/hals/csky_driver/src/dw_gpio.c b/SmartL_E802/liteos_m/board/hals/csky_driver/src/dw_gpio.c index 5b0cb8f..c84c848 100644 --- a/SmartL_E802/liteos_m/board/hals/csky_driver/src/dw_gpio.c +++ b/SmartL_E802/liteos_m/board/hals/csky_driver/src/dw_gpio.c @@ -634,7 +634,7 @@ int32_t csi_gpio_pin_write(gpio_pin_handle_t handle, bool value) dw_gpio_priv_t *port_handle = &gpio_handle[gpio_pin_priv->portidx]; uint8_t offset = gpio_pin_priv->idx; - uint32_t port_value = value << offset; + uint32_t port_value = (uint32_t)value << offset; port_handle->value = port_value; gpio_write(port_handle, (1 << offset)); diff --git a/arm_mps2_an386/liteos_m/board/liteos.ld b/arm_mps2_an386/liteos_m/board/liteos.ld index 11e2264..27e3807 100644 --- a/arm_mps2_an386/liteos_m/board/liteos.ld +++ b/arm_mps2_an386/liteos_m/board/liteos.ld @@ -1,3 +1,34 @@ +/* + * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(Vector_Table) diff --git a/arm_mps3_an547/BUILD.gn b/arm_mps3_an547/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/README.md b/arm_mps3_an547/README.md old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/README_zh.md b/arm_mps3_an547/README_zh.md old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/BUILD.gn b/arm_mps3_an547/liteos_m/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/BUILD.gn b/arm_mps3_an547/liteos_m/board/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/driver/LICENSE-apache-2.0.txt b/arm_mps3_an547/liteos_m/board/driver/LICENSE-apache-2.0.txt old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.c b/arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.h b/arm_mps3_an547/liteos_m/board/driver/arm_uart_drv.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/driver/uart.c b/arm_mps3_an547/liteos_m/board/driver/uart.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h b/arm_mps3_an547/liteos_m/board/fs/ff_gen_drv.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/fs/fs_config.h b/arm_mps3_an547/liteos_m/board/fs/fs_config.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/include/soc.h b/arm_mps3_an547/liteos_m/board/include/soc.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/include/uart.h b/arm_mps3_an547/liteos_m/board/include/uart.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/libc/dprintf.c b/arm_mps3_an547/liteos_m/board/libc/dprintf.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/liteos.ld b/arm_mps3_an547/liteos_m/board/liteos.ld old mode 100755 new mode 100644 index b47f8d1..e7b5b59 --- a/arm_mps3_an547/liteos_m/board/liteos.ld +++ b/arm_mps3_an547/liteos_m/board/liteos.ld @@ -1,3 +1,34 @@ +/* + * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + OUTPUT_FORMAT("elf32-littlearm", "elf32-bigarm", "elf32-littlearm") OUTPUT_ARCH(arm) ENTRY(Vector_Table) diff --git a/arm_mps3_an547/liteos_m/board/main.c b/arm_mps3_an547/liteos_m/board/main.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/startup.s b/arm_mps3_an547/liteos_m/board/startup.s old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/target_config.h b/arm_mps3_an547/liteos_m/board/target_config.h old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/test/matrix_example.c b/arm_mps3_an547/liteos_m/board/test/matrix_example.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/board/test/test_demo.c b/arm_mps3_an547/liteos_m/board/test/test_demo.c old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/liteos_m/config.gni b/arm_mps3_an547/liteos_m/config.gni old mode 100755 new mode 100644 diff --git a/arm_mps3_an547/ohos.build b/arm_mps3_an547/ohos.build old mode 100755 new mode 100644 diff --git a/arm_virt/linux/BUILD.gn b/arm_virt/linux/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_virt/linux/chipset/BUILD.gn b/arm_virt/linux/chipset/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_virt/linux/chipset/etc/fstab.qemu.arm.linux b/arm_virt/linux/chipset/etc/fstab.qemu.arm.linux old mode 100755 new mode 100644 diff --git a/arm_virt/linux/chipset/etc/fstab.updater b/arm_virt/linux/chipset/etc/fstab.updater old mode 100755 new mode 100644 diff --git a/arm_virt/linux/chipset/ohos.its b/arm_virt/linux/chipset/ohos.its old mode 100755 new mode 100644 diff --git a/arm_virt/linux/images/BUILD.gn b/arm_virt/linux/images/BUILD.gn old mode 100755 new mode 100644 diff --git a/arm_virt/linux/images/system_image_conf.txt b/arm_virt/linux/images/system_image_conf.txt old mode 100755 new mode 100644 index 1b826e8..bb74eb9 --- a/arm_virt/linux/images/system_image_conf.txt +++ b/arm_virt/linux/images/system_image_conf.txt @@ -1,3 +1,31 @@ + # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + # Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + # + # Redistribution and use in source and binary forms, with or without modification, + # are permitted provided that the following conditions are met: + # + # 1. Redistributions of source code must retain the above copyright notice, this list of + # conditions and the following disclaimer. + # + # 2. Redistributions in binary form must reproduce the above copyright notice, this list + # of conditions and the following disclaimer in the documentation and/or other materials + # provided with the distribution. + # + # 3. Neither the name of the copyright holder nor the names of its contributors may be used + # to endorse or promote products derived from this software without specific prior written + # permission. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. / 104857600 --fs_type=ext4 diff --git a/arm_virt/linux/images/userdata_image_conf.txt b/arm_virt/linux/images/userdata_image_conf.txt index 93c56f6..d6ac1c3 100644 --- a/arm_virt/linux/images/userdata_image_conf.txt +++ b/arm_virt/linux/images/userdata_image_conf.txt @@ -1,3 +1,32 @@ + # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + # Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + # + # Redistribution and use in source and binary forms, with or without modification, + # are permitted provided that the following conditions are met: + # + # 1. Redistributions of source code must retain the above copyright notice, this list of + # conditions and the following disclaimer. + # + # 2. Redistributions in binary form must reproduce the above copyright notice, this list + # of conditions and the following disclaimer in the documentation and/or other materials + # provided with the distribution. + # + # 3. Neither the name of the copyright holder nor the names of its contributors may be used + # to endorse or promote products derived from this software without specific prior written + # permission. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /data 104857600 --fs_type=ext4 diff --git a/arm_virt/linux/images/vendor_image_conf.txt b/arm_virt/linux/images/vendor_image_conf.txt index f111778..cc3520a 100644 --- a/arm_virt/linux/images/vendor_image_conf.txt +++ b/arm_virt/linux/images/vendor_image_conf.txt @@ -1,3 +1,32 @@ + # Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + # Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + # + # Redistribution and use in source and binary forms, with or without modification, + # are permitted provided that the following conditions are met: + # + # 1. Redistributions of source code must retain the above copyright notice, this list of + # conditions and the following disclaimer. + # + # 2. Redistributions in binary form must reproduce the above copyright notice, this list + # of conditions and the following disclaimer in the documentation and/or other materials + # provided with the distribution. + # + # 3. Neither the name of the copyright holder nor the names of its contributors may be used + # to endorse or promote products derived from this software without specific prior written + # permission. + # + # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + # "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + # OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + # WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + /vendor 104857600 --fs_type=ext4 diff --git a/drivers/uart/uart_pl011.h b/drivers/uart/uart_pl011.h index 3347d4d..3e31266 100644 --- a/drivers/uart/uart_pl011.h +++ b/drivers/uart/uart_pl011.h @@ -166,7 +166,7 @@ struct UartDmaTransfer { /* dma receive buf cycled flag */ uint32_t flags; #define BUF_CIRCLED (1 << 0) - /* dma receive buf, shoud be cache aligned */ + /* dma receive buf, should be cache aligned */ char *buf; }; diff --git a/drivers/virtio/virtrng.c b/drivers/virtio/virtrng.c index 3f04afa..e0e0f16 100644 --- a/drivers/virtio/virtrng.c +++ b/drivers/virtio/virtrng.c @@ -154,7 +154,7 @@ static struct Virtrng *VirtrngInitDev(void) HDF_LOGE("[%s]alloc rng memory failed", __func__); return NULL; } - memset_s(rng, len, 0, len); + (void)memset_s(rng, len, 0, len); if (!VirtmmioDiscover(VIRTMMIO_DEVICE_ID_RNG, &rng->dev)) { goto ERR_OUT; diff --git a/riscv32_virt/liteos_m/board/driver/virtgpu.c b/riscv32_virt/liteos_m/board/driver/virtgpu.c index d18bb81..0342bc4 100644 --- a/riscv32_virt/liteos_m/board/driver/virtgpu.c +++ b/riscv32_virt/liteos_m/board/driver/virtgpu.c @@ -514,7 +514,7 @@ static struct Virtgpu *VirtgpuInitDev(void) len = sizeof(struct Virtgpu) + VirtqSize(VIRTQ_CONTROL_QSZ) + VirtqSize(VIRTQ_CURSOR_QSZ); gpu = LOS_MemAlloc(OS_SYS_MEM_ADDR, len * sizeof(void *)); if (gpu != NULL) { - memset_s(gpu, len * sizeof(void *), 0, len * sizeof(void *)); + (void)memset_s(gpu, len * sizeof(void *), 0, len * sizeof(void *)); } else { HDF_LOGE("[%s]alloc gpu memory failed\n", __func__); return NULL; @@ -649,7 +649,7 @@ static bool VirtgpuInitResource(void) /* Framebuffer must be physical continuous. fb_register will zero the buffer */ g_virtGpu->fb = LOS_MemAlloc(OS_SYS_MEM_ADDR, VirtgpuFbPageSize()); if (g_virtGpu->fb != NULL) { - memset_s(g_virtGpu->fb, VirtgpuFbPageSize(), 0, VirtgpuFbPageSize()); + (void)memset_s(g_virtGpu->fb, VirtgpuFbPageSize(), 0, VirtgpuFbPageSize()); } else { HDF_LOGE("[%s]alloc framebuffer memory fail", __func__); return false; diff --git a/riscv32_virt/liteos_m/board/driver/virtinput.c b/riscv32_virt/liteos_m/board/driver/virtinput.c index 5f57ed8..53bd313 100644 --- a/riscv32_virt/liteos_m/board/driver/virtinput.c +++ b/riscv32_virt/liteos_m/board/driver/virtinput.c @@ -326,7 +326,7 @@ static struct Virtin *VirtinInitDev(void) len = sizeof(struct Virtin) + VirtqSize(VIRTQ_EVENT_QSZ) + VirtqSize(VIRTQ_STATUS_QSZ); in = LOS_MemAlloc(OS_SYS_MEM_ADDR, len * sizeof(void *)); if (in != NULL) { - memset_s(in, len * sizeof(void *), 0, len * sizeof(void *)); + (void)memset_s(in, len * sizeof(void *), 0, len * sizeof(void *)); } else { HDF_LOGE("[%s]alloc virtio-input memory failed", __func__); return NULL; diff --git a/riscv32_virt/liteos_m/board/hardware/display/display_gralloc.c b/riscv32_virt/liteos_m/board/hardware/display/display_gralloc.c index e11f00c..08a7108 100644 --- a/riscv32_virt/liteos_m/board/hardware/display/display_gralloc.c +++ b/riscv32_virt/liteos_m/board/hardware/display/display_gralloc.c @@ -149,7 +149,7 @@ static int32_t AllocMem(const AllocInfo* info, BufferHandle **buffer) ret = DISPLAY_FAILURE; } else { bufferHdl->virAddr = pBase; - memset_s(pBase, bufferHdl->size, 0x0, bufferHdl->size); + (void)memset_s(pBase, bufferHdl->size, 0x0, bufferHdl->size); ret = DISPLAY_SUCCESS; } diff --git a/riscv32_virt/liteos_m/board/liteos.ld b/riscv32_virt/liteos_m/board/liteos.ld index c2d86d4..b68ac4e 100644 --- a/riscv32_virt/liteos_m/board/liteos.ld +++ b/riscv32_virt/liteos_m/board/liteos.ld @@ -1,3 +1,34 @@ + /* + * Copyright (c) 2013-2019 Huawei Technologies Co., Ltd. All rights reserved. + * Copyright (c) 2020-2022 Huawei Device Co., Ltd. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this list of + * conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, this list + * of conditions and the following disclaimer in the documentation and/or other materials + * provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors may be used + * to endorse or promote products derived from this software without specific prior written + * permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, + * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR + * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; + * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, + * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR + * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + OUTPUT_FORMAT("elf32-littleriscv", "elf32-littleriscv", "elf32-littleriscv") OUTPUT_ARCH("riscv") ENTRY(_start) -- Gitee