diff options
| -rw-r--r-- | src/arch/armv7/include/arch/rules.h | 34 | ||||
| -rw-r--r-- | src/arch/x86/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/cpu.h | 2 | ||||
| -rw-r--r-- | src/arch/x86/include/arch/io.h | 2 | ||||
| -rw-r--r-- | src/include/device/device.h | 2 | ||||
| -rw-r--r-- | src/include/device/pci.h | 2 | ||||
| -rw-r--r-- | src/include/device/pnp.h | 2 | ||||
| -rw-r--r-- | src/include/rules.h (renamed from src/arch/x86/include/arch/rules.h) | 35 |
8 files changed, 39 insertions, 44 deletions
diff --git a/src/arch/armv7/include/arch/rules.h b/src/arch/armv7/include/arch/rules.h deleted file mode 100644 index a790365118..0000000000 --- a/src/arch/armv7/include/arch/rules.h +++ /dev/null @@ -1,34 +0,0 @@ -/* - * This file is part of the coreboot project. - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; version 2 of the License. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - -#ifndef _ARCH_RULES_H -#define _ARCH_RULES_H - -/* For romstage and ramstage always build with simple device model, ie. - * PCI, PNP and CPU functions operate without use of devicetree. - * - * For ramstage individual source file may define __SIMPLE_DEVICE__ - * before including any header files to force that particular source - * be built with simple device model. - */ - -#if defined(__PRE_RAM__) -#define __SIMPLE_DEVICE__ -#endif - -#endif /* _ARCH_RULES_H */ diff --git a/src/arch/x86/Makefile.inc b/src/arch/x86/Makefile.inc index 56f0c5c7ba..f986c3b092 100644 --- a/src/arch/x86/Makefile.inc +++ b/src/arch/x86/Makefile.inc @@ -368,9 +368,9 @@ endif bootblock_inc += $(objgenerated)/bootblock.inc bootblock_inc += $(src)/arch/x86/lib/walkcbfs.S -bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ +bootblock_romccflags := -mcpu=i386 -O2 -D__PRE_RAM__ -D__BOOT_BLOCK__ ifeq ($(CONFIG_SSE),y) -bootblock_romccflags := -mcpu=k7 -msse -O2 -D__PRE_RAM__ +bootblock_romccflags := -mcpu=k7 -msse -O2 -D__PRE_RAM__ -D__BOOT_BLOCK__ endif $(objgenerated)/bootblock.ld: $$(bootblock_lds) $(obj)/ldoptions diff --git a/src/arch/x86/include/arch/cpu.h b/src/arch/x86/include/arch/cpu.h index 281565bef6..ebb7cdfdfb 100644 --- a/src/arch/x86/include/arch/cpu.h +++ b/src/arch/x86/include/arch/cpu.h @@ -2,7 +2,7 @@ #define ARCH_CPU_H #include <stdint.h> -#include <arch/rules.h> +#include <rules.h> /* * EFLAGS bits diff --git a/src/arch/x86/include/arch/io.h b/src/arch/x86/include/arch/io.h index b10fb8a7cf..ce3574ea70 100644 --- a/src/arch/x86/include/arch/io.h +++ b/src/arch/x86/include/arch/io.h @@ -2,7 +2,7 @@ #define _ASM_IO_H #include <stdint.h> -#include <arch/rules.h> +#include <rules.h> /* * This file contains the definitions for the x86 IO instructions diff --git a/src/include/device/device.h b/src/include/device/device.h index 74bdbd7b40..dfebeaa6f8 100644 --- a/src/include/device/device.h +++ b/src/include/device/device.h @@ -3,7 +3,7 @@ #include <stdint.h> #include <stddef.h> -#include <arch/rules.h> +#include <rules.h> #include <device/resource.h> #include <device/path.h> diff --git a/src/include/device/pci.h b/src/include/device/pci.h index f729c2726c..5594d293bd 100644 --- a/src/include/device/pci.h +++ b/src/include/device/pci.h @@ -19,7 +19,7 @@ #include <stdint.h> #include <stddef.h> -#include <arch/rules.h> +#include <rules.h> #include <arch/io.h> #include <device/pci_def.h> #include <device/resource.h> diff --git a/src/include/device/pnp.h b/src/include/device/pnp.h index a229edb966..43f457baff 100644 --- a/src/include/device/pnp.h +++ b/src/include/device/pnp.h @@ -2,7 +2,7 @@ #define DEVICE_PNP_H #include <stdint.h> -#include <arch/rules.h> +#include <rules.h> #include <device/device.h> #include <device/pnp_def.h> diff --git a/src/arch/x86/include/arch/rules.h b/src/include/rules.h index 4b8467730d..22111e8dfb 100644 --- a/src/arch/x86/include/arch/rules.h +++ b/src/include/rules.h @@ -16,8 +16,37 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ -#ifndef _ARCH_RULES_H -#define _ARCH_RULES_H +#ifndef _RULES_H +#define _RULES_H + +/* Useful helpers to tell whether the code is executing in bootblock, + * romstage, ramstage or SMM. + */ + +#if defined(__BOOT_BLOCK__) +#define ENV_BOOTBLOCK 1 +#define ENV_ROMSTAGE 0 +#define ENV_RAMSTAGE 0 +#define ENV_SMM 0 + +#elif defined(__PRE_RAM__) +#define ENV_BOOTBLOCK 0 +#define ENV_ROMSTAGE 1 +#define ENV_RAMSTAGE 0 +#define ENV_SMM 0 + +#elif defined(__SMM__) +#define ENV_BOOTBLOCK 0 +#define ENV_ROMSTAGE 0 +#define ENV_RAMSTAGE 0 +#define ENV_SMM 1 +#else + +#define ENV_BOOTBLOCK 0 +#define ENV_ROMSTAGE 0 +#define ENV_RAMSTAGE 1 +#define ENV_SMM 0 +#endif /* For romstage and ramstage always build with simple device model, ie. * PCI, PNP and CPU functions operate without use of devicetree. @@ -31,4 +60,4 @@ #define __SIMPLE_DEVICE__ #endif -#endif /* _ARCH_RULES_H */ +#endif /* _RULES_H */ |