x86 chipsets: Link non-code flow CHIPSET_BOOTBLOCK_INCLUDE files

Non-code flow assembly stubs do not have to be included in
bootblock.S, now that we have more freedom in bootblock linking.
Rather than bringing these stubs to the config system, just link them
in the bootblock.

Note that we cannot fully remove CHIPSET_BOOTBLOCK_INCLUDE at this
point, as some intel SOCs use this stub for code flow.

objdump -h build/cbfs/fallback/bootblock.debug on a few random boards
confirms that the appropriate sections are still included in the
final binary.

Change-Id: Id3f9ece14e399c1cc83090f407780c4a05a076f0
Signed-off-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reviewed-on: https://review.coreboot.org/11856
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>

src/cpu/dmp/vortex86ex/Kconfig

@@ -73,8 +73,4 @@ config PLL_500_375_33
 
 endchoice
 
-config CHIPSET_BOOTBLOCK_INCLUDE
-	string
-	default "cpu/dmp/vortex86ex/chipset_bootblock.inc"
-
 endif

src/cpu/dmp/vortex86ex/Makefile.inc

@@ -21,5 +21,7 @@ subdirs-y += ../../x86/smm
 
 bootblock-y += biosdata.ld
 bootblock-y += biosdata_ex.ld
+bootblock-y += biosdata.S
+bootblock-y += biosdata_ex.S
 
 ROMCCFLAGS := -mcpu=i386 -O2

src/cpu/dmp/vortex86ex/chipset_bootblock.inc

@@ -1,2 +0,0 @@
-#include "biosdata.inc"
-#include "biosdata_ex.inc"