Merge pull request #288 from vianpl/blconfig-fixes

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

View File

@@ -163,11 +163,11 @@ def read_current_config():
nvmem_base = "/sys/bus/nvmem/devices/"
if os.path.exists(fw_base + "/aliases/blconfig"):
with open(fw_base + "/aliases/blconfig") as f:
nvmem_ofnode_path = fw_base + f.read().encode('ascii')
with open(fw_base + "/aliases/blconfig", "rb") as f:
nvmem_ofnode_path = fw_base + f.read().decode('utf-8')
for d in os.listdir(nvmem_base):
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")