From owner-svn-src-all@freebsd.org Fri Dec 11 01:34:14 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 6E5489D77CA; Fri, 11 Dec 2015 01:34:14 +0000 (UTC) (envelope-from jhibbits@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 mx1.freebsd.org (Postfix) with ESMTPS id 3D55F11B7; Fri, 11 Dec 2015 01:34:14 +0000 (UTC) (envelope-from jhibbits@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tBB1YD3E030888; Fri, 11 Dec 2015 01:34:13 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tBB1YDpf030887; Fri, 11 Dec 2015 01:34:13 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201512110134.tBB1YDpf030887@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Fri, 11 Dec 2015 01:34:13 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r292073 - head/sys/powerpc/booke X-SVN-Group: head 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.20 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: Fri, 11 Dec 2015 01:34:14 -0000 Author: jhibbits Date: Fri Dec 11 01:34:13 2015 New Revision: 292073 URL: https://svnweb.freebsd.org/changeset/base/292073 Log: No need to reset tlb1 here, it gets reset again after BSS is cleared in powerpc_init(). Also fix a comment typo (0x45 == E, not e) Modified: head/sys/powerpc/booke/booke_machdep.c Modified: head/sys/powerpc/booke/booke_machdep.c ============================================================================== --- head/sys/powerpc/booke/booke_machdep.c Fri Dec 11 01:30:20 2015 (r292072) +++ head/sys/powerpc/booke/booke_machdep.c Fri Dec 11 01:34:13 2015 (r292073) @@ -296,7 +296,7 @@ booke_init(uint32_t arg1, uint32_t arg2) * relatively small number, such as 64K. arg2 is the * physical address of the argv vector. * - ePAPR loaders pass an FDT blob in r3 (arg1) and the magic hex - * string 0x45504150 ('ePAP') in r6 (which has been lost by now). + * string 0x45504150 ('EPAP') in r6 (which has been lost by now). * r4 (arg2) is supposed to be set to zero, but is not always. */ @@ -314,9 +314,6 @@ booke_init(uint32_t arg1, uint32_t arg2) else /* U-Boot */ mdp = NULL; - /* Reset TLB1 to get rid of temporary mappings */ - tlb1_init(); - ret = powerpc_init(dtbp, 0, 0, mdp); /* Enable L1 caches */