From owner-svn-src-projects@FreeBSD.ORG Sun Nov 3 10:01:54 2013 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTP id 98F4DD09; Sun, 3 Nov 2013 10:01:54 +0000 (UTC) (envelope-from andrew@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 84FA826FB; Sun, 3 Nov 2013 10:01:54 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id rA3A1s0u012506; Sun, 3 Nov 2013 10:01:54 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.7/8.14.5/Submit) id rA3A1sA2012505; Sun, 3 Nov 2013 10:01:54 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201311031001.rA3A1sA2012505@svn.freebsd.org> From: Andrew Turner Date: Sun, 3 Nov 2013 10:01:54 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r257568 - projects/specific_leg/sys/arm/arm X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.14 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: Sun, 03 Nov 2013 10:01:54 -0000 Author: andrew Date: Sun Nov 3 10:01:53 2013 New Revision: 257568 URL: http://svnweb.freebsd.org/changeset/base/257568 Log: Remove more uses of PHYSADDR. It is still used when FLASHADDR and LOADERRAMADDR is set, and in the SMP code. The former use can be moved to a new file for legacy booting. The latter appears to be incorrect as the result of the calculation PHYSADDR is used in is not used. Modified: projects/specific_leg/sys/arm/arm/locore.S Modified: projects/specific_leg/sys/arm/arm/locore.S ============================================================================== --- projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 09:08:36 2013 (r257567) +++ projects/specific_leg/sys/arm/arm/locore.S Sun Nov 3 10:01:53 2013 (r257568) @@ -60,8 +60,6 @@ __FBSDID("$FreeBSD$"); .align 0 .globl kernbase .set kernbase,KERNBASE -.globl physaddr -.set physaddr,PHYSADDR /* * On entry for FreeBSD boot ABI: @@ -125,25 +123,7 @@ Lram_offset: .word from_ram-_C_LABEL(_st from_ram: nop #endif - adr r7, Lunmapped - bic r7, r7, #0xf0000000 - orr r7, r7, #PHYSADDR - -disable_mmu: - /* Disable MMU for a while */ - mrc p15, 0, r2, c1, c0, 0 - bic r2, r2, #(CPU_CONTROL_MMU_ENABLE | CPU_CONTROL_DC_ENABLE |\ - CPU_CONTROL_WBUF_ENABLE) - bic r2, r2, #(CPU_CONTROL_IC_ENABLE) - bic r2, r2, #(CPU_CONTROL_BPRD_ENABLE) - mcr p15, 0, r2, c1, c0, 0 - - nop - nop - nop - mov pc, r7 -Lunmapped: /* * Build page table from scratch. */ @@ -292,8 +272,6 @@ Lpagetable: Lvirtaddr: .word KERNVIRTADDR -Lphysaddr: - .word KERNPHYSADDR #if defined (FLASHADDR) && defined(LOADERRAMADDR) Lreal_start: