Commit 7448e8e5 authored by Ard Biesheuvel's avatar Ard Biesheuvel Committed by Ingo Molnar

x86/boot: Drop redundant code setting the root device

The root device defaults to 0,0 and is no longer configurable at build
time [0], so there is no need for the build tool to ever write to this
field.

[0] 079f85e6 ("x86, build: Do not set the root_dev field in bzImage")

This change has no impact on the resulting bzImage binary.
Signed-off-by: default avatarArd Biesheuvel <ardb@kernel.org>
Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
Link: https://lore.kernel.org/r/20230912090051.4014114-23-ardb@google.com
parent 8eace5b3
...@@ -236,7 +236,7 @@ root_flags: .word ROOT_RDONLY ...@@ -236,7 +236,7 @@ root_flags: .word ROOT_RDONLY
syssize: .long 0 /* Filled in by build.c */ syssize: .long 0 /* Filled in by build.c */
ram_size: .word 0 /* Obsolete */ ram_size: .word 0 /* Obsolete */
vid_mode: .word SVGA_MODE vid_mode: .word SVGA_MODE
root_dev: .word 0 /* Filled in by build.c */ root_dev: .word 0 /* Default to major/minor 0/0 */
boot_flag: .word 0xAA55 boot_flag: .word 0xAA55
# offset 512, entry point # offset 512, entry point
......
...@@ -40,10 +40,6 @@ typedef unsigned char u8; ...@@ -40,10 +40,6 @@ typedef unsigned char u8;
typedef unsigned short u16; typedef unsigned short u16;
typedef unsigned int u32; typedef unsigned int u32;
#define DEFAULT_MAJOR_ROOT 0
#define DEFAULT_MINOR_ROOT 0
#define DEFAULT_ROOT_DEV (DEFAULT_MAJOR_ROOT << 8 | DEFAULT_MINOR_ROOT)
/* Minimal number of setup sectors */ /* Minimal number of setup sectors */
#define SETUP_SECT_MIN 5 #define SETUP_SECT_MIN 5
#define SETUP_SECT_MAX 64 #define SETUP_SECT_MAX 64
...@@ -399,9 +395,6 @@ int main(int argc, char ** argv) ...@@ -399,9 +395,6 @@ int main(int argc, char ** argv)
update_pecoff_setup_and_reloc(i); update_pecoff_setup_and_reloc(i);
/* Set the default root device */
put_unaligned_le16(DEFAULT_ROOT_DEV, &buf[508]);
/* Open and stat the kernel file */ /* Open and stat the kernel file */
fd = open(argv[2], O_RDONLY); fd = open(argv[2], O_RDONLY);
if (fd < 0) if (fd < 0)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment