From nobody Thu Mar 27 13:47:53 2025 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZNlNB1vVwz5rPDp; Thu, 27 Mar 2025 13:47:54 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZNlN92wS7z3MNQ; Thu, 27 Mar 2025 13:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743083273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE0v/Q3mrHDnSiDuC0EkdwQJQO6Sw85WD9HyZi0scnw=; b=QlvEpEZX9FllayWbzZf3/IukAJDbZbum7h7JXu2+FV4Oj8PeiJ1YxfgvUAE3ElL2ZLpzLh cocf/x6XAuhuUKZDYhFZy4TgnkynAqR71QnnhnWcamzRgqj2qCGhiUjhdaWtfHBRB2eFhN 4pM5bp6AkOOn4r1be2SrohdIdGZHCDW9DZ1UIZjf0d8ClNakRDdoq4VNGIBAdeJOJji3AV alHRmuG+/9Lw1psaeTTPtmFtXx81/Ke3gepQVMJQNYEbyXo2yj8ZSPJ2EWsW1jNT40Vegt g7eJGJk6fQEVJMIq1Eo0gHphWBP276eCB/qJnTh3nFQi3+zY6RU9oqMLLX/IZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743083273; a=rsa-sha256; cv=none; b=lnM5i0HMuucAiJ0XVKYujU9IBMm9mDy4f0rsSeWFqmLf2dXD0UkkDiziCpp9EudjDDkD4L 2/ua4/HHJ5SBCbn0MBRly8tqC7SyvrJpKrN9Swaj7f2ZDGYNuHU2RV2WRXyOw0Xy5R/svH nPdLI3qWcIqIr9Abh48Sfjito/Wmae+b8lAzUBqhuhjxogArAaNh/q74jxAWBEAFf0uZ3P AzIp+p9b0U8Q0e1XdI9Oofwj33IYBlDoy9UrBopkhtjnjqyDI/PGntFdRzewLyoA8an0qx 7S431F8K54EiOI8TdAqksmSdwHPpE4A0HbwynWEhcZY5EbSoI4pmH9FYKbtlow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743083273; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XE0v/Q3mrHDnSiDuC0EkdwQJQO6Sw85WD9HyZi0scnw=; b=c0V4wyIikGI0Q8JAMqjW4np/R/l1DtWCi4uFMtO+pcIY4PhB0Q+V3K/WNwNnYIkSDiuTxt iGJ5UIRcjPfUonYqTEmkiV7rjYLotUGt95batzpILnJiJ6Z+w0KoZM2e6ApymhVcqG5S34 P7ClBLiStlOJMqKCXLyHJLXjcldb44N7CbpX5Zt2TOdGdgZ+C4YWfCIEWC7L49lK+Cf/0g NM85Uizytd7PheQ/AjXDtSYT+Q+TmfrxsMBrtBR2GFxpk1xxQrChOBZ3ncgBVOJcsLZxFN UgtQk1YvA5YRiD1XcJT7MWQf/CWVshmi2UKP22KU8GEeqa2SB/KwKSE6SOYHsw== 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 4ZNlN92Tr0zytj; Thu, 27 Mar 2025 13:47:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52RDlrU2025653; Thu, 27 Mar 2025 13:47:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52RDlrlO025650; Thu, 27 Mar 2025 13:47:53 GMT (envelope-from git) Date: Thu, 27 Mar 2025 13:47:53 GMT Message-Id: <202503271347.52RDlrlO025650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: c7142afec42c - main - arm: Remove FLASHADDR and PHYSADDR List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c7142afec42c4f0a3aa4da845f4c4e15b5e3f018 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=c7142afec42c4f0a3aa4da845f4c4e15b5e3f018 commit c7142afec42c4f0a3aa4da845f4c4e15b5e3f018 Author: Andrew Turner AuthorDate: 2025-03-27 13:21:52 +0000 Commit: Andrew Turner CommitDate: 2025-03-27 13:47:38 +0000 arm: Remove FLASHADDR and PHYSADDR They appear to have been used when executing directly from flash, however are now unused. Reviewed by: cognet, imp Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D49498 --- sys/arm/arm/pmap-v6.c | 2 -- sys/arm/arm/support.S | 11 ----------- sys/conf/options.arm | 2 -- 3 files changed, 15 deletions(-) diff --git a/sys/arm/arm/pmap-v6.c b/sys/arm/arm/pmap-v6.c index 6cc78b187a9a..bb2aced34c94 100644 --- a/sys/arm/arm/pmap-v6.c +++ b/sys/arm/arm/pmap-v6.c @@ -1716,8 +1716,6 @@ pmap_init(void) pt2_entry_t *pte2p, pte2; u_int i, pte1_idx, pv_npg; - PDEBUG(1, printf("%s: phys_start = %#x\n", __func__, PHYSADDR)); - /* * Initialize the vm page array entries for kernel pmap's * L2 page table pages allocated in advance. diff --git a/sys/arm/arm/support.S b/sys/arm/arm/support.S index cbe3ff489076..cbfbb086b1ed 100644 --- a/sys/arm/arm/support.S +++ b/sys/arm/arm/support.S @@ -730,17 +730,6 @@ ENTRY(memcpy) pld [r1] cmp r2, #0x0c ble .Lmemcpy_short /* <= 12 bytes */ -#ifdef FLASHADDR -#if FLASHADDR > PHYSADDR - ldr r3, =FLASHADDR - cmp r3, pc - bls .Lnormal -#else - ldr r3, =FLASHADDR - cmp r3, pc - bhi .Lnormal -#endif -#endif mov r3, r0 /* We must not clobber r0 */ /* Word-align the destination buffer */ diff --git a/sys/conf/options.arm b/sys/conf/options.arm index a41d2387459c..0c0002d50b88 100644 --- a/sys/conf/options.arm +++ b/sys/conf/options.arm @@ -7,7 +7,6 @@ SMP_ON_UP opt_global.h # Runtime detection of MP extensions DEV_GIC opt_global.h DEV_PMU opt_global.h EFI opt_platform.h -FLASHADDR opt_global.h GIC_DEFAULT_ICFGR_INIT opt_global.h INTRNG opt_global.h FREEBSD_BOOT_LOADER opt_global.h @@ -16,7 +15,6 @@ KERNVIRTADDR opt_global.h LINUX_BOOT_ABI opt_global.h LOCORE_MAP_MB opt_locore.h NKPT2PG opt_pmap.h -PHYSADDR opt_global.h PLATFORM opt_global.h SOCDEV_PA opt_global.h SOCDEV_VA opt_global.h