Commit f347c367 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Rob Herring
Browse files

of/fdt: Fix #ifdef dependency of early flattree declarations 



If OF_FLATTREE=y, but OF_EARLY_FLATTREE=n:

    drivers/tty/serial/earlycon.o: In function `param_setup_earlycon':
    earlycon.c:(.init.text+0x3a4): undefined reference to `early_init_dt_scan_chosen_stdout'

Fix this by moving the early flattree forward declarations and dummy
implementations inside an #ifdef CONFIG_OF_EARLY_FLATTREE block.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 33314a13

include/linux/of_fdt.h

+8 −4
Original line number Diff line number Diff line
@@ -47,6 +47,12 @@ extern void *initial_boot_params; 
extern char __dtb_start[];

extern char __dtb_end[];



/* Other Prototypes */

extern u64 of_flat_dt_translate_address(unsigned long node);

extern void of_fdt_limit_memory(int limit);

#endif /* CONFIG_OF_FLATTREE */



#ifdef CONFIG_OF_EARLY_FLATTREE

/* For scanning the flat device-tree at boot time */

extern int of_scan_flat_dt(int (*it)(unsigned long node, const char *uname,

				     int depth, void *data),
@@ -97,16 +103,14 @@ extern void unflatten_device_tree(void); 
extern void unflatten_and_copy_device_tree(void);

extern void early_init_devtree(void *);

extern void early_get_first_memblock_info(void *, phys_addr_t *);

extern u64 of_flat_dt_translate_address(unsigned long node);

extern void of_fdt_limit_memory(int limit);

#else /* CONFIG_OF_FLATTREE */

#else /* CONFIG_OF_EARLY_FLATTREE */

static inline int early_init_dt_scan_chosen_stdout(void) { return -ENODEV; }

static inline void early_init_fdt_scan_reserved_mem(void) {}

static inline void early_init_fdt_reserve_self(void) {}

static inline const char *of_flat_dt_get_machine_name(void) { return NULL; }

static inline void unflatten_device_tree(void) {}

static inline void unflatten_and_copy_device_tree(void) {}

#endif /* CONFIG_OF_FLATTREE */

#endif /* CONFIG_OF_EARLY_FLATTREE */



#endif /* __ASSEMBLY__ */

#endif /* _LINUX_OF_FDT_H */

CRA Git | Maintained and supported by SUSTech CRA and CCSE