Skip to content

Commit 0b6c476

Browse files
committed
Do not inject pine64_model into uEnv.txt
1 parent 11512a1 commit 0b6c476

File tree

2 files changed

+1
-11
lines changed

2 files changed

+1
-11
lines changed

simpleimage/make_rootfs.sh

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -296,9 +296,6 @@ elif [ -n "$LINUX" -a "$LINUX" != "-" ]; then
296296
rm -f "$BOOT/uEnv.txt"
297297
cp -RLp $TEMP/kernel/boot/* "$BOOT/"
298298
mv "$BOOT/uEnv.txt.in" "$BOOT/uEnv.txt"
299-
if [[ "$model" == "pinebook" ]] || [[ "$model" == "pinebook1080p" ]]; then
300-
echo "pine64_model=$model" >> "$BOOT/uEnv.txt"
301-
fi
302299
fi
303300
cp -RLp $TEMP/kernel/lib/* "$DEST/lib/" 2>/dev/null || true
304301
cp -RLp $TEMP/kernel/usr/* "$DEST/usr/"

simpleimage/make_simpleimage.sh

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -77,18 +77,11 @@ if [ -n "$kernel_tarball" ]; then
7777
echo "Using Kernel from $kernel_tarball ..."
7878
tar -C $temp -xJf "$kernel_tarball"
7979
mv $temp/boot/uEnv.txt.in $temp/boot/uEnv.txt
80-
if [[ -n "$model" ]]; then
81-
echo "pine64_model=$model" >> $temp/boot/uEnv.txt
82-
fi
8380
mcopy -sm -i ${out}1 ${temp}/boot/* ::
8481
elif [ -e "${kernel}/pine64/Image" -a -e "${kernel}/pine64/sun50i-a64-pine64-plus.dtb" ]; then
85-
cp ${kernel}/uEnv.txt ${temp}/
86-
if [[ -n "$model" ]]; then
87-
echo "pine64_model=$model" >> ${temp}/uEnv.txt
88-
fi
8982
mcopy -sm -i ${out}1 ${kernel}/pine64 ::
9083
mcopy -m -i ${out}1 ${kernel}/initrd.img :: || true
91-
mcopy -m -i ${out}1 ${temp}/uEnv.txt :: || true
84+
mcopy -m -i ${out}1 ${kernel}/uEnv.txt :: || true
9285
fi
9386
dd if=${out}1 conv=notrunc oflag=append bs=1M seek=$((part_position/1024)) of="$out"
9487
rm -f ${out}1

0 commit comments

Comments
 (0)