build rules: Identify build stage with simple variables

Provide simple environment variables telling which stage of boot is
being built. Also move this to arch-agnostic location.

Change-Id: I8cbb5cf91f53e01c06e7d672b5be3f5c235f911d
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/5410
Reviewed-by: Aaron Durbin <adurbin@google.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Kyösti Mälkki 2014-02-26 15:19:04 +02:00
parent efb0b51e62
commit e8792be223
8 changed files with 39 additions and 44 deletions

View File

@ -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 */

View File

@ -368,9 +368,9 @@ endif
bootblock_inc += $(objgenerated)/bootblock.inc bootblock_inc += $(objgenerated)/bootblock.inc
bootblock_inc += $(src)/arch/x86/lib/walkcbfs.S 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) 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 endif
$(objgenerated)/bootblock.ld: $$(bootblock_lds) $(obj)/ldoptions $(objgenerated)/bootblock.ld: $$(bootblock_lds) $(obj)/ldoptions

View File

@ -2,7 +2,7 @@
#define ARCH_CPU_H #define ARCH_CPU_H
#include <stdint.h> #include <stdint.h>
#include <arch/rules.h> #include <rules.h>
/* /*
* EFLAGS bits * EFLAGS bits

View File

@ -2,7 +2,7 @@
#define _ASM_IO_H #define _ASM_IO_H
#include <stdint.h> #include <stdint.h>
#include <arch/rules.h> #include <rules.h>
/* /*
* This file contains the definitions for the x86 IO instructions * This file contains the definitions for the x86 IO instructions

View File

@ -3,7 +3,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <arch/rules.h> #include <rules.h>
#include <device/resource.h> #include <device/resource.h>
#include <device/path.h> #include <device/path.h>

View File

@ -19,7 +19,7 @@
#include <stdint.h> #include <stdint.h>
#include <stddef.h> #include <stddef.h>
#include <arch/rules.h> #include <rules.h>
#include <arch/io.h> #include <arch/io.h>
#include <device/pci_def.h> #include <device/pci_def.h>
#include <device/resource.h> #include <device/resource.h>

View File

@ -2,7 +2,7 @@
#define DEVICE_PNP_H #define DEVICE_PNP_H
#include <stdint.h> #include <stdint.h>
#include <arch/rules.h> #include <rules.h>
#include <device/device.h> #include <device/device.h>
#include <device/pnp_def.h> #include <device/pnp_def.h>

View File

@ -16,8 +16,37 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/ */
#ifndef _ARCH_RULES_H #ifndef _RULES_H
#define _ARCH_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. /* For romstage and ramstage always build with simple device model, ie.
* PCI, PNP and CPU functions operate without use of devicetree. * PCI, PNP and CPU functions operate without use of devicetree.
@ -31,4 +60,4 @@
#define __SIMPLE_DEVICE__ #define __SIMPLE_DEVICE__
#endif #endif
#endif /* _ARCH_RULES_H */ #endif /* _RULES_H */