Print this page
bcm2835: resync unix mapfile with qvpb
The mapfile used by bcm2835's unix was left behind when a bunch of kernel
addresses got changed.  This commit brings it up to date.

Split Close
Expand all
Collapse all
          --- old/usr/src/uts/armv6/bcm2835/conf/Mapfile
          +++ new/usr/src/uts/armv6/bcm2835/conf/Mapfile
↓ open down ↓ 8 lines elided ↑ open up ↑
   9    9  # http://www.illumos.org/license/CDDL.
  10   10  #
  11   11  
  12   12  #
  13   13  # Copyright (c) 2013, Joyent, Inc.  All rights reserved.
  14   14  #
  15   15  
  16   16  $mapfile_version 2
  17   17  
  18   18  # NB: Order matters for name-based entry!
       19 +
  19   20  LOAD_SEGMENT exception_vector {
  20   21          FLAGS = READ EXECUTE;
  21   22          NOHDR;
  22      -        PADDR = 0xFFFF0000;
  23   23          VADDR = 0xFFFF0000;
       24 +        ALIGN = 0x1000;
  24   25          OS_ORDER = .exception_vector;
  25   26          ASSIGN_SECTION { IS_NAME = .exception_vector };
  26   27  };
  27   28  
  28   29  LOAD_SEGMENT text {
  29   30          FLAGS = READ EXECUTE;
  30   31          NOHDR;
  31      -#       PADDR = 0x8080;
  32      -#       VADDR = 0x8080;
  33      -        PADDR = 0x0c100000;
  34      -        VADDR = 0x0c100000;
       32 +        VADDR = 0xFE800000;
  35   33          OS_ORDER = .text;
  36   34          ASSIGN_SECTION {
  37   35                  TYPE = PROGBITS;
  38   36                  FLAGS = ALLOC !WRITE;
  39   37          };
  40   38  };
  41   39  
       40 +#
       41 +# start the data segment on a new 4MB page boundary
       42 +#
  42   43  LOAD_SEGMENT data {
  43   44          FLAGS = READ WRITE EXECUTE;
  44   45          NOHDR;
  45      -#       PADDR = 0x80000;
  46      -#       VADDR = 0x80000;
  47      -        PADDR = 0x0c200000;
  48      -        VADDR = 0x0c200000;
       46 +        VADDR = 0xFEC00000;
  49   47          OS_ORDER = .data;
  50   48          ASSIGN_SECTION {
  51   49                  TYPE = PROGBITS;
  52   50                  FLAGS = ALLOC  WRITE;
  53   51          };
  54   52  };
    
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX