raspberrypi/rpi-eeprom
1
0
Fork 0
mirror of https://github.com/raspberrypi/rpi-eeprom.git synced 2026-01-21 06:13:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #288 from vianpl/blconfig-fixes

Browse Source 
rpi-eeprom-config: Properly decode sysfs binary files
This commit is contained in:
timg236
2021-01-26 12:26:29 +00:00
committed by GitHub
parent 3ae6694fbb eeb4a19c7f
commit b9c255df58
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rpi-eeprom-config
View File

@@ -163,11 +163,11 @@ def read_current_config():
nvmem_base = "/sys/bus/nvmem/devices/" nvmem_base = "/sys/bus/nvmem/devices/"
if os.path.exists(fw_base + "/aliases/blconfig"): if os.path.exists(fw_base + "/aliases/blconfig"):
with open(fw_base + "/aliases/blconfig") as f: with open(fw_base + "/aliases/blconfig", "rb") as f:
nvmem_ofnode_path = fw_base + f.read().encode('ascii') nvmem_ofnode_path = fw_base + f.read().decode('utf-8')
for d in os.listdir(nvmem_base): for d in os.listdir(nvmem_base):
if os.path.realpath(nvmem_base + d + "/of_node") in os.path.normpath(nvmem_ofnode_path): if os.path.realpath(nvmem_base + d + "/of_node") in os.path.normpath(nvmem_ofnode_path):
return (open(nvmem_base + d + "/nvmem").read(), "blconfig device") return (open(nvmem_base + d + "/nvmem", "rb").read().decode('utf-8'), "blconfig device")
return (shell_cmd(['vcgencmd', 'bootloader_config']), "vcgencmd bootloader_config") return (shell_cmd(['vcgencmd', 'bootloader_config']), "vcgencmd bootloader_config")