12220 loader multi-console shouldn't override bootenv.rc

          --- old/usr/src/uts/i86pc/sys/boot_console.h
          +++ new/usr/src/uts/i86pc/sys/boot_console.h

   1    1  /*
   2    2   * CDDL HEADER START
   3    3   *
   4    4   * The contents of this file are subject to the terms of the
   5    5   * Common Development and Distribution License (the "License").
   6    6   * You may not use this file except in compliance with the License.
   7    7   *
   8    8   * You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
   9    9   * or http://www.opensolaris.org/os/licensing.
  10   10   * See the License for the specific language governing permissions
  11   11   * and limitations under the License.
  12   12   *

  13   13   * When distributing Covered Code, include this CDDL HEADER in each
  14   14   * file and include the License file at usr/src/OPENSOLARIS.LICENSE.
  15   15   * If applicable, add the following below this CDDL HEADER, with the
  16   16   * fields enclosed by brackets "[]" replaced with your own identifying
  17   17   * information: Portions Copyright [yyyy] [name of copyright owner]
  18   18   *
  19   19   * CDDL HEADER END
  20   20   */
  21   21  /*
  22   22   * Copyright (c) 2012 Gary Mills
       23 + * Copyright 2020 Joyent, Inc.
  23   24   *
  24   25   * Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
  25   26   * Use is subject to license terms.
  26   27   */
  27   28  
  28   29  /*
  29   30   * This file is shared between dboot and the kernel.
  30   31   */
  31   32  
  32   33  #ifndef _BOOT_CONSOLE_H

  33   34  #define _BOOT_CONSOLE_H
  34   35  
  35   36  #ifdef __cplusplus
  36   37  extern "C" {
  37   38  #endif
  38   39  
  39   40  #include <sys/bootinfo.h>
  40   41  
  41   42  #define CONS_INVALID            -1
  42   43  #define CONS_SCREEN_TEXT        0
  43   44  #define CONS_TTY                1
  44   45  #define CONS_XXX                2       /* Unused */
  45   46  #define CONS_USBSER             3
  46   47  #define CONS_HYPERVISOR         4
  47   48  #define CONS_SCREEN_GRAPHICS    5
  48   49  #define CONS_FRAMEBUFFER        6
  49   50  
  50   51  #define CONS_MIN        CONS_SCREEN_TEXT
  51   52  #define CONS_MAX        CONS_FRAMEBUFFER
  52   53  
  53   54  #define CONS_COLOR      7
  54   55  
  55   56  extern void kb_init(void);
  56   57  extern int kb_getchar(void);
  57   58  extern int kb_ischar(void);
  58   59  
  59   60  /* Read property from command line or environment. */
  60   61  extern const char *find_boot_prop(const char *);

  61   62  
  62   63  extern int boot_console_type(int *);
  63   64  
  64   65  extern void bcons_init(struct xboot_info *);
  65   66  extern void bcons_putchar(int);
  66   67  extern int bcons_getchar(void);
  67   68  extern int bcons_ischar(void);
  68   69  extern int bcons_gets(char *, int);
  69   70  
  70   71  #if !defined(_BOOT)
  71      -extern void bcons_init2(char *, char *, char *);
       72 +extern void bcons_post_bootenvrc(char *, char *, char *);
  72   73  extern boolean_t bcons_hypervisor_redirect(void);
  73   74  extern void bcons_device_change(int);
  74   75  #endif /* !_BOOT */
  75   76  
  76   77  #ifdef __cplusplus
  77   78  }
  78   79  #endif
  79   80  
  80   81  #endif /* _BOOT_CONSOLE_H */
    

XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX