From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a7b:c386:: with SMTP id s6mr18362243wmj.105.1578904101652; Mon, 13 Jan 2020 00:28:21 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:adf:fdc5:: with SMTP id i5ls4250799wrs.9.gmail; Mon, 13 Jan 2020 00:28:20 -0800 (PST) X-Google-Smtp-Source: APXvYqwPCp9FeM/yq+7x8cWKNiB3vPBMPdWnO9X+7y9aLTtbrBl9waO6fBxgeHHlM358hYX6SasC X-Received: by 2002:adf:f288:: with SMTP id k8mr17909483wro.301.1578904100922; Mon, 13 Jan 2020 00:28:20 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1578904100; cv=none; d=google.com; s=arc-20160816; b=cMOczZtcBTVjcYplp4CcGV92qCzgR84PuZn6lc2IQSliY9lXphoAhqW8vFeBDYWNeL OWEORbqt3mAC0NNRrk4aIox4JO/6S6h6auLdnpwFyI0yu/f13aOp2rI9fdqgJZUSmhs9 co5/4I7p8kbYnii0GqxPbXV2xKGiS1UlSXgZR6ZfyVLvJg8WN10iL3wqz+gSlsiXCazj 1CKk5J9IuvKuano5riu+FrdP0j7yNUYIseZ1H09fI/HVW0xdQ/2cM8M1fzWI4w12L7F1 JshkFtJv5fmu+576nxpyMyMsdwDRBZX7U+Qc39FUGzBgEy5ff63xf1JjHaKU1vMcLx7Q +b8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:references:in-reply-to:message-id:date :subject:to:from; bh=u6Uh1X1WwEYwUQOnWKTumfV4yg9jWKQ4O/DWNFqjwM4=; b=PQj4OBvmvlAN7mX7F9NutzVcyThjwOejA6wFXQxg42EEzk4MTdBCH7QBfIQ8nKne3g s+JRpN15aep6RzglHhlbJ2YJGl8lnHbcn+E9gmY2KT0/A2tHYSdWvZRKATlLb6U6+FLr wt1ztNWQEqjD8DAv2rEb8CLUhavYffYiGATBg863vP0MECbfxhS8wlVE8+USGFGrx33v /GyjRY9CrVmXA1pyty48Mq+FIDfdn5ccbBWW6FbU0c2SC+YrZ6ODlbKaqF6Y+rSZDaWV FFDa1TQbtX9EO2fC9bZqeWVeTVa4kqUXJE1zfdSzqMoIGKmFZRdqH1m26+XLZnK+Lrra uiKg== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Return-Path: Received: from gecko.sbs.de (gecko.sbs.de. [194.138.37.40]) by gmr-mx.google.com with ESMTPS id b9si523299wrw.2.2020.01.13.00.28.20 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 13 Jan 2020 00:28:20 -0800 (PST) Received-SPF: pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) client-ip=194.138.37.40; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of jan.kiszka@siemens.com designates 194.138.37.40 as permitted sender) smtp.mailfrom=jan.kiszka@siemens.com; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=siemens.com Received: from mail1.sbs.de (mail1.sbs.de [192.129.41.35]) by gecko.sbs.de (8.15.2/8.15.2) with ESMTPS id 00D8SK6s032425 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Mon, 13 Jan 2020 09:28:20 +0100 Received: from md1f2u6c.ad001.siemens.net ([139.23.72.137]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00D8SKJh000789 for ; Mon, 13 Jan 2020 09:28:20 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v2 07/13] u-boot-script: Account for variations of kernel files and boot commands Date: Mon, 13 Jan 2020 09:28:12 +0100 Message-Id: <06254df51dbff8393b01ac48b73da7a88a599f40.1578904098.git.jan.kiszka@siemens.com> X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: 9WhqkEHy7aFa From: Jan Kiszka The addition RISC-V revealed that we already had an issue with mipsel regarding vmlinuz vs. vmlinux, it was just not stressed so far. Signed-off-by: Jan Kiszka --- .../u-boot-script/files/update-u-boot-script | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script index d006a23e..a18e59bc 100755 --- a/meta/recipes-bsp/u-boot-script/files/update-u-boot-script +++ b/meta/recipes-bsp/u-boot-script/files/update-u-boot-script @@ -17,6 +17,21 @@ BOOT_CMD=$(mktemp) KERNEL_VERSION=$(linux-version list | linux-version sort --reverse | head -1) +case $(uname -m) in + aarch64) + KERNEL_FILE="vmlinuz" + BOOT="booti" + ;; + mips|riscv64) + KERNEL_FILE="vmlinux" + BOOT="booti" + ;; + *) + KERNEL_FILE="vmlinuz" + BOOT="bootz" + ;; +esac + echo "${SCRIPT_PREPEND}" >> ${BOOT_CMD} echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD} @@ -24,7 +39,7 @@ echo "setenv bootargs ${KERNEL_ARGS}" >> ${BOOT_CMD} echo "load \${devtype} \${devnum}:${ROOT_PARTITION} \${fdt_addr_r}" \ "/usr/lib/linux-image-${KERNEL_VERSION}/\${fdtfile}" >> ${BOOT_CMD} echo "load \${devtype} \${devnum}:\${distro_bootpart} \${kernel_addr_r}" \ - "/boot/vmlinuz-${KERNEL_VERSION}" >> ${BOOT_CMD} + "/boot/${KERNEL_FILE}-${KERNEL_VERSION}" >> ${BOOT_CMD} case "${NO_INITRD}" in yes|1) @@ -53,11 +68,6 @@ if [ -n "${OVERLAYS}" ]; then done fi -BOOT="bootz" -if [ "$(uname -m)" = "aarch64" ]; then - BOOT="booti" -fi - echo "${BOOT} \${kernel_addr_r} ${INITRD_ADDR} \${fdt_addr_r}" >> ${BOOT_CMD} mkimage -T script -A invalid -C none -d ${BOOT_CMD} /boot/boot.scr > /dev/null -- 2.16.4