[zx] Magenta -> Zircon

The Great Renaming is here!

Change-Id: I3229bdeb2a3d0e40fb4db6fec8ca7d971fbffb94

.travis.yml

@@ -1,12 +1,12 @@
 language: c
 script: ./scripts/travis-builds.sh
 env:
- # full magenta kernel + user space builds
- - PROJECT=magenta-pc-x86-64
- - PROJECT=magenta-qemu-arm64
- - PROJECT=magenta-rpi3-arm64
- - PROJECT=magenta-hikey960-arm64
- - PROJECT=magenta-odroidc2-arm64
+ # full zircon kernel + user space builds
+ - PROJECT=zircon-pc-x86-64
+ - PROJECT=zircon-qemu-arm64
+ - PROJECT=zircon-rpi3-arm64
+ - PROJECT=zircon-hikey960-arm64
+ - PROJECT=zircon-odroidc2-arm64
 
 sudo: required
 dist: trusty

LICENSE

@@ -1,12 +1,12 @@
-The Magenta Kernel (kernel/...) and the Magenta Scripts (scripts/...)
+The Zircon Kernel (kernel/...) and the Zircon Scripts (scripts/...)
 are under an MIT-style license, copies of which may be found in
 kernel/LICENSE and scripts/LICENSE.
 
 The Third Party Components (third_party/...) are under various
 licenses (of the BSD, MIT, or Zlib style), which may be found in the
 root directory of each component, respectively.
 
-All other components and materials, including the Magenta System
+All other components and materials, including the Zircon System
 (system/...) and Bootloader (bootloader/...), are under a BSD-style
 license, copies of which may be found in system/LICENSE and
 bootloader/LICENSE.

README.md

@@ -1,19 +1,19 @@
-# Magenta
+# Zircon
 
-Magenta is the core platform that powers the Fuchsia OS. Magenta is
+Zircon is the core platform that powers the Fuchsia OS. Zircon is
 composed of a microkernel (source in kernel/...) as well as a small
 set of userspace services, drivers, and libraries (source in system/...)
 necessary for the system to boot, talk to hardware, load userspace
 processes and run them, etc. Fuchsia builds a much larger OS on top
 of this foundation.
 
-The canonical Magenta Git repository is located
-at: https://fuchsia.googlesource.com/magenta
+The canonical Zircon Git repository is located
+at: https://fuchsia.googlesource.com/zircon
 
 A read-only mirror of the code is present
-at: https://github.com/fuchsia-mirror/magenta
+at: https://github.com/fuchsia-mirror/zircon
 
-The Magenta Kernel provides syscalls to manage processes, threads,
+The Zircon Kernel provides syscalls to manage processes, threads,
 virtual memory, inter-process communication, waiting on object state
 changes, and locking (via futexes).
 
@@ -22,17 +22,17 @@ bringup work, which will be going away in the future as the long term
 syscall API/ABI surface is finalized. The expectation is that there will
 be about 100 syscalls.
 
-Magenta syscalls are generally non-blocking. The wait_one, wait_many
+Zircon syscalls are generally non-blocking. The wait_one, wait_many
 port_wait and thread sleep being the notable exceptions.
 
-This page is a non-comprehensive index of the magenta documentation.
+This page is a non-comprehensive index of the zircon documentation.
 
 + [Getting Started](docs/getting_started.md)
 + [Contributing Patches](docs/contributing.md)
 + [Testing](docs/testing.md)
 + [Hacking notes](docs/hacking.md)
 + [Memory usage analysis tools](docs/memory.md)
-+ [Relationship with LK](docs/mx_and_lk.md)
++ [Relationship with LK](docs/zx_and_lk.md)
 + [Kernel Objects](docs/objects.md)
 + [Process Objects](docs/objects/process.md)
 + [Thread Objects](docs/objects/thread.md)

bootloader/build.mk

@@ -45,7 +45,7 @@ EFI_BOOTLOADER := $(BUILDDIR)/bootloader/bootx64.efi
 EFI_SOURCES := \
  $(LOCAL_DIR)/src/osboot.c \
  $(LOCAL_DIR)/src/cmdline.c \
- $(LOCAL_DIR)/src/magenta.c \
+ $(LOCAL_DIR)/src/zircon.c \
  $(LOCAL_DIR)/src/misc.c \
  $(LOCAL_DIR)/src/netboot.c \
  $(LOCAL_DIR)/src/netifc.c \

bootloader/include/printf.h

@@ -11,7 +11,7 @@
 #include <stdarg.h>
 #include <stdint.h>
 
-#include <magenta/compiler.h>
+#include <zircon/compiler.h>
 
 __BEGIN_CDECLS
 

bootloader/scripts/bootzircon

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+make && mcopy -o -i out/disk.img@@1024K ../build-zircon-pc-x86-64/zircon.bin ::zircon.bin && make qemu

bootloader/src/framebuffer.c

@@ -183,8 +183,8 @@ void draw_logo() {
  logo_width, logo_height, 0);
 }
 
-#include <magenta/font/font-9x16.h>
-#include <magenta/font/font-18x32.h>
+#include <zircon/font/font-9x16.h>
+#include <zircon/font/font-18x32.h>
 
 static void putchar(efi_graphics_output_protocol* gop, fb_font* font, unsigned ch, unsigned x, unsigned y, unsigned scale_x, unsigned scale_y, efi_graphics_output_blt_pixel* fg, efi_graphics_output_blt_pixel* bg) {
  const uint16_t* cdata = font->data + ch * font->height;

bootloader/src/inet6.c

@@ -7,7 +7,7 @@
 #include <string.h>
 
 #include <inet6.h>
-#include <magenta/boot/netboot.h>
+#include <zircon/boot/netboot.h>
 
 // Enable at your own risk. Some of these packet errors can be fairly
 // common when the buffers start to overflow.

bootloader/src/misc.c

@@ -8,7 +8,7 @@
 #include <string.h>
 #include <xefi.h>
 
-#include <magenta/pixelformat.h>
+#include <zircon/pixelformat.h>
 
 static efi_guid AcpiTableGUID = ACPI_TABLE_GUID;
 static efi_guid Acpi2TableGUID = ACPI_20_TABLE_GUID;
@@ -45,7 +45,7 @@ static void get_bit_range(uint32_t mask, int* high, int* low) {
  *high = idx - 1;
 }
 
-static int get_mx_pixel_format_from_bitmask(efi_pixel_bitmask bitmask) {
+static int get_zx_pixel_format_from_bitmask(efi_pixel_bitmask bitmask) {
  int r_hi = -1, r_lo = -1, g_hi = -1, g_lo = -1, b_hi = -1, b_lo = -1;
 
  get_bit_range(bitmask.RedMask, &r_hi, &r_lo);
@@ -59,42 +59,42 @@ static int get_mx_pixel_format_from_bitmask(efi_pixel_bitmask bitmask) {
  if ((r_hi == 23 && r_lo == 16) &&
  (g_hi == 15 && g_lo == 8) &&
  (b_hi == 7 && b_lo == 0)) {
- return MX_PIXEL_FORMAT_RGB_x888;
+ return ZX_PIXEL_FORMAT_RGB_x888;
  }
 
  if ((r_hi == 7 && r_lo == 5) &&
  (g_hi == 4 && g_lo == 2) &&
  (b_hi == 1 && b_lo == 0)) {
- return MX_PIXEL_FORMAT_RGB_332;
+ return ZX_PIXEL_FORMAT_RGB_332;
  }
 
  if ((r_hi == 15 && r_lo == 11) &&
  (g_hi == 10 && g_lo == 5) &&
  (b_hi == 4 && b_lo == 0)) {
- return MX_PIXEL_FORMAT_RGB_565;
+ return ZX_PIXEL_FORMAT_RGB_565;
  }
 
  if ((r_hi == 7 && r_lo == 6) &&
  (g_hi == 5 && g_lo == 4) &&
  (b_hi == 3 && b_lo == 2)) {
- return MX_PIXEL_FORMAT_RGB_2220;
+ return ZX_PIXEL_FORMAT_RGB_2220;
  }
 
 unsupported:
  printf("unsupported pixel format bitmask: r %08x / g %08x / b %08x\n",
  bitmask.RedMask, bitmask.GreenMask, bitmask.BlueMask);
- return MX_PIXEL_FORMAT_NONE;
+ return ZX_PIXEL_FORMAT_NONE;
 }
 
-uint32_t get_mx_pixel_format(efi_graphics_output_protocol* gop) {
+uint32_t get_zx_pixel_format(efi_graphics_output_protocol* gop) {
  efi_graphics_pixel_format efi_fmt = gop->Mode->Info->PixelFormat;
  switch (efi_fmt) {
  case PixelBlueGreenRedReserved8BitPerColor:
- return MX_PIXEL_FORMAT_RGB_x888;
+ return ZX_PIXEL_FORMAT_RGB_x888;
  case PixelBitMask:
- return get_mx_pixel_format_from_bitmask(gop->Mode->Info->PixelInformation);
+ return get_zx_pixel_format_from_bitmask(gop->Mode->Info->PixelInformation);
  default:
  printf("unsupported pixel format %d!\n", efi_fmt);
- return MX_PIXEL_FORMAT_NONE;
+ return ZX_PIXEL_FORMAT_NONE;
  }
 }

bootloader/src/netboot.c

@@ -10,7 +10,7 @@
 #include <netifc.h>
 #include <xefi.h>
 
-#include <magenta/boot/netboot.h>
+#include <zircon/boot/netboot.h>
 #include <tftp/tftp.h>
 
 #define TFTP_BUF_SZ 2048
@@ -43,7 +43,7 @@ static int nb_boot_now = 0;
 static int nb_active = 0;
 
 static char advertise_nodename[64] = "";
-static char advertise_data[256] = "nodename=magenta";
+static char advertise_data[256] = "nodename=zircon";
 
 static void send_query_ack(const ip6_addr* addr, uint16_t port,
  uint32_t cookie) {

bootloader/src/osboot.c

@@ -20,7 +20,7 @@
 
 #include "osboot.h"
 
-#include <magenta/boot/netboot.h>
+#include <zircon/boot/netboot.h>
 
 #define DEFAULT_TIMEOUT 3
 
@@ -341,7 +341,7 @@ EFIAPI efi_status efi_main(efi_handle img, efi_system_table* sys) {
  }
 
  int32_t prev_attr = gConOut->Mode->Attribute;
- gConOut->SetAttribute(gConOut, EFI_LIGHTMAGENTA | EFI_BACKGROUND_BLACK);
+ gConOut->SetAttribute(gConOut, EFI_LIGHTZIRCON | EFI_BACKGROUND_BLACK);
  draw_version(BOOTLOADER_VERSION);
  gConOut->SetAttribute(gConOut, prev_attr);
 
@@ -352,7 +352,7 @@ EFIAPI efi_status efi_main(efi_handle img, efi_system_table* sys) {
 
  // Default boot defaults to network
  const char* defboot = cmdline_get("bootloader.default", "network");
- const char* nodename = cmdline_get("magenta.nodename", "");
+ const char* nodename = cmdline_get("zircon.nodename", "");
 
  // See if there's a network interface
  bool have_network = netboot_init(nodename) == 0;
@@ -367,14 +367,14 @@ EFIAPI efi_status efi_main(efi_handle img, efi_system_table* sys) {
  // return the generated value in which case it needs to be added to
  // the command line arguments.
  if (nodename[0] == 0) {
- cmdline_set("magenta.nodename", netboot_nodename());
+ cmdline_set("zircon.nodename", netboot_nodename());
  }
  }
 
  printf("\n\n");
  print_cmdline();
 
- // First look for a self-contained magentaboot image
+ // First look for a self-contained zirconboot image
  size_t ksz = 0;
  void* kernel = xefi_load_file(L"mxboot.bin", &ksz, 0);
 
@@ -384,7 +384,7 @@ EFIAPI efi_status efi_main(efi_handle img, efi_system_table* sys) {
 
  // Look for a kernel image on disk
  ksz = 0;
- kernel = xefi_load_file(L"magenta.bin", &ksz, 0);
+ kernel = xefi_load_file(L"zircon.bin", &ksz, 0);
  if (!have_network && kernel == NULL) {
  goto fail;
  }
@@ -430,7 +430,7 @@ EFIAPI efi_status efi_main(efi_handle img, efi_system_table* sys) {
  }
  if (kernel) {
  printf(", ");
- printf("or (m) to boot the magenta.bin on the device");
+ printf("or (m) to boot the zircon.bin on the device");
  }
  printf(" ...");
 

bootloader/src/osboot.h

@@ -28,7 +28,7 @@ int boot_kernel(efi_handle img, efi_system_table* sys,
 
 uint64_t find_acpi_root(efi_handle img, efi_system_table* sys);
 
-uint32_t get_mx_pixel_format(efi_graphics_output_protocol* gop);
+uint32_t get_zx_pixel_format(efi_graphics_output_protocol* gop);
 
 int boot_deprecated(efi_handle img, efi_system_table* sys,
  void* image, size_t sz,