|
@@ -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)
|
|
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)
|
|
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
|
|
|
|
|