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

Commit 3cfc535c authored by Andres Salomon's avatar Andres Salomon Committed by Grant Likely
Browse files

of/promtree: make drivers/of/pdt.c no longer sparc-only 



Clean up pdt.c:
 - make build dependent upon config OF_PROMTREE
 - #ifdef out the sparc-specific stuff
 - create pdt-specific header

Signed-off-by: default avatarAndres Salomon <dilinger@queued.net>
Acked-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGrant Likely <grant.likely@secretlab.ca>
parent 9bdf6bab

arch/sparc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ config SPARC 
	bool

	default y

	select OF

	select OF_PROMTREE

	select HAVE_IDE

	select HAVE_OPROFILE

	select HAVE_ARCH_KGDB if !SMP || SPARC64

arch/sparc/include/asm/prom.h

+3 −2
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ 
 * 2 of the License, or (at your option) any later version.

 */

#include <linux/types.h>

#include <linux/of_pdt.h>

#include <linux/proc_fs.h>

#include <linux/mutex.h>

#include <asm/atomic.h>
@@ -67,8 +68,8 @@ extern struct device_node *of_console_device; 
extern char *of_console_path;

extern char *of_console_options;



extern void (*prom_build_more)(struct device_node *dp, struct device_node ***nextp);

extern char *build_full_name(struct device_node *dp);

extern void irq_trans_init(struct device_node *dp);

extern char *build_path_component(struct device_node *dp);



#endif /* __KERNEL__ */

#endif /* _SPARC_PROM_H */

arch/sparc/kernel/prom.h

+0 −6
Original line number Diff line number Diff line
@@ -4,12 +4,6 @@ 
#include <linux/spinlock.h>

#include <asm/prom.h>



extern void * prom_early_alloc(unsigned long size);

extern void irq_trans_init(struct device_node *dp);



extern unsigned int prom_unique_id;



extern char *build_path_component(struct device_node *dp);

extern void of_console_init(void);



extern unsigned int prom_early_allocated;

arch/sparc/kernel/prom_common.c

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <linux/mutex.h>

#include <linux/slab.h>

#include <linux/of.h>

#include <linux/of_pdt.h>

#include <asm/prom.h>

#include <asm/oplib.h>

#include <asm/leon.h>
@@ -119,4 +120,11 @@ EXPORT_SYMBOL(of_find_in_proplist); 


unsigned int prom_early_allocated __initdata;



#include "../../../drivers/of/pdt.c"
 
void __init prom_build_devicetree(void)

{

	of_pdt_build_devicetree(prom_root_node);

	of_console_init();



	pr_info("PROM: Built device tree with %u bytes of memory.\n",

			prom_early_allocated);

}

drivers/of/Kconfig

+4 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config DTC 
config OF

	bool



menu "Flattened Device Tree and Open Firmware support"

menu "Device Tree and Open Firmware support"

	depends on OF



config PROC_DEVICETREE
@@ -19,6 +19,9 @@ config OF_FLATTREE 
	bool

	select DTC



config OF_PROMTREE

	bool



config OF_DYNAMIC

	def_bool y

	depends on PPC_OF