Commit 03767daa authored by Rich Felker's avatar Rich Felker

sh: fix build regression with CONFIG_OF && !CONFIG_OF_FLATTREE

Such a configuration could only be selected by manually selecting
CONFIG_OF; SH_DEVICE_TREE selects both. The affected code is using the
flat DTB at boot time and thus rightfully should depend on
OF_FLATTREE, not just OF.
Signed-off-by: default avatarRich Felker <dalias@libc.org>
parent b46ed370
...@@ -67,7 +67,7 @@ ENTRY(_stext) ...@@ -67,7 +67,7 @@ ENTRY(_stext)
ldc r0, r6_bank ldc r0, r6_bank
#endif #endif
#ifdef CONFIG_OF #ifdef CONFIG_OF_FLATTREE
mov r4, r12 ! Store device tree blob pointer in r12 mov r4, r12 ! Store device tree blob pointer in r12
#endif #endif
...@@ -318,7 +318,7 @@ ENTRY(_stext) ...@@ -318,7 +318,7 @@ ENTRY(_stext)
10: 10:
#endif #endif
#ifdef CONFIG_OF #ifdef CONFIG_OF_FLATTREE
mov.l 8f, r0 ! Make flat device tree available early. mov.l 8f, r0 ! Make flat device tree available early.
jsr @r0 jsr @r0
mov r12, r4 mov r12, r4
...@@ -349,7 +349,7 @@ ENTRY(stack_start) ...@@ -349,7 +349,7 @@ ENTRY(stack_start)
5: .long start_kernel 5: .long start_kernel
6: .long cpu_init 6: .long cpu_init
7: .long init_thread_union 7: .long init_thread_union
#if defined(CONFIG_OF) #if defined(CONFIG_OF_FLATTREE)
8: .long sh_fdt_init 8: .long sh_fdt_init
#endif #endif
......
...@@ -242,7 +242,7 @@ void __init __weak plat_early_device_setup(void) ...@@ -242,7 +242,7 @@ void __init __weak plat_early_device_setup(void)
{ {
} }
#ifdef CONFIG_OF #ifdef CONFIG_OF_FLATTREE
void __ref sh_fdt_init(phys_addr_t dt_phys) void __ref sh_fdt_init(phys_addr_t dt_phys)
{ {
static int done = 0; static int done = 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