From patchwork Fri Sep 20 12:22:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Fitzenreiter X-Patchwork-Id: 8131 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4X9BNn4jqhz3wxp for ; Fri, 20 Sep 2024 12:22:49 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) client-signature ECDSA (secp384r1)) (Client CN "mail02.haj.ipfire.org", Issuer "E6" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4X9BNl3jn8z25T; Fri, 20 Sep 2024 12:22:47 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4X9BNl1MvLz33Lq; Fri, 20 Sep 2024 12:22:47 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mail01.haj.ipfire.org", Issuer "R10" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4X9BNh5G17z2xLj for ; Fri, 20 Sep 2024 12:22:44 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4X9BNg6tgdz4l; Fri, 20 Sep 2024 12:22:43 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1726834964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lBIWpcyD5xo8vo0/ZYexqTtIXBnxtm8bB436bJtXqp4=; b=R02ZlnYO4cPHTIfmDF5OoRnloUdWEN65eiLIEah15SwkzD4uA2sWwXwhtdznZLuB3ztm7Y 3EQgqrayoHMceJDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1726834964; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=lBIWpcyD5xo8vo0/ZYexqTtIXBnxtm8bB436bJtXqp4=; b=gELhOVVVLADRIAKsQkkoDdD8jmvOk3v3DIXea7YtIgx5SGeiBFzSHtYMgRhllwHHxeXo2b p40dAMgPNLjqtEWckgzrC+IVqUV0HIPbPvT6tJOrpievXV/X7rHrRglFeUuvMELD8aR2XB 9G5F7kOczeIrH+cq+ILV4EK3IXRVW6l/yRHKeW+UuymZGxc9RpL7wZp7kHB1g8PhU3Qia+ 3tqkLk9wWBByUvlvr4SGY6uP5R2ldJlT2+G4AmzKIV60iPluLy3YYRzzRN1L40Yc+3G7O/ 3U85kAXB1p0+cTyQp+yic0n/yJ63Mag0VMJ+iTXUbryfUwHdVl+C1ZfAP0//ig== From: Arne Fitzenreiter To: development@lists.ipfire.org Subject: [PATCH] u-boot: fix KVER syntax Date: Fri, 20 Sep 2024 14:22:01 +0200 Message-ID: <20240920122234.9879-1-arne_f@ipfire.org> MIME-Version: 1.0 Message-ID-Hash: SK4ADEYZHOBSXJNVS36CSZ55MCKRPJZ7 X-Message-ID-Hash: SK4ADEYZHOBSXJNVS36CSZ55MCKRPJZ7 X-MailFrom: arne_f@ipfire.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header CC: Arne Fitzenreiter X-Mailman-Version: 3.3.8 Precedence: list List-Id: IPFire development talk Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: with some kernel build changes KVER also contains the -ipfire string so this has to be removed in u-boot. Signed-off-by: Arne Fitzenreiter --- config/rootfiles/core/188/update.sh | 2 +- config/u-boot/boot.cmd | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/rootfiles/core/188/update.sh b/config/rootfiles/core/188/update.sh index 276223052..b152b1541 100644 --- a/config/rootfiles/core/188/update.sh +++ b/config/rootfiles/core/188/update.sh @@ -126,7 +126,7 @@ dracut --regenerate-all --force KVER="xxxKVERxxx" case "$(uname -m)" in aarch64) - mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}-ipfire.img /boot/uInit-${KVER}-ipfire + mkimage -A arm64 -T ramdisk -C lzma -d /boot/initramfs-${KVER}.img /boot/uInit-${KVER} # dont remove initramfs because grub need this to boot. ;; esac diff --git a/config/u-boot/boot.cmd b/config/u-boot/boot.cmd index a27996780..5faa3a1ec 100644 --- a/config/u-boot/boot.cmd +++ b/config/u-boot/boot.cmd @@ -77,8 +77,8 @@ else fi; setenv fdt_high ffffffff; -fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}-ipfire${kernel_type}; -fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}-ipfire${kernel_type}/${fdtfile}; +fatload ${boot_dev} ${boot_part} ${kernel_addr_r} vmlinuz-${KVER}; +fatload ${boot_dev} ${boot_part} ${fdt_addr_r} dtb-${KVER}/${fdtfile}; if test "${FDTCMDS}" = ""; then echo ; @@ -88,7 +88,7 @@ else fi; setenv ramdisk_addr ${ramdisk_addr_r} -if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}-ipfire${kernel_type}; then +if fatload ${boot_dev} ${boot_part} ${ramdisk_addr} uInit-${KVER}; then echo Ramdisk loaded...; else echo Ramdisk not loaded...;