Commit 1abb5ae7 authored by Charles Jacobsen's avatar Charles Jacobsen Committed by Vikram Narayanan
Browse files

build-refactor: New arch directory, header shuffling.

Following the Linux kernel src layout, moved the vt-x code
into a separate arch folder. Moved headers around:

   -- Microkernel/kliblcd arch-independent headers are in
      include/lcd_domains
   -- Microkernel arch-dependent headers are in arch/x86/include
   -- liblcd headers are in include/liblcd

Switched some file/dir names to use `_` instead of `-`.
parent f7983ab5
......@@ -31,23 +31,25 @@ MICROKERNEL_BUILD_DIRS=$(foreach dir,$(MICROKERNEL_DIRS),\
microkernel: libcap.microkernel $(MICROKERNEL_BUILD_DIR)/Kbuild | \
$(MICROKERNEL_BUILD_DIRS)
$(MAKE) -C .. M=$(PWD)/$(MICROKERNEL_BUILD_DIR) -j8
$(MAKE) -C .. M=$(MICROKERNEL_BUILD_DIR) -j8
libcap.microkernel: $(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile \
| $(MICROKERNEL_BUILD_DIRS)
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build && \
$(MAKE) -C $(MICROKERNEL_BUILD_DIR)/libcap.build install
$(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile: libcap/configure
$(MICROKERNEL_BUILD_DIR)/libcap.build/Makefile: libcap/configure | \
$(MICROKERNEL_BUILD_DIRS)
cd $(MICROKERNEL_BUILD_DIR)/libcap.build && \
$(LCD_DOMAINS_TOP_SRC_DIR)/libcap/configure && \
$(LCD_DOMAINS_TOP_SRC_DIR)/libcap/configure \
PLATFORM=kernel --disable-test-build \
--disable-global-cap-types \
--with-kernel-headers=$(LCD_DOMAINS_TOP_SRC_DIR)/.. \
--disable-kernel-module \
--prefix=$(MICROKERNEL_BUILD_DIR)/libcap.install
$(MICROKERNEL_BUILD_DIR)/Kbuild: $(MICROKERNEL_BUILD_DIRS)
$(MICROKERNEL_BUILD_DIR)/Kbuild: scripts/Kbuild.microkernel | \
$(MICROKERNEL_BUILD_DIRS)
cp scripts/Kbuild.microkernel $(MICROKERNEL_BUILD_DIR)/Kbuild
$(MICROKERNEL_BUILD_DIRS):
......
......@@ -4,7 +4,7 @@
#include <asm/vmx.h>
#include <linux/spinlock.h>
#include <linux/bitmap.h>
#include <lcd-domains/types.h>
#include <lcd_domains/types.h>
#include <linux/mutex.h>
extern int lcd_on_cpu;
......
......@@ -14,7 +14,7 @@
#include <asm/vmx.h>
#include <uapi/asm/vmx.h>
#include <asm/desc.h>
#include <asm/lcd-domains.h>
#include <asm/lcd_domains/main.h>
#include <linux/bitmap.h>
#include <linux/spinlock.h>
......@@ -27,7 +27,7 @@
#include <linux/module.h>
#include <linux/kernel.h>
#include "../../internal.h"
#include <lcd_domains/microkernel.h>
/* VMX DATA STRUCTURES -------------------------------------------------- */
......
......@@ -10,7 +10,7 @@
#include <lcd_config/pre_hook.h>
#include <libcap.h>
#include <lcd-domains/liblcd.h>
#include <liblcd/liblcd.h>
#include <lcd_config/post_hook.h>
......
......@@ -13,7 +13,7 @@
#include <linux/interval_tree.h>
#include <linux/rb_tree.h>
#include <libcap.h>
#include <lcd-domains/liblcd.h>
#include <liblcd/liblcd.h>
#include <lcd_config/post_hook.h>
......
/*
* liblcd.h
*
* Includes all the liblcd stuff in one header.
*
* Copyright: University of Utah
*/
#ifndef LCD_DOMAIN_LIBLCD
#define LCD_DOMAIN_LIBLCD
#include <lcd-domains/liblcd/address_spaces.h>
#include <lcd-domains/liblcd/allocator.h>
#include <lcd-domains/liblcd/boot_info.h>
#include <lcd-domains/liblcd/cap.h>
#include <lcd-domains/liblcd/console.h>
#include <lcd-domains/liblcd/create.h>
#include <lcd-domains/liblcd/enter_exit.h>
#include <lcd-domains/liblcd/mem.h>
#include <lcd-domains/liblcd/module_load.h>
#include <lcd-domains/liblcd/resource_tree.h>
#include <lcd-domains/liblcd/sync_ipc.h>
#include <lcd-domains/liblcd/syscall.h>
#endif /* LCD_DOMAIN_LIBLCD */
......@@ -14,10 +14,10 @@
#include <linux/spinlock.h>
#include <linux/interval_tree.h>
#include <asm/lcd-domains.h>
#include <lcd-domains/types.h>
#include <lcd-domains/liblcd/sync_ipc.h>
#include <lcd-domains/liblcd/syscall.h>
#include <asm/lcd_domains/main.h>
#include <lcd_domains/types.h>
#include <liblcd/sync_ipc.h>
#include <liblcd/syscall.h>
/* --------------------------------------------------
* DEBUG
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment