scottk/meta-tegra
1
0
Fork 0
mirror of https://github.com/lingble/meta-tegra.git synced 2025-10-29 19:42:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

tegra-minimal-init: clean up for L4T R35.1.0

Browse Source 
The preboot script is common now, and always needs
util-linux-blkid.

Signed-off-by: Matt Madison <matt@madison.systems>
This commit is contained in:
Matt Madison
2022-08-18 15:19:57 -07:00
committed by Matt Madison
parent c5797e2e90
commit d6ab45616a
4 changed files with 20 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
recipes-core/initrdscripts/tegra-minimal-init/platform-preboot-cboot.sh
View File

@@ -1,18 +0,0 @@
slotsfx=""
mayberoot=""
for bootarg in `cat /proc/cmdline`; do
case "$bootarg" in
boot.slot_suffix=*) slotsfx="${bootarg##boot.slot_suffix=}" ;;
root=*) mayberoot="${bootarg##root=}" ;;
ro) opt="ro" ;;
rootwait) wait="yes" ;;
esac
done
rootdev=`blkid -l -t PARTLABEL=APP$slotsfx | cut -d: -f1`
if [ -z "$rootdev" ]; then
if [ -n "$mayberoot" ]; then
rootdev="$mayberoot"
else
rootdev="/dev/mmcblk0p1"
fi
fi

18
recipes-core/initrdscripts/tegra-minimal-init/platform-preboot.sh
View File

@@ -0,0 +1,18 @@
slotsfx=""
mayberoot=""
for bootarg in `cat /proc/cmdline`; do
case "$bootarg" in
boot.slot_suffix=*) slotsfx="${bootarg##boot.slot_suffix=}" ;;
root=*) mayberoot="${bootarg##root=}" ;;
ro) opt="ro" ;;
rootwait) wait="yes" ;;
esac
done
rootdev=`blkid -l -t PARTLABEL=APP$slotsfx | cut -d: -f1`
if [ -z "$rootdev" ]; then
if [ -n "$mayberoot" ]; then
rootdev="$mayberoot"
else
rootdev="/dev/mmcblk0p1"
fi
fi

18
recipes-core/initrdscripts/tegra-minimal-init/tegra194/platform-preboot.sh
View File

@@ -1,18 +0,0 @@
slotsfx=""
mayberoot=""
for bootarg in `cat /proc/cmdline`; do
case "$bootarg" in
boot.slot_suffix=*) slotsfx="${bootarg##boot.slot_suffix=}" ;;
root=*) mayberoot="${bootarg##root=}" ;;
ro) opt="ro" ;;
rootwait) wait="yes" ;;
esac
done
rootdev=`blkid -l -t PARTLABEL=APP$slotsfx | cut -d: -f1`
if [ -z "$rootdev" ]; then
if [ -n "$mayberoot" ]; then
rootdev="$mayberoot"
else
rootdev="/dev/mmcblk0p1"
fi
fi

4
recipes-core/initrdscripts/tegra-minimal-init_1.0.bb
View File

@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/MIT;md5=0835ade698e0bcf8506ecda
SRC_URI = "\
file://init-boot.sh \
file://platform-preboot.sh \
${@'file://platform-preboot-cboot.sh' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}"
"
COMPATIBLE_MACHINE = "(tegra)"
@@ -27,5 +27,5 @@ do_install() {
fi
}
RDEPENDS:${PN} = "${@'util-linux-blkid' if d.getVar('PREFERRED_PROVIDER_virtual/bootloader').startswith('cboot') else ''}"
RDEPENDS:${PN} = "util-linux-blkid"
FILES:${PN} = "/"