From owner-dev-commits-src-main@freebsd.org Wed Jul 28 11:43:40 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 4A67E659078; Wed, 28 Jul 2021 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GZWyN1Qrrz4qCm; Wed, 28 Jul 2021 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 196371D905; Wed, 28 Jul 2021 11:43:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 16SBheWZ092822; Wed, 28 Jul 2021 11:43:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 16SBhevM092820; Wed, 28 Jul 2021 11:43:40 GMT (envelope-from git) Date: Wed, 28 Jul 2021 11:43:40 GMT Message-Id: <202107281143.16SBhevM092820@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: b07a6bd15a58 - main - booti: Enable loading the kernel image to any address aligned to 2 MB MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b07a6bd15a58aa6e23761c51eba78d449cd2cbf3 Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 28 Jul 2021 11:43:40 -0000 The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=b07a6bd15a58aa6e23761c51eba78d449cd2cbf3 commit b07a6bd15a58aa6e23761c51eba78d449cd2cbf3 Author: Michal Meloun AuthorDate: 2021-07-09 17:33:36 +0000 Commit: Michal Meloun CommitDate: 2021-07-28 11:42:13 +0000 booti: Enable loading the kernel image to any address aligned to 2 MB We've supported this for a long time, plus most u-boot setups quietly expect it. Otherwise they fail with different levels of memory overwrites. MFC after: 2 weeks --- sys/tools/arm_kernel_boothdr.awk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/tools/arm_kernel_boothdr.awk b/sys/tools/arm_kernel_boothdr.awk index 5526102606f6..f22c6167c7b0 100644 --- a/sys/tools/arm_kernel_boothdr.awk +++ b/sys/tools/arm_kernel_boothdr.awk @@ -134,7 +134,7 @@ function write_v8booti() { write_le32(0) # code1 write_le64(0) # text_offset write_le64(gEndOff) # image_size - write_le64(0) # flags + write_le64(hexstr_to_num("8")) # flags write_le64(0) # res1[0] write_le64(0) # res1[1] write_le64(0) # res1[2]