• Simon Glass's avatar
    binman: Use standard filenames for SPL/TPL devicetree · 0b1cdd42
    Simon Glass authored
    At present, before any entry expansion is done (such as a 'files' entry
    expanding out to individual entries for each file it contains), we check
    the binman definition (i.e. '/binman' node) to find out what devicetree
    files are used in the images.
    This is a pain, since the definition may change during expansion. For
    example if there is no u-boot-spl-dtb entry in the definition at the start,
    we assume that the SPL devicetree is not used. But if an entry later
    expands to include this, then we don't notice.
    In fact the flexibility provided by the current approach of checking the
    definition is not really useful. We know that we can have SPL and TPL
    devicetrees. We know the pathname to each, so we can simply check if the
    files are present. If they are present, we can prepare them and update
    them regardless of whether they are actually used. If they are not present,
    we cannot prepare/update them anyway, i.e. an error will be generated.
    Simplify state.Prepare() so it uses a hard-coded list of devicetree files.
    Note that state.PrepareFromLoadedData() is left untouched, since in that
    case we have a complete definition from the loaded file, but cannot of
    course rely on the devicetree files that created it still being present.
    So in that case we still check the image defitions.
    Signed-off-by: Simon Glass's avatarSimon Glass <sjg@chromium.org>