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

Commit 2f0dfeaa authored by David Gibson's avatar David Gibson Committed by Paul Mackerras
Browse files

[POWERPC] Use embedded libfdt in the bootwrapper 



This incorporates libfdt (from the source embedded in an earlier
commit) into the wrapper.a library used by the bootwrapper.  This
includes adding a libfdt_env.h file, which the libfdt sources need in
order to integrate into the bootwrapper environment, and a
libfdt-wrapper.c which provides glue to connect the bootwrapper's
abstract device tree callbacks to the libfdt functions.

In addition, this changes the various wrapper and platform files to
use libfdt functions instead of the older flatdevtree.c library.

Signed-off-by: default avatarDavid Gibson <david@gibson.dropbear.id.au>
Signed-off-by: default avatarPaul Mackerras <paulus@samba.org>
parent 1cade994

arch/powerpc/boot/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ ifeq ($(call cc-option-yn, -fstack-protector),y) 
BOOTCFLAGS	+= -fno-stack-protector

endif



BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj)

BOOTCFLAGS	+= -I$(obj) -I$(srctree)/$(obj) -I$(srctree)/$(src)/libfdt



$(obj)/4xx.o: BOOTCFLAGS += -mcpu=440

$(obj)/ebony.o: BOOTCFLAGS += -mcpu=440
@@ -46,7 +46,9 @@ zliblinuxheader := zlib.h zconf.h zutil.h 
$(addprefix $(obj)/,$(zlib) gunzip_util.o main.o): \

	$(addprefix $(obj)/,$(zliblinuxheader)) $(addprefix $(obj)/,$(zlibheader))



src-libfdt := fdt.c fdt_ro.c fdt_wip.c fdt_sw.c fdt_rw.c fdt_strerror.c

src-wlib := string.S crt0.S stdio.c main.c flatdevtree.c flatdevtree_misc.c \

		$(addprefix libfdt/,$(src-libfdt)) libfdt-wrapper.c \

		ns16550.c serial.c simple_alloc.c div64.S util.S \

		gunzip_util.c elf_util.c $(zlib) devtree.c oflib.c ofconsole.c \

		4xx.c ebony.c mv64x60.c mpsc.c mv64x60_i2c.c cuboot.c bamboo.c \
@@ -101,8 +103,10 @@ quiet_cmd_bootar = BOOTAR $@ 
      cmd_bootar = $(CROSS32AR) -cr $@.$$$$ $(filter-out FORCE,$^); mv $@.$$$$ $@



$(patsubst %.c,%.o, $(filter %.c, $(src-boot))): %.o: %.c FORCE

	$(Q)mkdir -p $(dir $@)

	$(call if_changed_dep,bootcc)

$(patsubst %.S,%.o, $(filter %.S, $(src-boot))): %.o: %.S FORCE

	$(Q)mkdir -p $(dir $@)

	$(call if_changed_dep,bootas)



$(obj)/wrapper.a: $(obj-wlib) FORCE

arch/powerpc/boot/bamboo.c

+1 −1
Original line number Diff line number Diff line
@@ -42,6 +42,6 @@ void bamboo_init(void *mac0, void *mac1) 
	platform_ops.exit = ibm44x_dbcr_reset;

	bamboo_mac0 = mac0;

	bamboo_mac1 = mac1;

	ft_init(_dtb_start, 0, 32);

	fdt_init(_dtb_start);

	serial_console_init();

}

arch/powerpc/boot/cuboot-52xx.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
                   unsigned long r6, unsigned long r7)

{

	CUBOOT_INIT();

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	fdt_init(_dtb_start);

	serial_console_init();

	platform_ops.fixups = platform_fixups;

}

arch/powerpc/boot/cuboot-83xx.c

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
                   unsigned long r6, unsigned long r7)

{

	CUBOOT_INIT();

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	fdt_init(_dtb_start);

	serial_console_init();

	platform_ops.fixups = platform_fixups;

}

arch/powerpc/boot/cuboot-85xx.c

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ void platform_init(unsigned long r3, unsigned long r4, unsigned long r5, 
                   unsigned long r6, unsigned long r7)

{

	CUBOOT_INIT();

	ft_init(_dtb_start, _dtb_end - _dtb_start, 32);

	fdt_init(_dtb_start);

	serial_console_init();

	platform_ops.fixups = platform_fixups;

}