Commit baac1d36 authored by Max Filippov's avatar Max Filippov

xtensa: make bootparam parsing optional

A kernel may not need any boot parameters from the bootloader, allow
disabling bootparam parsing in that case.
Signed-off-by: default avatarMax Filippov <jcmvbkbc@gmail.com>
parent 8b5163eb
...@@ -473,6 +473,15 @@ config BUILTIN_DTB ...@@ -473,6 +473,15 @@ config BUILTIN_DTB
string "DTB to build into the kernel image" string "DTB to build into the kernel image"
depends on OF depends on OF
config PARSE_BOOTPARAM
bool "Parse bootparam block"
default y
help
Parse parameters passed to the kernel from the bootloader. It may
be disabled if the kernel is known to run without the bootloader.
If unsure, say Y.
config BLK_DEV_SIMDISK config BLK_DEV_SIMDISK
tristate "Host file-based simulated block device support" tristate "Host file-based simulated block device support"
default n default n
......
...@@ -42,7 +42,10 @@ RomInitAddr: ...@@ -42,7 +42,10 @@ RomInitAddr:
.word KERNELOFFSET .word KERNELOFFSET
#endif #endif
RomBootParam: RomBootParam:
.word _bootparam #ifndef CONFIG_PARSE_BOOTPARAM
.word 0
#else
.word _bootparam
_bootparam: _bootparam:
.short BP_TAG_FIRST .short BP_TAG_FIRST
.short 4 .short 4
...@@ -50,6 +53,7 @@ _bootparam: ...@@ -50,6 +53,7 @@ _bootparam:
.short BP_TAG_LAST .short BP_TAG_LAST
.short 0 .short 0
.long 0 .long 0
#endif
.align 4 .align 4
_SetupMMU: _SetupMMU:
......
...@@ -79,6 +79,7 @@ static char __initdata command_line[COMMAND_LINE_SIZE]; ...@@ -79,6 +79,7 @@ static char __initdata command_line[COMMAND_LINE_SIZE];
static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE; static char default_command_line[COMMAND_LINE_SIZE] __initdata = CONFIG_CMDLINE;
#endif #endif
#ifdef CONFIG_PARSE_BOOTPARAM
/* /*
* Boot parameter parsing. * Boot parameter parsing.
* *
...@@ -176,6 +177,13 @@ static int __init parse_bootparam(const bp_tag_t* tag) ...@@ -176,6 +177,13 @@ static int __init parse_bootparam(const bp_tag_t* tag)
return 0; return 0;
} }
#else
static int __init parse_bootparam(const bp_tag_t *tag)
{
pr_info("Ignoring boot parameters at %p\n", tag);
return 0;
}
#endif
#ifdef CONFIG_OF #ifdef CONFIG_OF
......
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