Skip to content

Commit 4ab1870

Browse files
committed
xtensa: move parse_tag_fdt out of #ifdef CONFIG_BLK_DEV_INITRD
FDT tag parsing is not related to whether BLK_DEV_INITRD is configured or not, move it out of the corresponding #ifdef/#endif block. This fixes passing external FDT to the kernel configured w/o BLK_DEV_INITRD support. Cc: [email protected] Signed-off-by: Max Filippov <[email protected]>
1 parent 69973b8 commit 4ab1870

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

arch/xtensa/kernel/setup.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ static int __init parse_tag_initrd(const bp_tag_t* tag)
133133

134134
__tagtable(BP_TAG_INITRD, parse_tag_initrd);
135135

136+
#endif /* CONFIG_BLK_DEV_INITRD */
137+
136138
#ifdef CONFIG_OF
137139

138140
static int __init parse_tag_fdt(const bp_tag_t *tag)
@@ -145,8 +147,6 @@ __tagtable(BP_TAG_FDT, parse_tag_fdt);
145147

146148
#endif /* CONFIG_OF */
147149

148-
#endif /* CONFIG_BLK_DEV_INITRD */
149-
150150
static int __init parse_tag_cmdline(const bp_tag_t* tag)
151151
{
152152
strlcpy(command_line, (char *)(tag->data), COMMAND_LINE_SIZE);

0 commit comments

Comments
 (0)