summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMark Hatle <mark.hatle@xilinx.com>2022-01-24 12:29:26 -0800
committerMark Hatle <mark.hatle@xilinx.com>2022-01-25 07:47:41 -0800
commite45aaa96d3764a461bf1781a3ab133c3164720e5 (patch)
treeab8431f24ded128353db244053546453e47b70c2
parentb9b9dae35bef153adcb57d2adb6981323450ca98 (diff)
downloadmeta-xilinx-e45aaa96d3764a461bf1781a3ab133c3164720e5.tar.gz
Sync to honister
Honister fixed a couple of typos, this resolves the same in the 2022 branch. Signed-off-by: Mark Hatle <mark.hatle@xilinx.com>
-rw-r--r--meta-xilinx-core/conf/local.conf.sample6
-rwxr-xr-xmeta-xilinx-standalone-experimental/recipes-core/meta/files/dt-processor.sh20
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 @@
27# 27#
28#MACHINE ?= "ultra96-zynqmp" 28#MACHINE ?= "ultra96-zynqmp"
29# 29#
30# This sets the default machine to be qemux86-64 if no other machine is selected: 30# This sets the default machine if no other machine is selected:
31MACHINE ??= "zynqmp-generic" 31MACHINE ??= "zynqmp-generic"
32 32
33# 33#
@@ -76,7 +76,7 @@ MACHINE ??= "zynqmp-generic"
76# 76#
77# The distribution setting controls which policy settings are used as defaults. 77# The distribution setting controls which policy settings are used as defaults.
78# The default value is fine for general Yocto project use, at least initially. 78# The default value is fine for general Yocto project use, at least initially.
79# Ultimately when creating custom policy, people will likely end up subclassing 79# Ultimately when creating custom policy, people will likely end up subclassing
80# these defaults. 80# these defaults.
81# 81#
82DISTRO ?= "petalinux" 82DISTRO ?= "petalinux"
@@ -171,7 +171,7 @@ PATCHRESOLVE = "noop"
171# 171#
172# Disk Space Monitoring during the build 172# Disk Space Monitoring during the build
173# 173#
174# Monitor the disk space during the build. If there is less that 1GB of space or less 174# Monitor the disk space during the build. If there is less than 1GB of space or less
175# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully 175# than 100K inodes in any key build location (TMPDIR, DL_DIR, SSTATE_DIR), gracefully
176# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort 176# shutdown the build. If there is less than 100MB or 1K inodes, perform a hard abort
177# of the build. The reason for this is that running completely out of space can corrupt 177# 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() {
89} 89}
90 90
91cortex_a53_linux() { 91cortex_a53_linux() {
92 info "coretex-a53 for Linux [ $1 ]" 92 info "cortex-a53 for Linux [ $1 ]"
93 93
94 if [ "$1" = "None" ]; then 94 if [ "$1" = "None" ]; then
95 dtb_file="cortexa53-${machine}-linux.dtb" 95 dtb_file="cortexa53-${machine}-linux.dtb"
@@ -146,9 +146,9 @@ a53_fsbl_done=0
146cortex_a53_baremetal() { 146cortex_a53_baremetal() {
147 if [ "$1" = "fsbl" ]; then 147 if [ "$1" = "fsbl" ]; then
148 [ ${a53_fsbl_done} = 1 ] && return 148 [ ${a53_fsbl_done} = 1 ] && return
149 info "coretex-a53 FSBL baremetal configuration" 149 info "cortex-a53 FSBL baremetal configuration"
150 else 150 else
151 info "coretex-a53 for baremetal [ $1 ]" 151 info "cortex-a53 for baremetal [ $1 ]"
152 fi 152 fi
153 153
154 suffix=""; lto="-nolto" 154 suffix=""; lto="-nolto"
@@ -210,7 +210,7 @@ EOF
210} 210}
211 211
212cortex_a53_freertos() { 212cortex_a53_freertos() {
213 info "coretex-a53 for FreeRTOS [ $1 ]" 213 info "cortex-a53 for FreeRTOS [ $1 ]"
214 214
215 suffix="" 215 suffix=""
216 [ "$1" != "None" ] && suffix="-$1" 216 [ "$1" != "None" ] && suffix="-$1"
@@ -262,7 +262,7 @@ EOF
262} 262}
263 263
264cortex_a72_linux() { 264cortex_a72_linux() {
265 info "coretex-a72 for Linux [ $1 ]" 265 info "cortex-a72 for Linux [ $1 ]"
266 266
267 if [ "$1" = "None" ]; then 267 if [ "$1" = "None" ]; then
268 dtb_file="cortexa72-${machine}-linux.dtb" 268 dtb_file="cortexa72-${machine}-linux.dtb"
@@ -318,7 +318,7 @@ EOF
318} 318}
319 319
320cortex_a72_baremetal() { 320cortex_a72_baremetal() {
321 info "coretex-a72 for baremetal [ $1 ]" 321 info "cortex-a72 for baremetal [ $1 ]"
322 322
323 suffix="" 323 suffix=""
324 [ "$1" != "None" ] && suffix="-$1" 324 [ "$1" != "None" ] && suffix="-$1"
@@ -370,7 +370,7 @@ EOF
370} 370}
371 371
372cortex_a72_freertos() { 372cortex_a72_freertos() {
373 info "coretex-a72 for FreeRTOS [ $1 ]" 373 info "cortex-a72 for FreeRTOS [ $1 ]"
374 374
375 suffix="" 375 suffix=""
376 [ "$1" != "None" ] && suffix="-$1" 376 [ "$1" != "None" ] && suffix="-$1"
@@ -425,9 +425,9 @@ r5_fsbl_done=0
425cortex_r5_baremetal() { 425cortex_r5_baremetal() {
426 if [ "$1" = "fsbl" ]; then 426 if [ "$1" = "fsbl" ]; then
427 [ ${r5_fsbl_done} = 1 ] && return 427 [ ${r5_fsbl_done} = 1 ] && return
428 info "coretex-r5 FSBL baremetal configuration" 428 info "cortex-r5 FSBL baremetal configuration"
429 else 429 else
430 info "coretex-r5 for baremetal [ $1 ]" 430 info "cortex-r5 for baremetal [ $1 ]"
431 fi 431 fi
432 432
433 suffix=""; lto="-nolto" 433 suffix=""; lto="-nolto"
@@ -489,7 +489,7 @@ EOF
489} 489}
490 490
491cortex_r5_freertos() { 491cortex_r5_freertos() {
492 info "coretex-r5 for FreeRTOS [ $1 ]" 492 info "cortex-r5 for FreeRTOS [ $1 ]"
493 493
494 suffix="" 494 suffix=""
495 [ "$1" != "None" ] && suffix="-$1" 495 [ "$1" != "None" ] && suffix="-$1"