From owner-svn-src-projects@FreeBSD.ORG Fri Aug 1 09:54:12 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 499F8CC4; Fri, 1 Aug 2014 09:54:12 +0000 (UTC) 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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 2AE40251F; Fri, 1 Aug 2014 09:54:12 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s719sCNT094538; Fri, 1 Aug 2014 09:54:12 GMT (envelope-from andrew@svn.freebsd.org) Received: (from andrew@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s719sBSn094536; Fri, 1 Aug 2014 09:54:11 GMT (envelope-from andrew@svn.freebsd.org) Message-Id: <201408010954.s719sBSn094536@svn.freebsd.org> From: Andrew Turner Date: Fri, 1 Aug 2014 09:54:11 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r269373 - in projects/arm64/sys: arm64/arm64 boot/arm64/efi 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.18 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, 01 Aug 2014 09:54:12 -0000 Author: andrew Date: Fri Aug 1 09:54:11 2014 New Revision: 269373 URL: http://svnweb.freebsd.org/changeset/base/269373 Log: Allow us to set verbose boot, along with the other flags loaders boot command takes. Modified: projects/arm64/sys/arm64/arm64/machdep.c projects/arm64/sys/boot/arm64/efi/bootinfo.c Modified: projects/arm64/sys/arm64/arm64/machdep.c ============================================================================== --- projects/arm64/sys/arm64/arm64/machdep.c Fri Aug 1 08:39:47 2014 (r269372) +++ projects/arm64/sys/arm64/arm64/machdep.c Fri Aug 1 09:54:11 2014 (r269373) @@ -529,6 +529,7 @@ initarm(struct arm64_bootparams *abp) if (kmdp == NULL) kmdp = preload_search_by_type("elf64 kernel"); + boothowto = MD_FETCH(kmdp, MODINFOMD_HOWTO, int); #ifdef FDT try_load_dtb(kmdp); #endif Modified: projects/arm64/sys/boot/arm64/efi/bootinfo.c ============================================================================== --- projects/arm64/sys/boot/arm64/efi/bootinfo.c Fri Aug 1 08:39:47 2014 (r269372) +++ projects/arm64/sys/boot/arm64/efi/bootinfo.c Fri Aug 1 09:54:11 2014 (r269373) @@ -29,7 +29,9 @@ __FBSDID("$FreeBSD$"); #include +#include #include +#include #include @@ -100,6 +102,81 @@ UINTN arm64_efi_mapkey; COPY32(0, a, c); \ } +static int +bi_getboothowto(char *kargs) +{ + char *cp; + char *p; + int howto; + int active; + int i; + + /* Parse kargs */ + howto = 0; + if (kargs != NULL) { + cp = kargs; + active = 0; + while (*cp != 0) { + if (!active && (*cp == '-')) + active = 1; + else if (active) + switch (*cp) { + case 'a': + howto |= RB_ASKNAME; + break; + case 'C': + howto |= RB_CDROM; + break; + case 'd': + howto |= RB_KDB; + break; + case 'D': + howto |= RB_MULTIPLE; + break; + case 'm': + howto |= RB_MUTE; + break; + case 'g': + howto |= RB_GDB; + break; + case 'h': + howto |= RB_SERIAL; + break; + case 'p': + howto |= RB_PAUSE; + break; + case 'r': + howto |= RB_DFLTROOT; + break; + case 's': + howto |= RB_SINGLE; + break; + case 'v': + howto |= RB_VERBOSE; + break; + default: + active = 0; + break; + } + cp++; + } + } + + /* get equivalents from the environment */ + for (i = 0; howto_names[i].ev != NULL; i++) { + if (getenv(howto_names[i].ev) != NULL) + howto |= howto_names[i].mask; + } + if ((p = getenv("console"))) { + if (!strcmp(p, "comconsole")) + howto |= RB_SERIAL; + if (!strcmp(p, "nullconsole")) + howto |= RB_MUTE; + } + + return(howto); +} + static vm_offset_t bi_copymodules(vm_offset_t addr) { @@ -203,6 +280,9 @@ bi_load(char *args, vm_offset_t *modulep uint64_t kernend; vm_offset_t addr, size; vm_offset_t dtbp; + int howto; + + howto = bi_getboothowto(args); /* find the last module in the chain */ addr = 0; @@ -220,6 +300,8 @@ bi_load(char *args, vm_offset_t *modulep panic("can't find kernel file"); kernend = 0; /* fill it in later */ + file_addmetadata(kfp, MODINFOMD_HOWTO, sizeof howto, &howto); + dtbfp = file_findfile(NULL, "dtb"); if (dtbfp != NULL) { printf("dtbfp = %llx %lld\n", dtbfp->f_addr, dtbfp->f_addr - kfp->f_addr);