Keep dual-licensed code and/or headers shared between components at one single place. Also maintain documentation and .gitignore.
Both, inmates and hypervisor need those definitions. Don't store the global config.h somewhere deep inside 'hypervisor/' any longer. Signed-off-by: Ralf Ramsauer <[email protected]> Signed-off-by: Antonios Motakis <[email protected]> --- .gitignore | 2 +- Documentation/hypervisor-configuration.md | 2 +- Documentation/setup-on-banana-pi-arm-board.md | 2 +- Kbuild | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b4ebeda7..26399865 100644 --- a/.gitignore +++ b/.gitignore @@ -12,7 +12,7 @@ Module.symvers modules.order driver/jailhouse.ko -hypervisor/include/jailhouse/config.h +include/jailhouse/config.h hypervisor/hypervisor.lds inmates/lib/arm/inmate.lds inmates/lib/arm64/inmate.lds diff --git a/Documentation/hypervisor-configuration.md b/Documentation/hypervisor-configuration.md index ecd4fa54..e59a2faf 100644 --- a/Documentation/hypervisor-configuration.md +++ b/Documentation/hypervisor-configuration.md @@ -4,7 +4,7 @@ Hypervisor Configuration Jailhouse supports various static compile-time configuration parameters, such as platform specific settings and debugging options. Those settings can optionally be defined in -'hypervisor/include/jailhouse/config.h'. +'include/jailhouse/config.h'. Every configuration option should be defined to "1" or not be in the file at all. Defining any other value can cause unexpected behaviour. diff --git a/Documentation/setup-on-banana-pi-arm-board.md b/Documentation/setup-on-banana-pi-arm-board.md index 26b84480..060062d9 100644 --- a/Documentation/setup-on-banana-pi-arm-board.md +++ b/Documentation/setup-on-banana-pi-arm-board.md @@ -235,7 +235,7 @@ $ cp -av ~/freertos-cell/jailhouse-configs/bananapi.c ~/jailhouse/configs/banana $ cp -av freertos-cell/jailhouse-configs/bananapi-freertos-demo.c ~/jailhouse/configs/ #Copy the configuration header file before building -$ cp -av ~/jailhouse/ci/jailhouse-config-banana-pi.h ~/jailhouse/hypervisor/include/jailhouse/config.h +$ cp -av ~/jailhouse/ci/jailhouse-config-banana-pi.h ~/jailhouse/include/jailhouse/config.h $ cd ~/jailhouse $ make ARCH=arm CROSS_COMPILE=arm-linux-gnueabihf- KDIR=../linux-stable ``` diff --git a/Kbuild b/Kbuild index 420dedc1..090094e2 100644 --- a/Kbuild +++ b/Kbuild @@ -11,7 +11,7 @@ # the COPYING file in the top-level directory. # -INC_CONFIG_H = $(src)/hypervisor/include/jailhouse/config.h +INC_CONFIG_H = $(src)/include/jailhouse/config.h export INC_CONFIG_H define filechk_config_mk -- 2.15.1 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
