[coreboot-gerrit] New patch to review for coreboot: 8868433 cbfstool: Remove arch check for different stages

[Marc Jones (marc.jones@se-eng.com)]

Marc Jones (marc.jones at se-eng.com) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/8179

-gerrit

commit 886843372eb64a40b268b57fefe59cbf1f23cf27
Author: Furquan Shaikh <furquan at google.com>
Date:   Wed Jun 25 17:50:28 2014 -0700

    cbfstool: Remove arch check for different stages
    
    Remove the arch check for each stage as the arch for different stages can be
    different based on the SoC. e.g.: Rush has arm32-based romstage whereas
    arm64-based ramstage
    
    BUG=None
    BRANCH=None
    TEST=Compiles succesfully for nyan, link and rush
    
    Original-Change-Id: I561dab5a5d87c6b93b8d667857d5e181ff72e35d
    Original-Signed-off-by: Furquan Shaikh <furquan at google.com>
    Original-Reviewed-on: https://chromium-review.googlesource.com/205761
    Original-Tested-by: Furquan Shaikh <furquan at chromium.org>
    Original-Reviewed-by: Aaron Durbin <adurbin at chromium.org>
    Original-Commit-Queue: Aaron Durbin <adurbin at chromium.org>
    Original-Reviewed-by: Ronald Minnich <rminnich at chromium.org>
    (cherry picked from commit 6a6a87b65fcab5a7e8163258c7e8d704fa8d97c3)
    Signed-off-by: Marc Jones <marc.jones at se-eng.com>
    
    Change-Id: Ic412d60d8a72dac4f9807cae5d8c89499a157f96
---
 util/cbfstool/elfheaders.c | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/util/cbfstool/elfheaders.c b/util/cbfstool/elfheaders.c
index bee44d8..98a06c5 100644
--- a/util/cbfstool/elfheaders.c
+++ b/util/cbfstool/elfheaders.c
@@ -608,16 +608,6 @@ elf_headers(const struct buffer *pinput,
 	/* Copy out the parsed elf header. */
 	memcpy(ehdr, &pelf.ehdr, sizeof(*ehdr));
 
-	// The tool may work in architecture-independent way.
-	if (arch != CBFS_ARCHITECTURE_UNKNOWN &&
-	    !((ehdr->e_machine == EM_AARCH64) && (arch == CBFS_ARCHITECTURE_AARCH64)) &&
-	    !((ehdr->e_machine == EM_ARM) && (arch == CBFS_ARCHITECTURE_ARM)) &&
-	    !((ehdr->e_machine == EM_RISCV) && (arch == CBFS_ARCHITECTURE_RISCV)) &&
-	    !((ehdr->e_machine == EM_386) && (arch == CBFS_ARCHITECTURE_X86))) {
-		ERROR("The stage file has the wrong architecture\n");
-		return -1;
-	}
-
 	*pphdr = calloc(ehdr->e_phnum, sizeof(Elf64_Phdr));
 	memcpy(*pphdr, pelf.phdr, ehdr->e_phnum * sizeof(Elf64_Phdr));