From owner-svn-src-all@freebsd.org Wed Sep 21 03:10:42 2016 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 88CCFBE2443; Wed, 21 Sep 2016 03:10:42 +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 587DF169; Wed, 21 Sep 2016 03:10:42 +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 u8L3AfW6031400; Wed, 21 Sep 2016 03:10:41 GMT (envelope-from jhibbits@FreeBSD.org) Received: (from jhibbits@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u8L3Afxh031399; Wed, 21 Sep 2016 03:10:41 GMT (envelope-from jhibbits@FreeBSD.org) Message-Id: <201609210310.u8L3Afxh031399@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jhibbits set sender to jhibbits@FreeBSD.org using -f From: Justin Hibbits Date: Wed, 21 Sep 2016 03:10:41 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r306067 - head/sys/powerpc/powerpc 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.23 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: Wed, 21 Sep 2016 03:10:42 -0000 Author: jhibbits Date: Wed Sep 21 03:10:41 2016 New Revision: 306067 URL: https://svnweb.freebsd.org/changeset/base/306067 Log: Move ofw_parse_bootargs to the correct place. Also, create a static initial environment, so bootargs can be set from uboot. Modified: head/sys/powerpc/powerpc/machdep.c Modified: head/sys/powerpc/powerpc/machdep.c ============================================================================== --- head/sys/powerpc/powerpc/machdep.c Wed Sep 21 02:56:57 2016 (r306066) +++ head/sys/powerpc/powerpc/machdep.c Wed Sep 21 03:10:41 2016 (r306067) @@ -141,6 +141,7 @@ int hw_direct_map = 1; extern void *ap_pcpu; struct pcpu __pcpu[MAXCPU]; +static char init_kenv[2048]; static struct trapframe frame0; @@ -293,13 +294,11 @@ powerpc_init(vm_offset_t fdt, vm_offset_ bzero(__sbss_start, __sbss_end - __sbss_start); bzero(__bss_start, _end - __bss_start); #endif - init_static_kenv(NULL, 0); + init_static_kenv(init_kenv, sizeof(init_kenv)); } /* Store boot environment state */ OF_initial_setup((void *)fdt, NULL, (int (*)(void *))ofentry); - ofw_parse_bootargs(); - /* * Init params/tunables that can be overridden by the loader */ @@ -338,6 +337,8 @@ powerpc_init(vm_offset_t fdt, vm_offset_ OF_bootstrap(); + ofw_parse_bootargs(); + /* * Initialize the console before printing anything. */