Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

arch/sh/kernel/head_32.S

+3 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ ENTRY(_stext) 
	ldc	r0, r6_bank

#endif



#ifdef CONFIG_OF

#ifdef CONFIG_OF_FLATTREE

	mov	r4, r12		! Store device tree blob pointer in r12

#endif
@@ -318,7 +318,7 @@ ENTRY(_stext) 
10:		

#endif



#ifdef CONFIG_OF

#ifdef CONFIG_OF_FLATTREE

	mov.l	8f, r0		! Make flat device tree available early.

	jsr	@r0

	 mov	r12, r4
@@ -349,7 +349,7 @@ ENTRY(stack_start) 
5:	.long	start_kernel

6:	.long	cpu_init

7:	.long	init_thread_union

#if defined(CONFIG_OF)

#if defined(CONFIG_OF_FLATTREE)

8:	.long	sh_fdt_init

#endif

arch/sh/kernel/setup.c

+1 −1
Original line number Diff line number Diff line
@@ -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)

{

	static int done = 0;