xx20/xx30 blob based boards: move ME blobs target outside of board configs (targets/xx*_blobs.mk)

tlaurion · tlaurion · commit 77f9933538fe · 2024-01-04T15:32:09.000-05:00
Makefile: have inclusion of all defined $BOARD BOARD_TARGETS (me, split_8mb4mb, ...)

TODO: VBIOS scripts for W530/T530 need way more work. To be done later.

Signed-off-by: Thierry Laurion &lt;insurgo@riseup.net&gt;
diff --git a/Makefile b/Makefile
@@ -82,7 +82,7 @@ $(error "Unexpected value of $$(CONFIG_TARGET_ARCH): $(CONFIG_TARGET_ARCH)")
 endif
 
 ifneq "$(BOARD_TARGETS)" ""
-include targets/$(BOARD_TARGETS).mk
+include $(foreach TARGET,$(BOARD_TARGETS),targets/$(TARGET).mk)
 endif
 
 # Create directories if they don't already exist
diff --git a/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config b/boards/UNTESTED_t520-hotp-maximized/UNTESTED_t520-hotp-maximized.config
@@ -63,15 +63,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="ThinkPad T520-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
 
-# xx20 boards require of you initially call one of the following to habe gbe.bin ifd.bin and me.bin
-#  - blobs/xx20/download_parse_me.sh
-#     To download Lenovo update ME binary, neuter+deactivate ME, produce reduced IFD ME region and expended BIOS IFD region.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx20/me.bin
-
-
-$(pwd)/blobs/xx20/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx20/download_parse_me.sh
+#Include bits related to sandybridge ME blob download/neutering down to BUP
+BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config b/boards/UNTESTED_t520-maximized/UNTESTED_t520-maximized.config
@@ -63,15 +63,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="ThinkPad T520-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
 
-# xx20 boards require of you initially call one of the following to habe gbe.bin ifd.bin and me.bin
-#  - blobs/xx20/download_parse_me.sh
-#     To download Lenovo update ME binary, neuter+deactivate ME, produce reduced IFD ME region and expended BIOS IFD region.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx20/me.bin
-
-
-$(pwd)/blobs/xx20/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx20/download_parse_me.sh
+#Include bits related to sandybridge ME blob download/neutering down to BUP
+BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config b/boards/UNTESTED_t530-dgpu-hotp-maximized/UNTESTED_t530-dgpu-hotp-maximized.config
@@ -67,24 +67,15 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T530-dgpu-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0def.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0def.rom:
 	$(pwd)/blobs/xx30/vbios_t530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config b/boards/UNTESTED_t530-dgpu-maximized/UNTESTED_t530-dgpu-maximized.config
@@ -67,25 +67,15 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T530-dgpu-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
 # Make the Coreboot build depend on the following 3rd party blobs:
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0def.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0def.rom:
 	$(pwd)/blobs/xx30/vbios_t530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config b/boards/UNTESTED_t530-hotp-maximized/UNTESTED_t530-hotp-maximized.config
@@ -67,22 +67,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T530-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config b/boards/UNTESTED_t530-maximized/UNTESTED_t530-maximized.config
@@ -67,22 +67,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T530-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-hotp-maximized/UNTESTED_w530-dgpu-K1000m-hotp-maximized.config
@@ -79,13 +79,11 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0ffc.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0ffc.rom:
 	$(pwd)/blobs/xx30/vbios_w530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config b/boards/UNTESTED_w530-dgpu-K1000m-maximized/UNTESTED_w530-dgpu-K1000m-maximized.config
@@ -79,13 +79,11 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0ffc.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0ffc.rom:
 	$(pwd)/blobs/xx30/vbios_w530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-hotp-maximized/UNTESTED_w530-dgpu-K2000m-hotp-maximized.config
@@ -79,13 +79,11 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0ffb.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0ffb.rom:
 	$(pwd)/blobs/xx30/vbios_w530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config b/boards/UNTESTED_w530-dgpu-K2000m-maximized/UNTESTED_w530-dgpu-K2000m-maximized.config
@@ -79,13 +79,11 @@ export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 $(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
     $(pwd)/blobs/xx30/me.bin $(pwd)/blobs/xx30/10de,0ffb.rom $(pwd)/blobs/xx30/8086,0106.rom
 
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 $(pwd)/blobs/xx30/10de,0ffb.rom:
 	$(pwd)/blobs/xx30/vbios_w530.sh
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/t420-hotp-maximized/t420-hotp-maximized.config b/boards/t420-hotp-maximized/t420-hotp-maximized.config
@@ -67,15 +67,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="ThinkPad T420-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
 
-# xx20 boards require of you initially call one of the following to habe gbe.bin ifd.bin and me.bin
-#  - blobs/xx20/download_parse_me.sh
-#     To download Lenovo update ME binary, neuter+deactivate ME, produce reduced IFD ME region and expended BIOS IFD region.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx20/me.bin
-
-
-$(pwd)/blobs/xx20/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx20/download_parse_me.sh
+#Include bits related to sandybridge ME blob download/neutering down to BUP
+BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/t420-maximized/t420-maximized.config b/boards/t420-maximized/t420-maximized.config
@@ -66,15 +66,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="ThinkPad T420-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
 
-# xx20 boards require of you initially call one of the following to habe gbe.bin ifd.bin and me.bin
-#  - blobs/xx20/download_parse_me.sh
-#     To download Lenovo update ME binary, neuter+deactivate ME, produce reduced IFD ME region and expended BIOS IFD region.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx20/me.bin
-
-
-$(pwd)/blobs/xx20/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx20/download_parse_me.sh
+#Include bits related to sandybridge ME blob download/neutering down to BUP
+BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/t430-hotp-maximized/t430-hotp-maximized.config b/boards/t430-hotp-maximized/t430-hotp-maximized.config
@@ -65,22 +65,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T430-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/t430-maximized/t430-maximized.config b/boards/t430-maximized/t430-maximized.config
@@ -66,22 +66,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad T430-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/t440p-maximized/t440p-maximized.config b/boards/t440p-maximized/t440p-maximized.config
@@ -53,4 +53,4 @@ $(pwd)/blobs/t440p/me.bin:
 		$(pwd)/blobs/t440p/download-clean-me $(pwd)/blobs/t440p
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/w530-hotp-maximized/w530-hotp-maximized.config b/boards/w530-hotp-maximized/w530-hotp-maximized.config
@@ -67,22 +67,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad W530-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/w530-maximized/w530-maximized.config b/boards/w530-maximized/w530-maximized.config
@@ -67,22 +67,8 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="Thinkpad W530-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal"
 
-# xx30-*-maximized boards require of you initially call one of the
-#  following to have gbe.bin ifd.bin and me.bin
-#  - blobs/xx30/download_clean_me.sh
-#     To download Lenovo original ME binary, neuter+deactivate ME, produce
-#      reduced IFD ME region and expanded BIOS IFD region.
-#  - blobs/xx30/extract.sh
-#     To extract from backuped 8M (bottom SPI) ME binary, GBE and IFD blobs.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx30/me.bin
-
-
-$(pwd)/blobs/xx30/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx30/download_clean_me.sh $(pwd)/blobs/xx30
+#Include bits related to ivybridge ME blob download/neutering down to BUP+ROMP
+BOARD_TARGETS := xx30_me_blobs
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/w541-maximized/w541-maximized.config b/boards/w541-maximized/w541-maximized.config
@@ -53,4 +53,4 @@ $(pwd)/blobs/w541/me.bin:
 		$(pwd)/blobs/w541/download-clean-me $(pwd)/blobs/w541
 
 # Generate split 4MB top / 8MB bottom ROMs
-BOARD_TARGETS := split_8mb4mb
+BOARD_TARGETS += split_8mb4mb
diff --git a/boards/x220-hotp-maximized/x220-hotp-maximized.config b/boards/x220-hotp-maximized/x220-hotp-maximized.config
@@ -67,15 +67,5 @@ export CONFIG_BOOT_DEV="/dev/sda1"
 export CONFIG_BOARD_NAME="ThinkPad X220-hotp-maximized"
 export CONFIG_FLASHROM_OPTIONS="--force --noverify-all -p internal:ich_spi_mode=hwseq"
 
-# xx20 boards require of you initially call one of the following to habe gbe.bin ifd.bin and me.bin
-#  - blobs/xx20/download_parse_me.sh
-#     To download Lenovo update ME binary, neuter+deactivate ME, produce reduced IFD ME region and expended BIOS IFD region.
-
-# Make the Coreboot build depend on the following 3rd party blobs:
-$(build)/coreboot-$(CONFIG_COREBOOT_VERSION)/$(BOARD)/.build: \
-    $(pwd)/blobs/xx20/me.bin
-
-
-$(pwd)/blobs/xx20/me.bin:
-	COREBOOT_DIR="$(build)/$(coreboot_base_dir)" \
-		$(pwd)/blobs/xx20/download_parse_me.sh
+#Include bits related to sandybridge ME blob download/neutering down to BUP
+BOARD_TARGETS := xx20_me_blobs
diff --git a/boards/x220-maximized/x220-maximized.config b/boards/x220-maximized/x220-maximized.config
diff --git a/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config b/boards/x230-hotp-maximized-fhd_edp/x230-hotp-maximized-fhd_edp.config
diff --git a/boards/x230-hotp-maximized/x230-hotp-maximized.config b/boards/x230-hotp-maximized/x230-hotp-maximized.config
diff --git a/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config b/boards/x230-hotp-maximized_usb-kb/x230-hotp-maximized_usb-kb.config
diff --git a/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config b/boards/x230-maximized-fhd_edp/x230-maximized-fhd_edp.config
diff --git a/boards/x230-maximized/x230-maximized.config b/boards/x230-maximized/x230-maximized.config
diff --git a/targets/xx20_me_blobs.mk b/targets/xx20_me_blobs.mk
diff --git a/targets/xx30_me_blobs.mk b/targets/xx30_me_blobs.mk
