mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
binman: Add support for RISC-V OpenSBI fw_dynamic blob
Add an entry for RISC-V OpenSBI's 'fw_dynamic' firmware payload. Signed-off-by: Bin Meng <bmeng.cn@gmail.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Rick Chen <rick@andestech.com> Reviewed-by: Rick Chen <rick@andestech.com>
This commit is contained in:
parent
aa75ce95ed
commit
4c4d6077d3
|
@ -761,6 +761,19 @@ binman.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Entry: opensbi: RISC-V OpenSBI fw_dynamic blob
|
||||||
|
----------------------------------------------
|
||||||
|
|
||||||
|
Properties / Entry arguments:
|
||||||
|
- opensbi-path: Filename of file to read into entry. This is typically
|
||||||
|
called fw_dynamic.bin
|
||||||
|
|
||||||
|
This entry holds the run-time firmware, typically started by U-Boot SPL.
|
||||||
|
See the U-Boot README for your architecture or board for how to use it. See
|
||||||
|
https://github.com/riscv/opensbi for more information about OpenSBI.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code for U-Boot
|
Entry: powerpc-mpc85xx-bootpg-resetvec: PowerPC mpc85xx bootpg + resetvec code for U-Boot
|
||||||
-----------------------------------------------------------------------------------------
|
-----------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
|
23
tools/binman/etype/opensbi.py
Normal file
23
tools/binman/etype/opensbi.py
Normal file
|
@ -0,0 +1,23 @@
|
||||||
|
# SPDX-License-Identifier: GPL-2.0+
|
||||||
|
#
|
||||||
|
# Copyright (C) 2021, Bin Meng <bmeng.cn@gmail.com>
|
||||||
|
#
|
||||||
|
# Entry-type module for RISC-V OpenSBI binary blob
|
||||||
|
#
|
||||||
|
|
||||||
|
from binman.etype.blob_named_by_arg import Entry_blob_named_by_arg
|
||||||
|
|
||||||
|
class Entry_opensbi(Entry_blob_named_by_arg):
|
||||||
|
"""RISC-V OpenSBI fw_dynamic blob
|
||||||
|
|
||||||
|
Properties / Entry arguments:
|
||||||
|
- opensbi-path: Filename of file to read into entry. This is typically
|
||||||
|
called fw_dynamic.bin
|
||||||
|
|
||||||
|
This entry holds the run-time firmware, typically started by U-Boot SPL.
|
||||||
|
See the U-Boot README for your architecture or board for how to use it. See
|
||||||
|
https://github.com/riscv/opensbi for more information about OpenSBI.
|
||||||
|
"""
|
||||||
|
def __init__(self, section, etype, node):
|
||||||
|
super().__init__(section, etype, node, 'opensbi')
|
||||||
|
self.external = True
|
|
@ -76,6 +76,7 @@ FSP_M_DATA = b'fsp_m'
|
||||||
FSP_S_DATA = b'fsp_s'
|
FSP_S_DATA = b'fsp_s'
|
||||||
FSP_T_DATA = b'fsp_t'
|
FSP_T_DATA = b'fsp_t'
|
||||||
ATF_BL31_DATA = b'bl31'
|
ATF_BL31_DATA = b'bl31'
|
||||||
|
OPENSBI_DATA = b'opensbi'
|
||||||
SCP_DATA = b'scp'
|
SCP_DATA = b'scp'
|
||||||
TEST_FDT1_DATA = b'fdt1'
|
TEST_FDT1_DATA = b'fdt1'
|
||||||
TEST_FDT2_DATA = b'test-fdt2'
|
TEST_FDT2_DATA = b'test-fdt2'
|
||||||
|
@ -178,6 +179,7 @@ class TestFunctional(unittest.TestCase):
|
||||||
TestFunctional._MakeInputFile('compress', COMPRESS_DATA)
|
TestFunctional._MakeInputFile('compress', COMPRESS_DATA)
|
||||||
TestFunctional._MakeInputFile('compress_big', COMPRESS_DATA_BIG)
|
TestFunctional._MakeInputFile('compress_big', COMPRESS_DATA_BIG)
|
||||||
TestFunctional._MakeInputFile('bl31.bin', ATF_BL31_DATA)
|
TestFunctional._MakeInputFile('bl31.bin', ATF_BL31_DATA)
|
||||||
|
TestFunctional._MakeInputFile('fw_dynamic.bin', OPENSBI_DATA)
|
||||||
TestFunctional._MakeInputFile('scp.bin', SCP_DATA)
|
TestFunctional._MakeInputFile('scp.bin', SCP_DATA)
|
||||||
|
|
||||||
# Add a few .dtb files for testing
|
# Add a few .dtb files for testing
|
||||||
|
@ -4535,5 +4537,10 @@ class TestFunctional(unittest.TestCase):
|
||||||
expected += tools.GetBytes(0, 88 - len(expected)) + U_BOOT_NODTB_DATA
|
expected += tools.GetBytes(0, 88 - len(expected)) + U_BOOT_NODTB_DATA
|
||||||
self.assertEqual(expected, data)
|
self.assertEqual(expected, data)
|
||||||
|
|
||||||
|
def testPackOpenSBI(self):
|
||||||
|
"""Test that an image with an OpenSBI binary can be created"""
|
||||||
|
data = self._DoReadFile('201_opensbi.dts')
|
||||||
|
self.assertEqual(OPENSBI_DATA, data[:len(OPENSBI_DATA)])
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
unittest.main()
|
unittest.main()
|
||||||
|
|
14
tools/binman/test/201_opensbi.dts
Normal file
14
tools/binman/test/201_opensbi.dts
Normal file
|
@ -0,0 +1,14 @@
|
||||||
|
// SPDX-License-Identifier: GPL-2.0+
|
||||||
|
|
||||||
|
/dts-v1/;
|
||||||
|
|
||||||
|
/ {
|
||||||
|
#address-cells = <1>;
|
||||||
|
#size-cells = <1>;
|
||||||
|
|
||||||
|
binman {
|
||||||
|
opensbi {
|
||||||
|
filename = "fw_dynamic.bin";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
Loading…
Reference in New Issue
Block a user