mirror of https://github.com/OpenIPC/firmware.git
74 lines
2.2 KiB
Diff
74 lines
2.2 KiB
Diff
--- a/scripts/ms_bin_option_get_int.py 2021-05-17 00:51:18.868114209 +0300
|
|
+++ b/scripts/ms_bin_option_get_int.py 2021-05-17 00:05:08.807550092 +0300
|
|
@@ -5,10 +5,16 @@
|
|
if __name__ == '__main__':
|
|
|
|
name=sys.argv[2]
|
|
-# if sys.argv[3].upper().startswith( '0X' ):
|
|
-# value=long(sys.argv[3],16)
|
|
-# else:
|
|
-# value=long(sys.argv[3])
|
|
+ if sys.version_info.major == 2:
|
|
+ if sys.argv[3].upper().startswith( '0X' ):
|
|
+ value=long(sys.argv[3],16)
|
|
+ else:
|
|
+ value=long(sys.argv[3])
|
|
+ else:
|
|
+ if sys.argv[3].upper().startswith( '0X' ):
|
|
+ value=int(sys.argv[3],16)
|
|
+ else:
|
|
+ value=int(sys.argv[3])
|
|
|
|
fmap=mmap.mmap(os.open(sys.argv[1],os.O_RDWR),0)
|
|
|
|
--- a/scripts/ms_bin_option_update_int.py 2021-05-17 00:51:18.868114209 +0300
|
|
+++ b/scripts/ms_bin_option_update_int.py 2021-05-17 01:02:24.277864288 +0300
|
|
@@ -3,12 +3,19 @@
|
|
import re, fnmatch, os, sys, mmap, struct
|
|
|
|
if __name__ == '__main__':
|
|
-
|
|
- name=sys.argv[2]
|
|
- if sys.argv[3].upper().startswith( '0X' ):
|
|
- value=long(sys.argv[3],16)
|
|
+ print(sys.argv)
|
|
+ if sys.version_info.major == 2:
|
|
+ name=sys.argv[2]
|
|
+ if sys.argv[3].upper().startswith( '0X' ):
|
|
+ value=long(sys.argv[3],16)
|
|
+ else:
|
|
+ value=long(sys.argv[3])
|
|
else:
|
|
- value=long(sys.argv[3])
|
|
+ name=sys.argv[2].encode()
|
|
+ if sys.argv[3].upper().startswith( '0X' ):
|
|
+ value=int(sys.argv[3],16)
|
|
+ else:
|
|
+ value=int(sys.argv[3])
|
|
|
|
fmap=mmap.mmap(os.open(sys.argv[1],os.O_RDWR),0)
|
|
|
|
--- a/scripts/ms_builtin_dtb_update.py
|
|
+++ b/scripts/ms_builtin_dtb_update.py
|
|
@@ -6,7 +6,7 @@
|
|
|
|
name='#MS_DTB#'
|
|
|
|
- dtb_file=open(sys.argv[2])
|
|
+ dtb_file=open(sys.argv[2], "rb+")
|
|
dtb_file.seek(0,os.SEEK_END)
|
|
size=dtb_file.tell()
|
|
dtb_file.seek(0,os.SEEK_SET)
|
|
@@ -19,7 +19,10 @@
|
|
|
|
fmap=mmap.mmap(os.open(sys.argv[1],os.O_RDWR),0)
|
|
|
|
- offset=fmap.find(name)
|
|
+ if sys.version_info.major == 2:
|
|
+ offset=fmap.find(name)
|
|
+ else:
|
|
+ offset=fmap.find(name.encode())
|
|
if offset >=0:
|
|
print ('offset:0x%08X' % offset)
|
|
print (' size:0x%08X' % size )
|