From 022287c38b23d173767f366cdc7dfba881abbbd7 Mon Sep 17 00:00:00 2001 From: Adrian Danis Date: Thu, 2 Jul 2015 15:09:01 +1000 Subject: [PATCH] x86: Minimal changes to fix previous commit that renamed headers --- include/arch/x86/arch/32/{ => mode}/machine.h | 4 ++-- .../arch/32/{ => mode}/machine/cpu_registers.h | 4 ++-- .../x86/arch/32/{ => mode}/machine/registerset.h | 4 ++-- .../x86/arch/32/{ => mode}/object/structures.h | 4 ++-- include/arch/x86/arch/machine.h | 16 ++++++++++++++++ include/arch/x86/arch/machine/cpu_registers.h | 16 ++++++++++++++++ include/arch/x86/arch/machine/registerset.h | 16 ++++++++++++++++ include/arch/x86/arch/object/structures.h | 16 ++++++++++++++++ .../pc99/plat/32/plat_mode/machine/hardware.h | 4 ++-- include/plat/pc99/plat/machine/hardware.h | 16 ++++++++++++++++ 10 files changed, 90 insertions(+), 10 deletions(-) rename include/arch/x86/arch/32/{ => mode}/machine.h (99%) rename include/arch/x86/arch/32/{ => mode}/machine/cpu_registers.h (96%) rename include/arch/x86/arch/32/{ => mode}/machine/registerset.h (97%) rename include/arch/x86/arch/32/{ => mode}/object/structures.h (98%) create mode 100644 include/arch/x86/arch/machine.h create mode 100644 include/arch/x86/arch/machine/cpu_registers.h create mode 100644 include/arch/x86/arch/machine/registerset.h create mode 100644 include/arch/x86/arch/object/structures.h create mode 100644 include/plat/pc99/plat/machine/hardware.h diff --git a/include/arch/x86/arch/32/machine.h b/include/arch/x86/arch/32/mode/machine.h similarity index 99% rename from include/arch/x86/arch/32/machine.h rename to include/arch/x86/arch/32/mode/machine.h index a66df7022..aad8311e1 100644 --- a/include/arch/x86/arch/32/machine.h +++ b/include/arch/x86/arch/32/mode/machine.h @@ -8,8 +8,8 @@ * @TAG(GD_GPL) */ -#ifndef __ARCH_MACHINE_H -#define __ARCH_MACHINE_H +#ifndef __MODE_MACHINE_H +#define __MODE_MACHINE_H #include #include diff --git a/include/arch/x86/arch/32/machine/cpu_registers.h b/include/arch/x86/arch/32/mode/machine/cpu_registers.h similarity index 96% rename from include/arch/x86/arch/32/machine/cpu_registers.h rename to include/arch/x86/arch/32/mode/machine/cpu_registers.h index c43acd923..ee57338f2 100644 --- a/include/arch/x86/arch/32/machine/cpu_registers.h +++ b/include/arch/x86/arch/32/mode/machine/cpu_registers.h @@ -8,8 +8,8 @@ * @TAG(GD_GPL) */ -#ifndef __ARCH_MACHINE_CPU_REGISTERS_H -#define __ARCH_MACHINE_CPU_REGISTERS_H +#ifndef __MODE_MACHINE_CPU_REGISTERS_H +#define __MODE_MACHINE_CPU_REGISTERS_H #define CR0_MONITOR_COPROC BIT(1) /* Trap on FPU "WAIT" commands. */ #define CR0_EMULATION BIT(2) /* Enable OS emulation of FPU. */ diff --git a/include/arch/x86/arch/32/machine/registerset.h b/include/arch/x86/arch/32/mode/machine/registerset.h similarity index 97% rename from include/arch/x86/arch/32/machine/registerset.h rename to include/arch/x86/arch/32/mode/machine/registerset.h index 65f2d8097..5e0c32a6e 100644 --- a/include/arch/x86/arch/32/machine/registerset.h +++ b/include/arch/x86/arch/32/mode/machine/registerset.h @@ -8,8 +8,8 @@ * @TAG(GD_GPL) */ -#ifndef __ARCH_MACHINE_REGISTERSET_H -#define __ARCH_MACHINE_REGISTERSET_H +#ifndef __MODE_MACHINE_REGISTERSET_H +#define __MODE_MACHINE_REGISTERSET_H #include #include diff --git a/include/arch/x86/arch/32/object/structures.h b/include/arch/x86/arch/32/mode/object/structures.h similarity index 98% rename from include/arch/x86/arch/32/object/structures.h rename to include/arch/x86/arch/32/mode/object/structures.h index d1978aaee..52e35878c 100644 --- a/include/arch/x86/arch/32/object/structures.h +++ b/include/arch/x86/arch/32/mode/object/structures.h @@ -8,8 +8,8 @@ * @TAG(GD_GPL) */ -#ifndef __ARCH_OBJECT_STRUCTURES_H -#define __ARCH_OBJECT_STRUCTURES_H +#ifndef __MODE_OBJECT_STRUCTURES_H +#define __MODE_OBJECT_STRUCTURES_H #include #include diff --git a/include/arch/x86/arch/machine.h b/include/arch/x86/arch/machine.h new file mode 100644 index 000000000..4d043e6dd --- /dev/null +++ b/include/arch/x86/arch/machine.h @@ -0,0 +1,16 @@ +/* + * Copyright 2014, General Dynamics C4 Systems + * + * This software may be distributed and modified according to the terms of + * the GNU General Public License version 2. Note that NO WARRANTY is provided. + * See "LICENSE_GPLv2.txt" for details. + * + * @TAG(GD_GPL) + */ + +#ifndef __ARCH_MACHINE_H +#define __ARCH_MACHINE_H + +#include + +#endif diff --git a/include/arch/x86/arch/machine/cpu_registers.h b/include/arch/x86/arch/machine/cpu_registers.h new file mode 100644 index 000000000..ac9046bd9 --- /dev/null +++ b/include/arch/x86/arch/machine/cpu_registers.h @@ -0,0 +1,16 @@ +/* + * Copyright 2014, General Dynamics C4 Systems + * + * This software may be distributed and modified according to the terms of + * the GNU General Public License version 2. Note that NO WARRANTY is provided. + * See "LICENSE_GPLv2.txt" for details. + * + * @TAG(GD_GPL) + */ + +#ifndef __ARCH_MACHINE_CPU_REGISTERS_H +#define __ARCH_MACHINE_CPU_REGISTERS_H + +#include + +#endif diff --git a/include/arch/x86/arch/machine/registerset.h b/include/arch/x86/arch/machine/registerset.h new file mode 100644 index 000000000..912fc7012 --- /dev/null +++ b/include/arch/x86/arch/machine/registerset.h @@ -0,0 +1,16 @@ +/* + * Copyright 2014, General Dynamics C4 Systems + * + * This software may be distributed and modified according to the terms of + * the GNU General Public License version 2. Note that NO WARRANTY is provided. + * See "LICENSE_GPLv2.txt" for details. + * + * @TAG(GD_GPL) + */ + +#ifndef __ARCH_MACHINE_REGISTERSET_H +#define __ARCH_MACHINE_REGISTERSET_H + +#include + +#endif diff --git a/include/arch/x86/arch/object/structures.h b/include/arch/x86/arch/object/structures.h new file mode 100644 index 000000000..796e35d82 --- /dev/null +++ b/include/arch/x86/arch/object/structures.h @@ -0,0 +1,16 @@ +/* + * Copyright 2014, General Dynamics C4 Systems + * + * This software may be distributed and modified according to the terms of + * the GNU General Public License version 2. Note that NO WARRANTY is provided. + * See "LICENSE_GPLv2.txt" for details. + * + * @TAG(GD_GPL) + */ + +#ifndef __ARCH_OBJECT_STRUCTURES_H +#define __ARCH_OBJECT_STRUCTURES_H + +#include + +#endif diff --git a/include/plat/pc99/plat/32/plat_mode/machine/hardware.h b/include/plat/pc99/plat/32/plat_mode/machine/hardware.h index 287c23083..9325cc66a 100644 --- a/include/plat/pc99/plat/32/plat_mode/machine/hardware.h +++ b/include/plat/pc99/plat/32/plat_mode/machine/hardware.h @@ -8,8 +8,8 @@ * @TAG(GD_GPL) */ -#ifndef __PLAT_MACHINE_HARDWARE_H -#define __PLAT_MACHINE_HARDWARE_H +#ifndef __PLAT_MODE_MACHINE_HARDWARE_H +#define __PLAT_MODE_MACHINE_HARDWARE_H #include #include diff --git a/include/plat/pc99/plat/machine/hardware.h b/include/plat/pc99/plat/machine/hardware.h new file mode 100644 index 000000000..bac2d2ab3 --- /dev/null +++ b/include/plat/pc99/plat/machine/hardware.h @@ -0,0 +1,16 @@ +/* + * Copyright 2014, General Dynamics C4 Systems + * + * This software may be distributed and modified according to the terms of + * the GNU General Public License version 2. Note that NO WARRANTY is provided. + * See "LICENSE_GPLv2.txt" for details. + * + * @TAG(GD_GPL) + */ + +#ifndef __PLAT_MACHINE_HARDWARE_H +#define __PLAT_MACHINE_HARDWARE_H + +#include + +#endif