From owner-svn-src-all@freebsd.org Sun Feb 2 08:27:15 2020 Return-Path: Delivered-To: svn-src-all@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 C954223D1BD; Sun, 2 Feb 2020 08:27:15 +0000 (UTC) (envelope-from imp@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) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 489PFv54nlz3BmV; Sun, 2 Feb 2020 08:27:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A8AD8D0B9; Sun, 2 Feb 2020 08:27:15 +0000 (UTC) (envelope-from imp@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 0128RFfl079876; Sun, 2 Feb 2020 08:27:15 GMT (envelope-from imp@FreeBSD.org) Received: (from imp@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 0128RFo5079874; Sun, 2 Feb 2020 08:27:15 GMT (envelope-from imp@FreeBSD.org) Message-Id: <202002020827.0128RFo5079874@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org using -f From: Warner Losh Date: Sun, 2 Feb 2020 08:27:15 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r357399 - in head/sys: arm/arm conf X-SVN-Group: head X-SVN-Commit-Author: imp X-SVN-Commit-Paths: in head/sys: arm/arm conf X-SVN-Commit-Revision: 357399 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 02 Feb 2020 08:27:15 -0000 Author: imp Date: Sun Feb 2 08:27:14 2020 New Revision: 357399 URL: https://svnweb.freebsd.org/changeset/base/357399 Log: Kill old armv4 busdma Move to having one busdma option for arm: the armv6/v7 one. Kill now-unused option ARM_USE_V6_BUSDMA too. Fixup files.arm to match rename. Added: head/sys/arm/arm/busdma_machdep.c (contents, props changed) - copied, changed from r357398, head/sys/arm/arm/busdma_machdep-v6.c Deleted: head/sys/arm/arm/busdma_machdep-v4.c head/sys/arm/arm/busdma_machdep-v6.c Modified: head/sys/conf/files.arm head/sys/conf/options.arm Copied and modified: head/sys/arm/arm/busdma_machdep.c (from r357398, head/sys/arm/arm/busdma_machdep-v6.c) ============================================================================== Modified: head/sys/conf/files.arm ============================================================================== --- head/sys/conf/files.arm Sun Feb 2 08:27:08 2020 (r357398) +++ head/sys/conf/files.arm Sun Feb 2 08:27:14 2020 (r357399) @@ -9,8 +9,7 @@ arm/arm/blockio.S standard arm/arm/bus_space_asm_generic.S standard arm/arm/bus_space_base.c optional fdt arm/arm/bus_space_generic.c standard -arm/arm/busdma_machdep-v4.c optional !armv7 !armv6 !ARM_USE_V6_BUSDMA -arm/arm/busdma_machdep-v6.c optional armv7 | armv6 | ARM_USE_V6_BUSDMA +arm/arm/busdma_machdep.c standard arm/arm/copystr.S standard arm/arm/cpufunc.c standard arm/arm/cpufunc_asm.S standard Modified: head/sys/conf/options.arm ============================================================================== --- head/sys/conf/options.arm Sun Feb 2 08:27:08 2020 (r357398) +++ head/sys/conf/options.arm Sun Feb 2 08:27:14 2020 (r357399) @@ -5,7 +5,6 @@ ARM_CACHE_LOCK_ENABLE opt_global.h ARM_KERN_DIRECTMAP opt_vm.h ARM_L2_PIPT opt_global.h ARM_MANY_BOARD opt_global.h -ARM_USE_V6_BUSDMA opt_global.h ARM_WANT_TP_ADDRESS opt_global.h COUNTS_PER_SEC opt_timer.h CPSW_ETHERSWITCH opt_cpsw.h