diff options
| -rw-r--r-- | src/cpu/intel/model_1067x/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/intel/model_6fx/Kconfig | 2 | ||||
| -rw-r--r-- | src/cpu/intel/socket_LGA775/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/facebook/fbg1701/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/mainboard/portwell/m107/Makefile.inc | 2 | ||||
| -rw-r--r-- | src/vendorcode/eltan/security/verified_boot/Makefile.inc | 2 |
6 files changed, 6 insertions, 10 deletions
diff --git a/src/cpu/intel/model_1067x/Kconfig b/src/cpu/intel/model_1067x/Kconfig index 564a428bbc..79dda288b6 100644 --- a/src/cpu/intel/model_1067x/Kconfig +++ b/src/cpu/intel/model_1067x/Kconfig @@ -12,4 +12,4 @@ config CPU_INTEL_MODEL_1067X select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON select CPU_INTEL_COMMON_TIMEBASE - select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK + select SETUP_XIP_CACHE diff --git a/src/cpu/intel/model_6fx/Kconfig b/src/cpu/intel/model_6fx/Kconfig index cfd3e7c6e0..e3d327ca02 100644 --- a/src/cpu/intel/model_6fx/Kconfig +++ b/src/cpu/intel/model_6fx/Kconfig @@ -13,4 +13,4 @@ config CPU_INTEL_MODEL_6FX select SUPPORT_CPU_UCODE_IN_CBFS select CPU_INTEL_COMMON select CPU_INTEL_COMMON_TIMEBASE - select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK + select SETUP_XIP_CACHE diff --git a/src/cpu/intel/socket_LGA775/Makefile.inc b/src/cpu/intel/socket_LGA775/Makefile.inc index a7984a9dfb..2f1c6b49ea 100644 --- a/src/cpu/intel/socket_LGA775/Makefile.inc +++ b/src/cpu/intel/socket_LGA775/Makefile.inc @@ -13,13 +13,9 @@ subdirs-y += ../microcode subdirs-y += ../hyperthreading subdirs-y += ../speedstep -ifneq ($(CONFIG_C_ENVIRONMENT_BOOTBLOCK),y) -cpu_incs-y += $(src)/cpu/intel/car/p4-netburst/cache_as_ram.S -else bootblock-y += ../car/p4-netburst/cache_as_ram.S bootblock-y += ../car/bootblock.c bootblock-y += ../../x86/early_reset.S -endif postcar-y += ../car/p4-netburst/exit_car.S diff --git a/src/mainboard/facebook/fbg1701/Makefile.inc b/src/mainboard/facebook/fbg1701/Makefile.inc index ac4e571653..07b3e351af 100644 --- a/src/mainboard/facebook/fbg1701/Makefile.inc +++ b/src/mainboard/facebook/fbg1701/Makefile.inc @@ -16,13 +16,13 @@ ## ifneq ($(filter y,$(CONFIG_VENDORCODE_ELTAN_VBOOT) $(CONFIG_VENDORCODE_ELTAN_MBOOT)),) -bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += board_verified_boot.c +bootblock-y += board_verified_boot.c postcar-y += board_verified_boot.c ramstage-y += board_verified_boot.c romstage-y += board_verified_boot.c endif -bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += com_init.c +bootblock-y += com_init.c ramstage-y += cpld.c ramstage-y += gpio.c diff --git a/src/mainboard/portwell/m107/Makefile.inc b/src/mainboard/portwell/m107/Makefile.inc index 7d4725efe4..5d88549ab5 100644 --- a/src/mainboard/portwell/m107/Makefile.inc +++ b/src/mainboard/portwell/m107/Makefile.inc @@ -15,7 +15,7 @@ ## GNU General Public License for more details. ## -bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += com_init.c +bootblock-y += com_init.c ramstage-y += gpio.c ramstage-y += hda_verb.c diff --git a/src/vendorcode/eltan/security/verified_boot/Makefile.inc b/src/vendorcode/eltan/security/verified_boot/Makefile.inc index 357e520298..97d8f81c91 100644 --- a/src/vendorcode/eltan/security/verified_boot/Makefile.inc +++ b/src/vendorcode/eltan/security/verified_boot/Makefile.inc @@ -17,7 +17,7 @@ ifneq ($(filter y,$(CONFIG_VENDORCODE_ELTAN_VBOOT) $(CONFIG_VENDORCODE_ELTAN_MBO CPPFLAGS_common += -I$(src)/security/vboot -bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += vboot_check.c +bootblock-y += vboot_check.c postcar-y += vboot_check.c romstage-y += vboot_check.c ramstage-y += vboot_check.c |