Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion kernel/scripts/build_kernel.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,9 @@ kpath=$BUILD_TOP/qcom-next/arch/arm64/boot
CRD_DTB=$kpath/dts/qcom/x1e80100-crd.dtb
EVK_DTB=$kpath/dts/qcom/hamoa-iot-evk.dtb
QCS6490_DTB=$kpath/dts/qcom/qcs6490-rb3gen2.dtb

QCS8300_DTB=$kpath/dts/qcom/qcs8300-ride.dtb
QCS9100_DTB=$kpath/dts/qcom/qcs9100-ride-r3.dtb

# Clean previous build
rm -rf $BUILD_TOP/out/*;

Expand All @@ -40,3 +42,5 @@ make ARCH=arm64 modules_install INSTALL_MOD_PATH=$BUILD_TOP/out/modules INSTALL_
[ -f "$CRD_DTB" ] && cp "$CRD_DTB" "$BUILD_TOP/out/"
[ -f "$EVK_DTB" ] && cp "$EVK_DTB" "$BUILD_TOP/out/"
[ -f "$QCS6490_DTB" ] && cp "$QCS6490_DTB" "$BUILD_TOP/out/"
[ -f "$QCS8300_DTB" ] && cp "$QCS8300_DTB" "$BUILD_TOP/out/"
[ -f "$QCS9100_DTB" ] && cp "$QCS9100_DTB" "$BUILD_TOP/out/"
16 changes: 14 additions & 2 deletions rootfs/scripts/build-ubuntu-rootfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ KERNEL_DEB=""
FIRMWARE_DEB=""
USE_CONF=0
USE_MANIFEST=0
TARGET=""

if [[ $# -eq 4 ]]; then
CONF="$1"
Expand All @@ -87,6 +88,7 @@ elif [[ $# -eq 3 ]]; then
FIRMWARE_DEB="$2"
USE_CONF=0
USE_MANIFEST=0
TARGET="$3"
fi
elif [[ $# -eq 2 ]]; then
CONF=""
Expand Down Expand Up @@ -416,13 +418,23 @@ echo '[CHROOT] Base package list preserved as /tmp/\${CODENAME}_base.manifest'
echo '[CHROOT] Custom installed packages saved to /tmp/packages_\${DATE}.manifest'

echo '[CHROOT] Detecting installed kernel version...'
kernel_ver=\$(ls /boot/vmlinuz-* | sed 's|.*/vmlinuz-||' | sort -V | tail -n1)
kernel_ver=\$(echo "$KERNEL_DEB" | sed -n 's|.*/linux-kernel-\(.*\)-arm64\.deb|\1|p')
crd_dtb_path=\"/lib/firmware/\$kernel_ver/device-tree/x1e80100-crd.dtb\"

echo '[CHROOT] Writing GRUB configuration...'
tee /boot/grub.cfg > /dev/null <<GRUBCFG
set timeout=5
set default=${CODENAME}_crd
\#set default=${CODENAME}_crd
set default=\"QLI\"
if [ "$TARGET" == \"hamoa\" ]; then
set default=\"hamoa\"
fi
menuentry \"Ubuntu QLI IoT for X Elite CRD\" --id QLI {
search --no-floppy --label system --set=root
linux /boot/vmlinuz-\$kernel_ver earlycon console=ttyMSM0,115200n8 root=LABEL=system cma=128M rw clk_ignore_unused pd_ignore_unused efi=noruntime rootwait ignore_loglevel
initrd /boot/initrd.img-\$kernel_ver
}

menuentry \"Ubuntu ${CODENAME} IoT for X Elite CRD\" --id ${CODENAME}_crd {
search --no-floppy --label system --set=root
devicetree \$crd_dtb_path
Expand Down
Loading