ich9m mainboards: use pre-assembled ifd/gbe files

This cuts down on build time, and it will allow libreboot
to remove large chunks of code.

these ifd/gbe configs are just binary-encoded config files,
in a format well-understood. they can easily be opened up
and displayed, using ich9show or ifdtool, and manipulated
by these tools; bincfg can generate them from scratch, and
nvmutil can change mac addresses, for example.

so, do this and remove from lbmk the following:

* ich9utils (which contains ich9gen) - not needed anymore
* code in lbmk for handling ich9gen and insertions; the
  coreboot build system is now used, for this same purpose,
  so remove such code from lbmk

this results in a massive code size reduction (thousands of
lines) in lbmk; smaller when only looking at the build
system, but much larger when you consider that ich9utils
is also removed (about 3k sloc)

Signed-off-by: Leah Rowe <leah@libreboot.org>

1 files changed, 0 insertions, 203 deletions

diff --git a/util/ich9utils/src/ich9gen.c b/util/ich9utils/src/ich9gen.c
deleted file mode 100644
index 80546757..00000000
--- a/util/ich9utils/src/ich9gen.c
+++ /dev/null
@@ -1,203 +0,0 @@
-/*
- *  Copyright (C) 2014, 2015, 2019 Leah Rowe <info@minifree.org>
- *  Copyright (C) 2016 Swift Geek <swiftgeek@gmail.com>
- *
- *  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, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  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, see <http://www.gnu.org/licenses/>.
- */
-
-/* Generate deblobbed descriptor and gbe 12KiB file from scratch
- * without relying on a factory.rom dump */
-
-#include "ich9gen.h"
-
-int main(int argc, char *argv[])
-{
-	int i, j;
-
-	struct GBEREGIONRECORD_8K gbeStruct8k = generatedGbeStruct8k();
-	struct DESCRIPTORREGIONRECORD descriptorStruct4M = generatedDescriptorStruct(ROMSIZE_4MB, WITHGBE);
-	struct DESCRIPTORREGIONRECORD descriptorStruct8M = generatedDescriptorStruct(ROMSIZE_8MB, WITHGBE);
-	struct DESCRIPTORREGIONRECORD descriptorStruct16M = generatedDescriptorStruct(ROMSIZE_16MB, WITHGBE);
-	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe4M = generatedDescriptorStruct(ROMSIZE_4MB, WITHOUTGBE);
-	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe8M = generatedDescriptorStruct(ROMSIZE_8MB, WITHOUTGBE);
-	struct DESCRIPTORREGIONRECORD descriptorStructNoGbe16M = generatedDescriptorStruct(ROMSIZE_16MB, WITHOUTGBE);
-
-	/* Only for the compatibility checks */
-	struct DESCRIPTORREGIONRECORD dummyDescriptorStruct;
-	struct GBEREGIONRECORD_8K dummyGbeStruct8k;
-
-	/*
-	 * ------------------------------------------------------------------
-	 * Compatibility checks. This version of ich9deblob is not yet portable.
-	 * ------------------------------------------------------------------
-	 */
-
-	if (systemOrCompilerIncompatible(dummyDescriptorStruct, dummyGbeStruct8k)) return 1;
-	/* If true, fail with error message */
-
-	/*
-	 * ------------------------------------------------------------------
-	 * Arguments given on the terminal
-	 * ------------------------------------------------------------------
-	 */
-
-
-	if(argc==3) {
-
-		/* If user provides their own MAC address, it will be used.
-		 * Otherwise, ich9gen will simply use the default one.
-		 *
-		 * However, if the user provides an invalid MAC address, then ich9gen
-		 * will exit. */
-		if(0==strcmp(argv[1],"--macaddress")) {
-			/* 6 hex chars format (example): AA:BB:CC:DD:EE:FF */
-			if (strlen(argv[2]) != 17) {
-				printf("ich9gen: invalid mac address format (wrong length)\n");
-				return 1;
-			}
-			for(i=2; i<14; i+=3) {
-				if(argv[2][i]!=':') {
-					printf("ich9gen: invalid mac address format (non-colon characters used as spacing)\n");
-					return 1;
-				}
-			}
-			for(i=0; i<6; i++) {
-				gbeStruct8k.main.macAddress[i] = 0;
-
-				/* Go through each nibble of the byte */
-				for(j=0; j<2; j++) {
-					if(argv[2][(i*3)+j]>='a' && argv[2][(i*3)+j]<='f')
-						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 87) << ((j^1) << 2));
-					else if(argv[2][(i*3)+j]>='A' && argv[2][(i*3)+j]<='F')
-						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 55) << ((j^1) << 2));
-					else if(argv[2][(i*3)+j]>='0' && argv[2][(i*3)+j]<='9')
-						gbeStruct8k.main.macAddress[i] |= (uint8_t)((argv[2][(i*3)+j] - 48) << ((j^1) << 2));
-					else {
-						printf("ich9gen: invalid mac address format (non-hex characters)\n");
-						return 1;
-					}
-				}
-			}
-
-			gbeStruct8k.main.checkSum = gbeGetChecksumFrom4kStruct(gbeStruct8k.main, GBECHECKSUMTOTAL); /* Fix the checksum */
-			memcpy(&gbeStruct8k.backup, &gbeStruct8k.main, GBEREGIONSIZE_4K); /* Copy to the backup */
-
-			/* Generate ich9gen data (C code for Gbe region): */
-
-			/* mkgbe.h */
-			if (notCreatedHFileForGbeCFile("mkgbe.h", "mkgbe.c")) {
-				return 1;
-			} /* and now mkgbe.c */
-			if (notCreatedCFileFromGbeStruct4k(gbeStruct8k.backup, "mkgbe.c", "mkgbe.h")) {
-				return 1;
-			}
-
-			printf("You selected to change the MAC address in the Gbe section. This has been done.\n\n");
-
-			printf("The modified gbe region has also been dumped as src files: mkgbe.c, mkgbe.h\n");
-			printf("To use these in ich9gen, place them in src/ich9gen/ and re-build ich9gen.\n\n");
-		}
-
-	}
-
-	/*
-	 * ------------------------------------------------------------------
-	 * Generate the 12KiB files, ready to be used in a libreboot image
-	 * ------------------------------------------------------------------
-	 */
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct4M, gbeStruct8k, "ich9fdgbe_4m.bin")) {
-		return 1;
-	}
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct8M, gbeStruct8k, "ich9fdgbe_8m.bin")) {
-		return 1;
-	}
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct16M, gbeStruct8k, "ich9fdgbe_16m.bin")) {
-		return 1;
-	}
-
-	/*
-	 * ------------------------------------------------------------------
-	 * Generate the 12KiB files, ready to be used in a libreboot image
-     * These are special descriptor files where the flash chip is set to read-only
-     * in FLMSTR1
-	 * ------------------------------------------------------------------
-	 */
-
-    descriptorStruct4M = descriptorHostRegionsReadOnly(descriptorStruct4M);
-    descriptorStruct8M = descriptorHostRegionsReadOnly(descriptorStruct8M);
-    descriptorStruct16M = descriptorHostRegionsReadOnly(descriptorStruct16M);
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct4M, gbeStruct8k, "ich9fdgbe_4m_ro.bin")) {
-		return 1;
-	}
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct8M, gbeStruct8k, "ich9fdgbe_8m_ro.bin")) {
-		return 1;
-	}
-
-	if (notCreatedDescriptorGbeFile(descriptorStruct16M, gbeStruct8k, "ich9fdgbe_16m_ro.bin")) {
-		return 1;
-	}
-
-	/*
-	 * ------------------------------------------------------------------
-	 * Generate the 4KiB files (descriptors without GbE), ready to be used in a libreboot image
-	 * In these descriptors, the onboard Intel GbE NIC is disabled; a discrete one is used instead
-	 * ------------------------------------------------------------------
-	 */
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe4M, "ich9fdnogbe_4m.bin")) {
-		return 1;
-	}
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe8M, "ich9fdnogbe_8m.bin")) {
-		return 1;
-	}
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe16M, "ich9fdnogbe_16m.bin")) {
-		return 1;
-	}
-
-    /*
-	 * ------------------------------------------------------------------
-	 * Generate the 4KiB files (descriptors without GbE), ready to be used in a libreboot image
-	 * In these descriptors, the onboard Intel GbE NIC is disabled; a discrete one is used instead
-     *
-     * This is a special version where the flash chip is read-only as specified
-     * in flmstr1
-     *
-	 * ------------------------------------------------------------------
-	 */
-
-    descriptorStructNoGbe4M = descriptorHostRegionsReadOnly(descriptorStructNoGbe4M);
-    descriptorStructNoGbe8M = descriptorHostRegionsReadOnly(descriptorStructNoGbe8M);
-    descriptorStructNoGbe16M = descriptorHostRegionsReadOnly(descriptorStructNoGbe16M);
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe4M, "ich9fdnogbe_4m_ro.bin")) {
-		return 1;
-	}
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe8M, "ich9fdnogbe_8m_ro.bin")) {
-		return 1;
-	}
-
-	if (notCreated4kDescriptorFile(descriptorStructNoGbe16M, "ich9fdnogbe_16m_ro.bin")) {
-		return 1;
-	}
-
-	return 0;
-}