Index: tools/tools/ucode-split/Makefile
===================================================================
--- /dev/null
+++ tools/tools/ucode-split/Makefile
@@ -0,0 +1,4 @@
+PROG=	ucode-split
+MAN=
+
+.include <bsd.prog.mk>
Index: tools/tools/ucode-split/ucode-split.c
===================================================================
--- /dev/null
+++ tools/tools/ucode-split/ucode-split.c
@@ -0,0 +1,141 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+ *
+ * Copyright (C) 2018 The FreeBSD Foundation.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <err.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdint.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+static const size_t bufsize = 65536;
+
+/* Intel microcode header from SDM 9.11.1 */
+struct microcode_update_header {
+	uint32_t header_version;
+	uint32_t update_revision;
+	uint32_t date;			/* BCD mmddyyyy */
+	uint32_t processor_signature;
+	uint32_t checksum;		/* Over update data and header */
+	uint32_t loader_revision;
+	uint32_t processor_flags;
+	uint32_t data_size;
+	uint32_t total_size;
+	uint32_t reserved[3];
+};
+
+void
+dump_header(struct microcode_update_header *hdr)
+{
+	printf("version\t\t0x%x\n", hdr->header_version);
+	printf("revision\t0x%x\n", hdr->update_revision);
+	printf("date\t\t0x%x\t%04x-%02x-%02x\n", hdr->date,
+	    hdr->date & 0xffff, (hdr->date & 0xff000000) >> 24,
+	    (hdr->date & 0xff0000) >> 16);
+	printf("signature\t0x%x\t\t%02x-%02x-%02x\n", hdr->processor_signature,
+	    (hdr->processor_signature & 0xf00) >> 8,
+	    (hdr->processor_signature & 0xf0) >> 4,
+	    (hdr->processor_signature & 0xf));
+	printf("checksum\t0x%x\n", hdr->checksum);
+	printf("loader revision\t0x%x\n", hdr->loader_revision);
+	printf("processor flags\t0x%x\n", hdr->processor_flags);
+	printf("datasize\t0x%x\n", hdr->data_size);
+	printf("size\t\t0x%x\n", hdr->total_size);
+}
+
+static void
+usage(void)
+{
+	printf("ucode-split microcode_file\n");
+	exit(1);
+}
+
+int
+main(int argc, char *argv[])
+{
+	struct microcode_update_header hdr;
+	char output_file[128];
+	char *buf;
+	size_t len, remain;
+	int ifd, ofd, rv;
+
+	if (argc != 2)
+		usage();
+
+	ifd = open(argv[1], O_RDONLY);
+	if (ifd < 0)
+		err(1, "open");
+
+	buf = malloc(bufsize);
+	if (buf == NULL)
+		err(1, "malloc");
+
+	for (;;) {
+		/* Read header. */
+		rv = read(ifd, &hdr, sizeof(hdr));
+		if (rv < 0) {
+			err(1, "read");
+		} else if (rv == 0) {
+			break;
+		} else if (rv < sizeof (hdr)) {
+			errx(1, "invalid microcode header");
+		}
+
+		dump_header(&hdr);
+
+		sprintf(output_file, "%02x-%02x-%02x.%02x",
+		    (hdr.processor_signature & 0xf00) >> 8,
+		    (hdr.processor_signature & 0xf0) >> 4,
+		    hdr.processor_signature & 0xf, hdr.processor_flags);
+		ofd = open(output_file, O_WRONLY | O_CREAT | O_TRUNC, 0600);
+		if (ofd < 0)
+			err(1, "open");
+
+		/* Write header. */
+		rv = write(ofd, &hdr, sizeof(hdr));
+		if (rv < 0)
+			err(1, "write");
+
+		/* Copy data. */
+		remain = hdr.total_size - sizeof(hdr);
+		while (remain > 0) {
+			len = remain < bufsize ? remain : bufsize;
+			rv = read(ifd, buf, len);
+			if (rv < 0)
+				err(1, "read");
+			else if (rv < len)
+				errx(1, "truncated microcode data");
+			if (write(ofd, buf, len) < 0)
+				err(1, "write");
+			remain -= len;
+		}
+		printf("written to %s\n\n", output_file);
+		close(ofd);
+	}
+}