MPC8xx: Fix libfdt support introduced in commit 77ff7b74

Jerry Van Baren u-boot 1 version Apr 9, 2008 New

Get series with b4

b4 am [email protected]

Versions newest first

v1 Latest Apr 9, 20080 of 2 patches 0 repliesNew

Patches in v1 No applies recorded yet

None of the 2 patches the cover letter announces are in this archive.

Reviews trailers per patch

No Reviewed-by, Acked-by or Tested-by trailers for v1 yet.

Read the v1 thread

Cover letter [U-Boot-Users] [U-boot] [PATCH 0/2] MPC8xx: Fix libfdt support introduced in commit 77ff7b74

Quoted 57 lines · Wolfgang Denk

Quoted 41 lines · In message <[email protected]> you wrote:
fdt.c: In function 'ft_cpu_setup':
fdt.c:33: warning: implicit declaration of function 'do_fixup_by_prop_u32' fdt.c:39: warning: implicit declaration of function 'do_fixup_by_compat_u32' fdt.c:43: warning: implicit declaration of function 'fdt_fixup_ethernet' fdt.c:45: warning: implicit declaration of function 'fdt_fixup_memory'
Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
cpu/mpc8xx/Makefile +15 ~~-10~~
index dbdc2e0..5f70459 100644
@@ -27,16 +27,29 @@ include $(TOPDIR)/config.mk
 
 LIB	= $(obj)lib$(CPU).a
 
-START	= start.o kgdb.o
-COBJS	= bedbug_860.o commproc.o cpu.o cpu_init.o	\
-	  fec.o fdt.o i2c.o interrupts.o lcd.o scc.o	\
-	  serial.o speed.o spi.o \
-	  traps.o upatch.o video.o
-SOBJS	= plprcr_write.o
-
-SRCS	:= $(START:.o=.S) $(SOBJS:.o=.S) $(COBJS:.o=.c)
-OBJS	:= $(addprefix $(obj),$(SOBJS) $(COBJS))
-START	:= $(addprefix $(obj),$(START))
+START-y	+= start.o
+START-y	+= kgdb.o
+COBJS-y	+= bedbug_860.o
+COBJS-y	+= commproc.o
+COBJS-y	+= cpu.o
+COBJS-y	+= cpu_init.o
+COBJS-y	+= fec.o
+COBJS-$(CONFIG_OF_LIBFDT) += fdt.o
+COBJS-y	+= i2c.o
+COBJS-y	+= interrupts.o
+COBJS-y	+= lcd.o
+COBJS-y	+= scc.o
+COBJS-y	+= serial.o
+COBJS-y	+= speed.o
+COBJS-y	+= spi.o
cpu/mpc8xx/Makefile include $(TOPDIR)/config.mk · line 54
Quoted 10 lines
cpu/mpc8xx/Makefile +8 -0
+COBJS-y	+= traps.o
+COBJS-y	+= upatch.o
+COBJS-y	+= video.o
+SOBJS-y	+= plprcr_write.o
+
+SRCS	:= $(START-y:.o=.S) $(SOBJS-y:.o=.S) $(COBJS-y:.o=.c)
+OBJS	:= $(addprefix $(obj),$(SOBJS-y) $(COBJS-y))
+START	:= $(addprefix $(obj),$(START-y))
 
 all:	$(obj).depend $(START) $(LIB)
I cannot see any correlation between your commit message and the actual changes???

Quoted 5 lines

NAK.
Best regards,
Wolfgang Denk

Actually, I've already slipped this one in through the u-boot-fdt repository (I took the liberty since it was a problem with fdt.o and CONFIG_OF_LIBFDT).

<http://article.gmane.org/gmane.comp.boot-loaders.u-boot/39261/>

The problem is that only a couple of 8xx boards are using libfdt, but they were *all* compiling fdt.c. The result for the boards that did not have CONFIG_OF_LIBFDT was the compilation warnings on the (erroneously compiled) fdt.c.

I had fixed it independently, but Jean-Christophe's fix was better (more complete), so I dropped my patch and picked up his.

Best regards,
gvb

Read the cover letter in its thread