hrev54079 adds 1 changeset to branch 'master'
old head: 5d573f83751753fe35f9630cb00b1d934bb7266c
new head: ddcb56f2acf15b21a82d865b08b9fe18dc554c61
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=ddcb56f2acf1+%5E5d573f837517
----------------------------------------------------------------------------
ddcb56f2acf1: bootloader: support older kernels.
if no microcode is found, we can also omit the optional fields.
should help with #15891
Change-Id: I2fcb63ccb0cdf77caf7d5e1770c254561b231a18
Reviewed-on: https://review.haiku-os.org/c/haiku/+/2506
Reviewed-by: waddlesplash <waddlesplash@xxxxxxxxx>
[ Jérôme Duval <jerome.duval@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev54079
Commit: ddcb56f2acf15b21a82d865b08b9fe18dc554c61
URL: https://git.haiku-os.org/haiku/commit/?id=ddcb56f2acf1
Author: Jérôme Duval <jerome.duval@xxxxxxxxx>
Date: Tue Apr 21 08:26:47 2020 UTC
Committer: waddlesplash <waddlesplash@xxxxxxxxx>
Commit-Date: Tue Apr 21 16:46:10 2020 UTC
Ticket: https://dev.haiku-os.org/ticket/15891
----------------------------------------------------------------------------
1 file changed, 2 insertions(+)
src/system/boot/loader/main.cpp | 2 ++
----------------------------------------------------------------------------
diff --git a/src/system/boot/loader/main.cpp b/src/system/boot/loader/main.cpp
index d4a41c54e3..cf470e8f0c 100644
--- a/src/system/boot/loader/main.cpp
+++ b/src/system/boot/loader/main.cpp
@@ -136,6 +136,8 @@ main(stage2_args *args)
// set up kernel args version info
gKernelArgs.kernel_args_size = sizeof(kernel_args);
gKernelArgs.version = CURRENT_KERNEL_ARGS_VERSION;
+ if (gKernelArgs.ucode_data == NULL)
+ gKernelArgs.kernel_args_size =
kernel_args_size_v1;
// clone the boot_volume KMessage into kernel
accessible memory
// note, that we need to 8-byte align the buffer and
thus allocate
