diff options
| author | Tom Rini <trini@konsulko.com> | 2023-11-02 20:22:39 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-11-02 22:38:01 -0400 |
| commit | 1e044a9bd68220af562cc2d895936ec7cc3e3d6d (patch) | |
| tree | 946aa5cf48d00e014980e0f0c035ba1b417cc0bf /tools/binman/ftest.py | |
| parent | 97962260cb93e74e3a8cbbb62e7581830503810a (diff) | |
| parent | ae94c3d4ee21ba4dd628d2f463fb3992233963ef (diff) | |
Merge tag 'dm-pull-2nov23' of https://source.denx.de/u-boot/custodians/u-boot-dm
Just various bugfixes, apart from the TI one
Diffstat (limited to 'tools/binman/ftest.py')
| -rw-r--r-- | tools/binman/ftest.py | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/binman/ftest.py b/tools/binman/ftest.py index 16156b74105..5ace2a825dc 100644 --- a/tools/binman/ftest.py +++ b/tools/binman/ftest.py @@ -2667,12 +2667,12 @@ class TestFunctional(unittest.TestCase): 'cbfs:offset': 0, 'cbfs:size': len(data), 'cbfs:image-pos': 0, - 'cbfs/u-boot:offset': 0x38, + 'cbfs/u-boot:offset': 0x30, 'cbfs/u-boot:uncomp-size': len(U_BOOT_DATA), - 'cbfs/u-boot:image-pos': 0x38, - 'cbfs/u-boot-dtb:offset': 0xb8, + 'cbfs/u-boot:image-pos': 0x30, + 'cbfs/u-boot-dtb:offset': 0xa4, 'cbfs/u-boot-dtb:size': len(U_BOOT_DATA), - 'cbfs/u-boot-dtb:image-pos': 0xb8, + 'cbfs/u-boot-dtb:image-pos': 0xa4, }, props) def testCbfsBadType(self): @@ -2854,7 +2854,7 @@ class TestFunctional(unittest.TestCase): ' u-boot 0 4 u-boot 0', ' section 100 %x section 100' % section_size, ' cbfs 100 400 cbfs 0', -' u-boot 138 4 u-boot 38', +' u-boot 120 4 u-boot 20', ' u-boot-dtb 180 105 u-boot-dtb 80 3c9', ' u-boot-dtb 500 %x u-boot-dtb 400 3c9' % fdt_size, ' fdtmap %x 3bd fdtmap %x' % |