Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
meta-seconorth-machine
Manage
Activity
Members
Labels
Plan
Jira
Code
Merge requests
8
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
SECO Northern Europe
Yocto
layers
meta-seconorth-machine
Commits
8133f2ec
Commit
8133f2ec
authored
3 years ago
by
Jonas Höppner
Browse files
Options
Downloads
Patches
Plain Diff
bootscript:u-boot: Fix some syntax errors
parent
2896d21b
No related branches found
No related tags found
1 merge request
!105
bootscript:u-boot: Fix some syntax errors
Pipeline
#17082
passed with stages
Stage:
Stage:
in 27 minutes and 11 seconds
Changes
2
Pipelines
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
+7
-3
7 additions, 3 deletions
recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
+16
-5
16 additions, 5 deletions
recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
with
23 additions
and
8 deletions
recipes-bsp/bootscript/bootscript-uboot-alt/boot-alt.scr.cfg
+
7
−
3
View file @
8133f2ec
...
@@ -2,13 +2,17 @@
...
@@ -2,13 +2,17 @@
if
fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then
if
fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t ${loadaddr} ${filesize}; then
if
test -n ${cmdline};then
if
test -n ${cmdline};then
echo
"
Kernel cmdline: ${cmdline}
"
echo
'
Kernel cmdline: ${cmdline}
'
setenv
bootargs ${cmdline}
setenv
bootargs ${cmdline}
fi
fi
if
test -n ${devicetree};then
if
test -n ${devicetree};then
echo
"Loading devicetree ${devicetree}..."
echo
"Loading devicetree ${devicetree}..."
if
fatload mmc ${current_partition} ${fdt_addr} ${devicetree}
if
fatload mmc ${current_partition} ${fdt_addr} ${devicetree};then
true
else
echo
'Failed to load devicetree ${devicetree}'
fi
fi
fi
if
test -n ${overlays}; then
if
test -n ${overlays}; then
...
@@ -17,7 +21,7 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
...
@@ -17,7 +21,7 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
if
fatload mmc ${current_partition} ${loadaddr} ${ov};then
if
fatload mmc ${current_partition} ${loadaddr} ${ov};then
fdt
resize ${filesize} && fdt apply ${loadaddr}
fdt
resize ${filesize} && fdt apply ${loadaddr}
else
else
echo
'Failed to load overlay ${ov}
echo
'Failed to load overlay ${ov}
'
fi
fi
done
done
fi
fi
...
...
This diff is collapsed.
Click to expand it.
recipes-bsp/bootscript/bootscript-uboot/boot.scr.cfg
+
16
−
5
View file @
8133f2ec
if
fatload mmc ${current_partition} ${loadaddr} boot
-alt
.cfg && env import -t ${loadaddr} ${filesize}; then
if
fatload mmc ${current_partition} ${loadaddr} boot.cfg && env import -t ${loadaddr} ${filesize}; then
if
test -n ${cmdline};then
if
test -n ${cmdline};then
echo
"
Kernel cmdline: ${cmdline}
"
echo
'
Kernel cmdline: ${cmdline}
'
setenv
bootargs ${cmdline}
setenv
bootargs ${cmdline}
fi
fi
if
test -n ${devicetree};then
if
test -n ${devicetree};then
echo
"Loading devicetree ${devicetree}..."
echo
"Loading devicetree ${devicetree}..."
fatload
mmc ${current_partition} ${fdt_addr} ${devicetree}
if
fatload mmc ${current_partition} ${fdt_addr} ${devicetree};then
true
else
echo
'Failed to load devicetree ${devicetree}'
fi
fi
fi
if
test -n ${overlays}; then
if
test -n ${overlays}; then
for
ov in ${overlays}; do
for
ov in ${overlays}; do
echo
Overlaying ${ov}...
echo
Overlaying ${ov}...
fatload
mmc ${current_partition} ${loadaddr} ${ov} && fdt resize ${filesize} && fdt apply ${loadaddr}
if
fatload mmc ${current_partition} ${loadaddr} ${ov};then
fdt
resize ${filesize} && fdt apply ${loadaddr}
else
echo
'Failed to load overlay ${ov}'
fi
done
done
fi
fi
...
@@ -23,6 +31,8 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
...
@@ -23,6 +31,8 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo
"Loading initramfs ${initramfs}..."
echo
"Loading initramfs ${initramfs}..."
if
fatload mmc ${current_partition} ${initrd_addr} ${initramfs};then
if
fatload mmc ${current_partition} ${initrd_addr} ${initramfs};then
initrd=${initrd_addr}:${filesize}
initrd=${initrd_addr}:${filesize}
else
echo
'Failed to load initramfs ${initramfs}'
fi
fi
fi
fi
...
@@ -38,5 +48,6 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
...
@@ -38,5 +48,6 @@ if fatload mmc ${current_partition} ${loadaddr} boot-alt.cfg && env import -t $
echo
'Unable to load kernel ${kernel}'
echo
'Unable to load kernel ${kernel}'
fi
fi
else
else
echo
'No valid boot
-alt
.cfg found'
echo
'No valid boot.cfg found'
fi;
fi;
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment