More cleanup.

Rename shellcode_hypervisor to shellcode_hv and kernel_code to boot_linux.

shellcode_kernel/Makefile

@@ -17,7 +17,7 @@ LDFLAGS = -T linker.ld
 TARGET  = shellcode_kernel.elf
 TEXT_BIN = shellcode_kernel.bin
 
-SRC = main.c utils.c kernel_code.c
+SRC = main.c utils.c boot_linux.c
 OBJ = $(SRC:.c=.o)
 
 dump = shellcode_kernel.h

shellcode_kernel/boot_linux.c

@@ -1,7 +1,8 @@
-#include "kernel_code.h"
+#include "boot_linux.h"
 #include "../include/config.h"
-#include "../shellcode_hypervisor/shellcode_hypervisor.h"
-#include "../shellcode_hypervisor/shellcode_hypervisor_args.h"
+#include "../include/linux.h"
+#include "../shellcode_hv/shellcode_hv.h"
+#include "../shellcode_hv/shellcode_hv_args.h"
 #include "shellcode_kernel_args.h"
 #include "utils.h"
 #include <unistd.h>
@@ -41,16 +42,6 @@ struct dig_transmitter_control_parameters_v1_6 {
   uint32_t reserved1;
 };
 
-struct linux_info {
-  uintptr_t bzimage;
-  size_t bzimage_size;
-  uintptr_t initrd;
-  size_t initrd_size;
-  size_t vram_size;
-  char cmdline[2048];
-  int kit_type;
-};
-
 static struct linux_info info;
 
 static int mp3_req[1281], mp3_rsp[1282];
@@ -119,8 +110,8 @@ static void patch_hv(void) {
   }
 
   // Install hv_shellcode 2
-  memcpy((void *)PHYS_TO_DMAP(cave_hv_code), shellcode_hypervisor_bin,
-         shellcode_hypervisor_bin_len);
+  memcpy((void *)PHYS_TO_DMAP(cave_hv_code), shellcode_hv_bin,
+         shellcode_hv_bin_len);
 
   // Jump to shellcode final identity mapping
   uint8_t shellcode_jmp[] = {

shellcode_kernel/boot_linux.h

@@ -1,5 +1,5 @@
-#ifndef KERNEL_CODE_H
-#define KERNEL_CODE_H
+#ifndef BOOT_LINUX_H
+#define BOOT_LINUX_H
 
 #include <stdint.h>
 

shellcode_kernel/main.c

@@ -1,5 +1,5 @@
 #include "main.h"
-#include "kernel_code.h"
+#include "boot_linux.h"
 #include "utils.h"
 #include <stdint.h>