diff options
author | Simon Glass <sjg@chromium.org> | 2016-09-25 15:52:19 -0600 |
---|---|---|
committer | sjg <sjg@chromium.org> | 2016-10-09 09:30:32 -0600 |
commit | 3cb44ba80c0379eb7d0eadd1b9b58e66fe2da03e (patch) | |
tree | 3f42b5b8d876cb1ae3eeb918887203fdb2a2914f | |
parent | 8828254cae24abfc5de9f84d79c570fb8edde354 (diff) | |
download | u-boot-3cb44ba80c0379eb7d0eadd1b9b58e66fe2da03e.zip u-boot-3cb44ba80c0379eb7d0eadd1b9b58e66fe2da03e.tar.gz u-boot-3cb44ba80c0379eb7d0eadd1b9b58e66fe2da03e.tar.bz2 |
dtoc: Add a way for tests to request the fallback library
We need to test both the normal (Python libfdt module) and fallback (fdtget)
implementations of the Fdt class. Add a way to select which implementation
to use.
Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r-- | tools/dtoc/fdt_select.py | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/tools/dtoc/fdt_select.py b/tools/dtoc/fdt_select.py index 18a36d8..ea78c52 100644 --- a/tools/dtoc/fdt_select.py +++ b/tools/dtoc/fdt_select.py @@ -6,6 +6,8 @@ # SPDX-License-Identifier: GPL-2.0+ # +import fdt_fallback + # Bring in either the normal fdt library (which relies on libfdt) or the # fallback one (which uses fdtget and is slower). Both provide the same # interface for this file to use. @@ -14,13 +16,21 @@ try: have_libfdt = True except ImportError: have_libfdt = False - import fdt_fallback -def FdtScan(fname): +force_fallback = False + +def FdtScan(fname, _force_fallback=False): """Returns a new Fdt object from the implementation we are using""" - if have_libfdt: + if have_libfdt and not force_fallback and not _force_fallback: dtb = fdt_normal.FdtNormal(fname) else: dtb = fdt_fallback.FdtFallback(fname) dtb.Scan() return dtb + +def UseFallback(fallback): + global force_fallback + + old_val = force_fallback + force_fallback = fallback + return old_val |