From 4e6fdbef67e4e73b516c20b073cf160679940b77 Mon Sep 17 00:00:00 2001 From: Simon Glass Date: Mon, 13 Nov 2017 18:54:56 -0700 Subject: [PATCH] binman: Add support for including spl/u-boot-spl-nodtb.bin This file contains SPL image without a device tree. Add support for including this in images. Signed-off-by: Simon Glass --- tools/binman/etype/u_boot_spl_nodtb.py | 17 +++++++++++++++++ tools/binman/ftest.py | 5 +++++ tools/binman/test/52_u_boot_spl_nodtb.dts | 11 +++++++++++ 3 files changed, 33 insertions(+) create mode 100644 tools/binman/etype/u_boot_spl_nodtb.py create mode 100644 tools/binman/test/52_u_boot_spl_nodtb.dts diff --git a/tools/binman/etype/u_boot_spl_nodtb.py b/tools/binman/etype/u_boot_spl_nodtb.py new file mode 100644 index 0000000000..880e0c78fb --- /dev/null +++ b/tools/binman/etype/u_boot_spl_nodtb.py @@ -0,0 +1,17 @@ +# Copyright (c) 2016 Google, Inc +# Written by Simon Glass +# +# SPDX-License-Identifier: GPL-2.0+ +# +# Entry-type module for 'u-boot-nodtb.bin' +# + +from entry import Entry +from blob import Entry_blob + +class Entry_u_boot_spl_nodtb(Entry_blob): + def __init__(self, image, etype, node): + Entry_blob.__init__(self, image, etype, node) + + def GetDefaultFilename(self): + return 'spl/u-boot-spl-nodtb.bin' diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 32bc7950b1..ed0697af00 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -876,6 +876,11 @@ class TestFunctional(unittest.TestCase): data = self._DoReadFile('51_u_boot_spl_dtb.dts') self.assertEqual(U_BOOT_SPL_DTB_DATA, data[:len(U_BOOT_SPL_DTB_DATA)]) + def testSplNoDtb(self): + """Test that an image with spl/u-boot-spl-nodtb.bin can be created""" + data = self._DoReadFile('52_u_boot_spl_nodtb.dts') + self.assertEqual(U_BOOT_SPL_NODTB_DATA, data[:len(U_BOOT_SPL_NODTB_DATA)]) + if __name__ == "__main__": unittest.main() diff --git a/tools/binman/test/52_u_boot_spl_nodtb.dts b/tools/binman/test/52_u_boot_spl_nodtb.dts new file mode 100644 index 0000000000..7f4e27780f --- /dev/null +++ b/tools/binman/test/52_u_boot_spl_nodtb.dts @@ -0,0 +1,11 @@ +/dts-v1/; + +/ { + #address-cells = <1>; + #size-cells = <1>; + + binman { + u-boot-spl-nodtb { + }; + }; +}; -- 2.25.1