From owner-svn-src-projects@FreeBSD.ORG Fri Jan 27 14:46:25 2012 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id AEA4C1065670; Fri, 27 Jan 2012 14:46:25 +0000 (UTC) (envelope-from cognet@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 7F4D48FC0C; Fri, 27 Jan 2012 14:46:25 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q0REkPxA043804; Fri, 27 Jan 2012 14:46:25 GMT (envelope-from cognet@svn.freebsd.org) Received: (from cognet@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id q0REkPtK043802; Fri, 27 Jan 2012 14:46:25 GMT (envelope-from cognet@svn.freebsd.org) Message-Id: <201201271446.q0REkPtK043802@svn.freebsd.org> From: Olivier Houchard Date: Fri, 27 Jan 2012 14:46:25 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r230615 - projects/armv6/sys/arm/omap X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 Jan 2012 14:46:25 -0000 Author: cognet Date: Fri Jan 27 14:46:25 2012 New Revision: 230615 URL: http://svn.freebsd.org/changeset/base/230615 Log: Completely remove the generic_armv7_* functions, which are just duplicate of the armv4 versions, and directly use the armv4 versions instead. Deleted: projects/armv6/sys/arm/omap/omap_space_asm.S Modified: projects/armv6/sys/arm/omap/omap.c Modified: projects/armv6/sys/arm/omap/omap.c ============================================================================== --- projects/armv6/sys/arm/omap/omap.c Fri Jan 27 13:26:25 2012 (r230614) +++ projects/armv6/sys/arm/omap/omap.c Fri Jan 27 14:46:25 2012 (r230615) @@ -65,7 +65,7 @@ extern const struct pmap_devmap omap_dev /* Proto types for all the bus_space structure functions */ bs_protos(generic); -bs_protos(generic_armv7); +bs_protos(generic_armv4); struct bus_space omap_bs_tag = { /* cookie */ @@ -85,37 +85,37 @@ struct bus_space omap_bs_tag = { /* read (single) */ .bs_r_1 = generic_bs_r_1, - .bs_r_2 = generic_armv7_bs_r_2, + .bs_r_2 = generic_armv4_bs_r_2, .bs_r_4 = generic_bs_r_4, .bs_r_8 = NULL, /* read multiple */ .bs_rm_1 = generic_bs_rm_1, - .bs_rm_2 = generic_armv7_bs_rm_2, + .bs_rm_2 = generic_armv4_bs_rm_2, .bs_rm_4 = generic_bs_rm_4, .bs_rm_8 = NULL, /* read region */ .bs_rr_1 = generic_bs_rr_1, - .bs_rr_2 = generic_armv7_bs_rr_2, + .bs_rr_2 = generic_armv4_bs_rr_2, .bs_rr_4 = generic_bs_rr_4, .bs_rr_8 = NULL, /* write (single) */ .bs_w_1 = generic_bs_w_1, - .bs_w_2 = generic_armv7_bs_w_2, + .bs_w_2 = generic_armv4_bs_w_2, .bs_w_4 = generic_bs_w_4, .bs_w_8 = NULL, /* write multiple */ .bs_wm_1 = generic_bs_wm_1, - .bs_wm_2 = generic_armv7_bs_wm_2, + .bs_wm_2 = generic_armv4_bs_wm_2, .bs_wm_4 = generic_bs_wm_4, .bs_wm_8 = NULL, /* write region */ .bs_wr_1 = generic_bs_wr_1, - .bs_wr_2 = generic_armv7_bs_wr_2, + .bs_wr_2 = generic_armv4_bs_wr_2, .bs_wr_4 = generic_bs_wr_4, .bs_wr_8 = NULL, @@ -124,13 +124,13 @@ struct bus_space omap_bs_tag = { /* set region */ .bs_sr_1 = NULL, - .bs_sr_2 = generic_armv7_bs_sr_2, + .bs_sr_2 = generic_armv4_bs_sr_2, .bs_sr_4 = generic_bs_sr_4, .bs_sr_8 = NULL, /* copy */ .bs_c_1 = NULL, - .bs_c_2 = generic_armv7_bs_c_2, + .bs_c_2 = generic_armv4_bs_c_2, .bs_c_4 = NULL, .bs_c_8 = NULL, };