Both archs now have the cmdline offset at 0x1000, we can now consolidate them and move them over to ARMCommon.
Signed-off-by: Ralf Ramsauer <[email protected]> --- tools/jailhouse-cell-linux | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/tools/jailhouse-cell-linux b/tools/jailhouse-cell-linux index df9b9212..dbf1010c 100755 --- a/tools/jailhouse-cell-linux +++ b/tools/jailhouse-cell-linux @@ -387,6 +387,9 @@ class ARMCommon: self.dtb.set_prop('/chosen', 'linux,initrd-end', struct.pack(addr_format, end_addr)) + def params_address(self): + return self._cpu_reset_address + 0x1000 + def write_params(self, args, config): args.write_params.write(self.dtb.get()) args.write_params.close() @@ -429,9 +432,6 @@ jailhouse cell load %s linux-loader.bin -a 0x%x -s "%s" -a 0x%x %s -a 0x%x ' % class ARM(ARMCommon): name = 'arm' - def params_address(self): - return self._cpu_reset_address + 0x100 - @staticmethod def get_uncompressed_kernel(kernel): return (kernel.read(), False) @@ -452,9 +452,6 @@ class ARM(ARMCommon): class ARM64(ARMCommon): name = 'arm64' - def params_address(self): - return self._cpu_reset_address + 0x1000 - @staticmethod def get_uncompressed_kernel(kernel): try: -- 2.17.0 -- You received this message because you are subscribed to the Google Groups "Jailhouse" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. For more options, visit https://groups.google.com/d/optout.
