diff options
| author | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-06-20 14:40:59 -0400 |
| commit | 52af0101be55da74a32e9b169864508101f886fe (patch) | |
| tree | 0027962a3a4e43a1e29fa7411934501b75fe811b /tools | |
| parent | 78533a1ce87786d2ba9be70e657b09cded1267e1 (diff) | |
| parent | 568a226f87655fd5339514f66413c2ad72f65d6f (diff) | |
| download | u-boot-52af0101be55da74a32e9b169864508101f886fe.tar.gz u-boot-52af0101be55da74a32e9b169864508101f886fe.tar.bz2 u-boot-52af0101be55da74a32e9b169864508101f886fe.zip | |
Merge branch 'master' into next
Merge in v2022.07-rc5.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/binman/setup.py | 2 | ||||
| -rw-r--r-- | tools/dtoc/test_src_scan.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/tools/binman/setup.py b/tools/binman/setup.py index 5ed94abdaf..9a9206eb04 100644 --- a/tools/binman/setup.py +++ b/tools/binman/setup.py @@ -5,7 +5,7 @@ setup(name='binman', version='1.0', license='GPL-2.0+', scripts=['binman'], - packages=['binman', 'binman.etype'], + packages=['binman', 'binman.etype', 'binman.btool'], package_dir={'binman': ''}, package_data={'binman': ['README.rst', 'entries.rst']}, classifiers=['Environment :: Console', diff --git a/tools/dtoc/test_src_scan.py b/tools/dtoc/test_src_scan.py index bdfa669d81..f93cd7f5a3 100644 --- a/tools/dtoc/test_src_scan.py +++ b/tools/dtoc/test_src_scan.py @@ -151,6 +151,7 @@ class TestSrcScan(unittest.TestCase): self.assertEqual('UCLASS_I2C', drv.uclass_id) self.assertEqual( {'nvidia,tegra114-i2c': 'TYPE_114', + 'nvidia,tegra124-i2c': 'TYPE_114', 'nvidia,tegra20-i2c': 'TYPE_STD', 'nvidia,tegra20-i2c-dvc': 'TYPE_DVC'}, drv.compat) self.assertEqual('i2c_bus', drv.priv) |