From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 6780366809388285952 X-Received: by 2002:a19:5f5e:: with SMTP id a30mr5198295lfj.183.1580293811126; Wed, 29 Jan 2020 02:30:11 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a2e:8544:: with SMTP id u4ls2532180ljj.6.gmail; Wed, 29 Jan 2020 02:30:10 -0800 (PST) X-Google-Smtp-Source: APXvYqyZiz5hl/R9/htGBKgVurVFGmekEOmnO7WZX2RQvFBuGrlePlcs0yr1rgL8UDPcN6OrlBSo X-Received: by 2002:a2e:7e11:: with SMTP id z17mr12100752ljc.279.1580293810279; Wed, 29 Jan 2020 02:30:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1580293810; cv=none; d=google.com; s=arc-20160816; b=LdbA/h24LCy+2GiOsfBOa1QD6AOLyGPyplbKR9I9/c2wKwIbCEi2T0MRI+/NbIhqN0 JplxmsDtfSNSHahs7K74RY7Lh/n6Yq9DuHFW5DwmVhWIe72ov94r8H51lL/xpjT5GUky 2UiSpwFlkyWChuhdg4p16m9AxB7Fdd31nv1jftz38xci2jDd/LgTTnNpfMhB59G0OnUn tQiTeIQkR/Amay3OpYCPoA3JXp3X2rZTAdOyRg+mE+8RDX6Y+Xs8S6XyvyWKo2vEVUyc CFbs3E15k1TMvyWDihUj10GWnDIvkuFFbrecyokczIQJRva6JnQw4gWJHNoLqlJUIeSM pM6g== 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=slAHSBLJSU8uUIu0Aplm+vxpCNb3ET2+kQ74ROyrXG74lmc5QPP8BcMfMEvy/5gEW9 bdCZxj+qCqoTN3E+04tINCLkrokYEt+FcnJxvZVBriOhgmhrLz1tTnu5A52vJhYD8R8N 0pjWfguvyqhcrB65FPIJMym53mznCFcJ5V6XDQ8dxbsutczyfhuEFeITjw7EMtB/lXUU lSvQqJYOBNvpywf/L33aJKpmuGS15Wvh74TsVX4P7yFk+Y2uPkjxh8PHBlXmNvTbGud2 1o0kCEkia754gQD10Dp0DOhxtdfAx1TuhPtg6lsjhTC6UJkZk7RWRw4JiRbv+/vT2+DG nn8Q== 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 o24si60100lji.4.2020.01.29.02.30.09 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 29 Jan 2020 02:30:10 -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 00TAU9P4011615 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK) for ; Wed, 29 Jan 2020 11:30:09 +0100 Received: from md1f2u6c.ad001.siemens.net ([167.87.47.1]) by mail1.sbs.de (8.15.2/8.15.2) with ESMTP id 00TAU6Dv009574 for ; Wed, 29 Jan 2020 11:30:09 +0100 From: Jan Kiszka To: isar-users Subject: [PATCH v3 08/14] u-boot-script: Account for variations of kernel files and boot commands Date: Wed, 29 Jan 2020 11:30:00 +0100 Message-Id: X-Mailer: git-send-email 2.16.4 In-Reply-To: References: In-Reply-To: References: X-TUID: vzk3Bp7iFDPH 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