diff options
| author | Bernard Xiong <[email protected]> | 2022-04-08 20:03:43 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2022-04-08 20:03:43 +0800 |
| commit | 1aab3607af39578fb2d79e0dd50d5e6810bae4c7 (patch) | |
| tree | 4b83e2ca9477d008994c9861ae9ad06067a2df26 /tools | |
| parent | e1ef28a79b313af05ab7466c802af1d53cf5a98c (diff) | |
Revert "[dfs][romfs]支持相对地址模式 (#5768)" (#5786)
This reverts commit e68f934ff8c83d36f162b80e240e633b58949036.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/mkromfs.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/mkromfs.py b/tools/mkromfs.py index c6d6c3237a..9f4f24d0d6 100644 --- a/tools/mkromfs.py +++ b/tools/mkromfs.py @@ -191,7 +191,7 @@ class Folder(object): else: assert False, 'Unkown instance:%s' % str(c) - name = bytes(c.bin_name.encode('utf-8')) + name = bytes(c.bin_name) name_addr = v_len v_len += len(name) @@ -200,7 +200,7 @@ class Folder(object): # pad the data to 4 bytes boundary pad_len = 4 if len(data) % pad_len != 0: - data += ('\0' * (pad_len - len(data) % pad_len)).encode('utf-8') + data += '\0' * (pad_len - len(data) % pad_len) v_len += len(data) d_li.append(self.bin_fmt.pack(*self.bin_item( @@ -232,7 +232,7 @@ const struct romfs_dirent {name} = {{ def get_bin_data(tree, base_addr): v_len = base_addr + Folder.bin_fmt.size - name = bytes('/\0\0\0'.encode("utf-8")) + name = bytes('/\0\0\0') name_addr = v_len v_len += len(name) data_addr = v_len |
