This was a work-around and it isn't effective, since bob and kevin are still broken. Drop it.
This reverts commit cafde93ec02d654a092ee5b3fd0ed706347a9744. Signed-off-by: Simon Glass <s...@chromium.org> --- lib/fdtdec.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/lib/fdtdec.c b/lib/fdtdec.c index b0655988029..1842da62f37 100644 --- a/lib/fdtdec.c +++ b/lib/fdtdec.c @@ -1668,16 +1668,8 @@ int fdtdec_setup(void) { int ret = -ENOENT; - /* - * If allowing a bloblist, check that first. There was discussion about - * adding an OF_BLOBLIST Kconfig, but this was rejected. - * - * The necessary test is whether the previous phase passed a bloblist, - * not whether this phase creates one. - */ - if (CONFIG_IS_ENABLED(BLOBLIST) && - (xpl_prev_phase() != PHASE_TPL || - !IS_ENABLED(CONFIG_TPL_BLOBLIST))) { + /* If allowing a bloblist, check that first */ + if (CONFIG_IS_ENABLED(BLOBLIST)) { ret = bloblist_maybe_init(); if (!ret) { gd->fdt_blob = bloblist_find(BLOBLISTT_CONTROL_FDT, 0); -- 2.43.0