From e45aaa96d3764a461bf1781a3ab133c3164720e5 Mon Sep 17 00:00:00 2001 From: Mark Hatle Date: Mon, 24 Jan 2022 12:29:26 -0800 Subject: Sync to honister Honister fixed a couple of typos, this resolves the same in the 2022 branch. Signed-off-by: Mark Hatle --- meta-xilinx-core/conf/local.conf.sample | 6 +++--- .../recipes-core/meta/files/dt-processor.sh | 20 ++++++++++---------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/meta-xilinx-core/conf/local.conf.sample b/meta-xilinx-core/conf/local.conf.sample index 944207c6..a7173fb8 100644 --- a/meta-xilinx-core/conf/local.conf.sample +++ b/meta-xilinx-core/conf/local.conf.sample @@ -27,7 +27,7 @@ # #MACHINE ?= "ultra96-zynqmp" # -# This sets the default machine to be qemux86-64 if no other machine is selected: +# This sets the default machine if no other machine is selected: MACHINE ??= "zynqmp-generic" # @@ -76,7 +76,7 @@ MACHINE ??= "zynqmp-generic" # # The distribution setting controls which policy settings are used as defaults. # The default value is fine for general Yocto project use, at least initially. -# Ultimately when creating custom policy, people will likely end up subclassing +# Ultimately when creating custom policy, people will likely end up subclassing # these defaults. # DISTRO ?= "petalinux" @@ -171,7 +171,7 @@ PATCHRESOLVE = "noop" # # Disk Space Monitoring during the build # -# Monitor the disk space during the build. If there is less that 1GB of space or less +# Monitor the disk space during the build. If there is less than 1GB of space or less # than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully # shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort # of the build. The reason for this is that running completely out of space can corrupt diff --git a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh index 96054979..a8da5b4a 100755 --- a/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh +++ b/meta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh @@ -89,7 +89,7 @@ detect_machine() { } cortex_a53_linux() { - info "coretex-a53 for Linux [ $1 ]" + info "cortex-a53 for Linux [ $1 ]" if [ "$1" = "None" ]; then dtb_file="cortexa53-${machine}-linux.dtb" @@ -146,9 +146,9 @@ a53_fsbl_done=0 cortex_a53_baremetal() { if [ "$1" = "fsbl" ]; then [ ${a53_fsbl_done} = 1 ] && return - info "coretex-a53 FSBL baremetal configuration" + info "cortex-a53 FSBL baremetal configuration" else - info "coretex-a53 for baremetal [ $1 ]" + info "cortex-a53 for baremetal [ $1 ]" fi suffix=""; lto="-nolto" @@ -210,7 +210,7 @@ EOF } cortex_a53_freertos() { - info "coretex-a53 for FreeRTOS [ $1 ]" + info "cortex-a53 for FreeRTOS [ $1 ]" suffix="" [ "$1" != "None" ] && suffix="-$1" @@ -262,7 +262,7 @@ EOF } cortex_a72_linux() { - info "coretex-a72 for Linux [ $1 ]" + info "cortex-a72 for Linux [ $1 ]" if [ "$1" = "None" ]; then dtb_file="cortexa72-${machine}-linux.dtb" @@ -318,7 +318,7 @@ EOF } cortex_a72_baremetal() { - info "coretex-a72 for baremetal [ $1 ]" + info "cortex-a72 for baremetal [ $1 ]" suffix="" [ "$1" != "None" ] && suffix="-$1" @@ -370,7 +370,7 @@ EOF } cortex_a72_freertos() { - info "coretex-a72 for FreeRTOS [ $1 ]" + info "cortex-a72 for FreeRTOS [ $1 ]" suffix="" [ "$1" != "None" ] && suffix="-$1" @@ -425,9 +425,9 @@ r5_fsbl_done=0 cortex_r5_baremetal() { if [ "$1" = "fsbl" ]; then [ ${r5_fsbl_done} = 1 ] && return - info "coretex-r5 FSBL baremetal configuration" + info "cortex-r5 FSBL baremetal configuration" else - info "coretex-r5 for baremetal [ $1 ]" + info "cortex-r5 for baremetal [ $1 ]" fi suffix=""; lto="-nolto" @@ -489,7 +489,7 @@ EOF } cortex_r5_freertos() { - info "coretex-r5 for FreeRTOS [ $1 ]" + info "cortex-r5 for FreeRTOS [ $1 ]" suffix="" [ "$1" != "None" ] && suffix="-$1" -- cgit v1.2.3-54-g00ecf