diff --git a/bsp/meta-hisilicon/recipes-core/images/image-hi3093.inc b/bsp/meta-hisilicon/recipes-core/images/image-hi3093.inc index 469ce4f80db54edd2960cc8fd922b204c83c7e0f..32c883024fbe11ae23ffeb2bba92ab6b5831e1da 100644 --- a/bsp/meta-hisilicon/recipes-core/images/image-hi3093.inc +++ b/bsp/meta-hisilicon/recipes-core/images/image-hi3093.inc @@ -1,5 +1,5 @@ # This file should be included in openeuler-image.bbappend, openeuler-image-ros.bbappend, etc. -# diff from ${MACHINE}.inc, it shoud not include by live image +# diff from ${MACHINE}.inc, it should not include by live image require ${@bb.utils.contains("DISTRO_FEATURES", "mpu_solution", "pack-hi3093.inc", "recipes-core/images/qemu.inc", d)} require recipes-core/images/bsp-${MACHINE}.inc diff --git a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb index 8b9c1bc29df153f7ff507071cff4402730ecaaa3..575c084583046931d65525ac58d5135c2563d22d 100644 --- a/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb +++ b/bsp/meta-openeuler-bsp/raspberrypi/recipes-bsp/uefi/rpi-tf-a.bb @@ -14,7 +14,7 @@ SRC_URI = "file://${OPENEULER_LOCAL_NAME}/${BPN}/${BP}.tar.gz \ SRC_URI[md5sum] = "2622f7077e30436b2310bea0232c7cec" SRC_URI[sha256sum] = "3905a6d6affa84fb629d1565a4e4bdc82812bba49a457b8249ab445eeb28011b" -# overide LDFLAGS to allow rpi4 TF-A to build without: "aarch64-openeuler-linux-gnu-ld.bfd: unrecognized option '-Wl,-O1'" +# override LDFLAGS to allow rpi4 TF-A to build without: "aarch64-openeuler-linux-gnu-ld.bfd: unrecognized option '-Wl,-O1'" # add "--no-warn-rwx-segments" to fix: "bl2.elf has a LOAD segment with RWX permissions" export LDFLAGS="--no-warn-rwx-segments"