Drop superfluous C_ENVIRONMENT_BOOTBLOCK checks
Some guarding is not needed because the linker drops the code, other guarding is not needed because all platforms using the code now have C_ENVIRONMENT_BOOTBLOCK. Change-Id: I3b1a94e709aa291e1156c854874d7bf461981f32 Signed-off-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-on: https://review.coreboot.org/c/coreboot/+/37157 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: HAOUAS Elyes <ehaouas@noos.fr> Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
This commit is contained in:
committed by
Patrick Georgi
parent
878b685814
commit
689256797e
@ -12,4 +12,4 @@ config CPU_INTEL_MODEL_1067X
|
|||||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||||
select CPU_INTEL_COMMON
|
select CPU_INTEL_COMMON
|
||||||
select CPU_INTEL_COMMON_TIMEBASE
|
select CPU_INTEL_COMMON_TIMEBASE
|
||||||
select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK
|
select SETUP_XIP_CACHE
|
||||||
|
@ -13,4 +13,4 @@ config CPU_INTEL_MODEL_6FX
|
|||||||
select SUPPORT_CPU_UCODE_IN_CBFS
|
select SUPPORT_CPU_UCODE_IN_CBFS
|
||||||
select CPU_INTEL_COMMON
|
select CPU_INTEL_COMMON
|
||||||
select CPU_INTEL_COMMON_TIMEBASE
|
select CPU_INTEL_COMMON_TIMEBASE
|
||||||
select SETUP_XIP_CACHE if C_ENVIRONMENT_BOOTBLOCK
|
select SETUP_XIP_CACHE
|
||||||
|
@ -13,13 +13,9 @@ subdirs-y += ../microcode
|
|||||||
subdirs-y += ../hyperthreading
|
subdirs-y += ../hyperthreading
|
||||||
subdirs-y += ../speedstep
|
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/p4-netburst/cache_as_ram.S
|
||||||
bootblock-y += ../car/bootblock.c
|
bootblock-y += ../car/bootblock.c
|
||||||
bootblock-y += ../../x86/early_reset.S
|
bootblock-y += ../../x86/early_reset.S
|
||||||
endif
|
|
||||||
|
|
||||||
postcar-y += ../car/p4-netburst/exit_car.S
|
postcar-y += ../car/p4-netburst/exit_car.S
|
||||||
|
|
||||||
|
@ -16,13 +16,13 @@
|
|||||||
##
|
##
|
||||||
|
|
||||||
ifneq ($(filter y,$(CONFIG_VENDORCODE_ELTAN_VBOOT) $(CONFIG_VENDORCODE_ELTAN_MBOOT)),)
|
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
|
postcar-y += board_verified_boot.c
|
||||||
ramstage-y += board_verified_boot.c
|
ramstage-y += board_verified_boot.c
|
||||||
romstage-y += board_verified_boot.c
|
romstage-y += board_verified_boot.c
|
||||||
endif
|
endif
|
||||||
|
|
||||||
bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += com_init.c
|
bootblock-y += com_init.c
|
||||||
|
|
||||||
ramstage-y += cpld.c
|
ramstage-y += cpld.c
|
||||||
ramstage-y += gpio.c
|
ramstage-y += gpio.c
|
||||||
|
@ -15,7 +15,7 @@
|
|||||||
## GNU General Public License for more details.
|
## 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 += gpio.c
|
||||||
ramstage-y += hda_verb.c
|
ramstage-y += hda_verb.c
|
||||||
|
@ -17,7 +17,7 @@ ifneq ($(filter y,$(CONFIG_VENDORCODE_ELTAN_VBOOT) $(CONFIG_VENDORCODE_ELTAN_MBO
|
|||||||
|
|
||||||
CPPFLAGS_common += -I$(src)/security/vboot
|
CPPFLAGS_common += -I$(src)/security/vboot
|
||||||
|
|
||||||
bootblock-$(CONFIG_C_ENVIRONMENT_BOOTBLOCK) += vboot_check.c
|
bootblock-y += vboot_check.c
|
||||||
postcar-y += vboot_check.c
|
postcar-y += vboot_check.c
|
||||||
romstage-y += vboot_check.c
|
romstage-y += vboot_check.c
|
||||||
ramstage-y += vboot_check.c
|
ramstage-y += vboot_check.c
|
||||||
|
Reference in New Issue
Block a user