Commit b38b4db4 authored by Guido Gunther's avatar Guido Gunther
Browse files

Drop manual uboot setup

All now supported boards use flash-kernel.
parent 52294fcc
......@@ -29,20 +29,6 @@ build_auth () {
}
fetch_nitrogen_uboot_upgrade() {
local board="$1"
local url="$2"
local out="$3"
dest="${out}/uboot-${board}"
[ ! -d "${dest}" ] || return 0
echo -n "Fetching uboot upgrade..."
wget -q -Ascr -Aupgrade -A"*nitrogen*" -P"${dest}" -nd -l 1 --mirror "${url}/uboot-${board}/"
echo "done."
}
fetch_kernel() {
[ -n "${kernel_url}" ] || { echo "kernel_url not set in board config"; exit 1; }
rm -f files/archive.zip
......@@ -269,7 +255,6 @@ sudo pureos_board="${pureos_board}" \
http_proxy="${http_apt_proxy:-${http_proxy:-}}" \
https_proxy="${https_apt_proxy:-${https_proxy:-}}" \
qemu="${qemu}" \
fdt_file="${fdt_file}" \
build_tarball="${build_tarball}" \
apt_sources="${escaped_apt_sources}" \
kernel_deb="${kernel_deb}" \
......
......@@ -145,35 +145,6 @@ function setup_kernel()
}
function setup_uboot()
{
[ -n "${fdt_file}" ] || return
sed -e "s/##DTBNAME##/${fdt_file}/" "data/boot-${uboot_type}.txt.in" > "${basedir}/boot/boot_emmc.txt"
sed -e "s/##RFSPART##/0/" -i "${basedir}/boot/boot_emmc.txt"
mkimage -A arm -T script -O linux -d "${basedir}/boot/boot_emmc.txt" "${basedir}/boot/boot_emmc.scr"
sed -e "s/##DTBNAME##/${fdt_file}/" "data/boot-${uboot_type}.txt.in" > "${basedir}/boot/boot_sd.txt"
sed -e "s/##RFSPART##/1/" -i "${basedir}/boot/boot_sd.txt"
mkimage -A arm -T script -O linux -d "${basedir}/boot/boot_sd.txt" "${basedir}/boot/boot_sd.scr"
# TODO: Use flash-kernel for these boards too
case "${pureos_board}" in
imx6)
ln -fs boot_sd.scr "${basedir}/boot/6x_bootscript"
;;
imx8|em-som)
ln -fs boot_sd.scr "${basedir}/boot/boot.scr"
;;
*)
echo "setup_uboot: Unhandled board type ${pureos_board} for"
exit 1
;;
esac
[ ! -d "files/uboot-${uboot_type}" ] || cp -a "files/uboot-${uboot_type}/"* "${basedir}/boot/"
}
function build_tarball()
{
tarball=$(basename "${image_name}" .img).tar.xz
......@@ -413,15 +384,6 @@ if [ -n "${use_luks}" ]; then
fi
setup_kernel
case "${pureos_board}" in
# Non flash-kernel boards
imx6|imx8|ec-som)
setup_uboot
;;
?)
echo "No u-boot needed for ${pureos_board}"
;;
esac
[ -z "${use_luks}" ] || cleanup_cryptroot
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment