[U-Boot-Users] [PATCH] nand_spl: clean up Makefile
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- need Scott Wood patch * NAND: $(obj)-qualify ecc.h in kilauea NAND boot Makefile. nand_spl/board/amcc/acadia/Makefile | 51 nand_spl/board/amcc/bamboo/Makefile | 39 -- nand_spl/board/amcc/canyonlands/Makefile | 34 ++-- nand_spl/board/amcc/kilauea/Makefile | 45 ++--- nand_spl/board/amcc/sequoia/Makefile | 52 + 5 files changed, 123 insertions(+), 98 deletions(-) diff --git a/nand_spl/board/amcc/acadia/Makefile b/nand_spl/board/amcc/acadia/Makefile index 931f04b..23f76be 100644 --- a/nand_spl/board/amcc/acadia/Makefile +++ b/nand_spl/board/amcc/acadia/Makefile @@ -29,8 +29,15 @@ LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL -SOBJS = start.o resetvec.o cache.o -COBJS = gpio.o nand_boot.o nand_ecc.o memory.o ndfc.o pll.o +SOBJS := cache.o +SOBJS += resetvec.o +SOBJS += start.o +COBJS := gpio.o +COBJS += memory.o +COBJS += nand_boot.o +COBJS += nand_ecc.o +COBJS += ndfc.o +COBJS += pll.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) @@ -53,54 +60,54 @@ $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl: $(OBJS) cd $(LNDIR) $(LD) $(LDFLAGS) $(__OBJS) \ -Map $(nandobj)u-boot-spl.map \ - -o $(nandobj)u-boot-spl + -o $@ $(nandobj)System.map: $(nandobj)u-boot-spl @$(NM) $ | \ grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \ - sort $(nandobj)System.map + sort $@ # create symbolic links for common files # from cpu directory $(obj)cache.S: - @rm -f $(obj)cache.S - ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $(obj)cache.S + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/cache.S $@ $(obj)gpio.c: - @rm -f $(obj)gpio.c - ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $(obj)gpio.c + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/gpio.c $@ $(obj)ndfc.c: - @rm -f $(obj)ndfc.c - ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $@ $(obj)resetvec.S: - @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $@ $(obj)start.S: - @rm -f $(obj)start.S - ln -s $(SRCTREE)/cpu/ppc4xx/start.S $(obj)start.S + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/start.S $@ # from board directory $(obj)memory.c: - @rm -f $(obj)memory.c - ln -s $(SRCTREE)/board/amcc/acadia/memory.c $(obj)memory.c + @rm -f $@ + ln -s $(SRCTREE)/board/amcc/$(BOARDDIR)/memory.c $@ $(obj)pll.c: - @rm -f $(obj)pll.c - ln -s $(SRCTREE)/board/amcc/acadia/pll.c $(obj)pll.c + @rm -f $@ + ln -s $(SRCTREE)/board/amcc/$(BOARDDIR)/pll.c $@ # from nand_spl directory $(obj)nand_boot.c: - @rm -f $(obj)nand_boot.c - ln -s $(SRCTREE)/nand_spl/nand_boot.c $(obj)nand_boot.c + @rm -f $@ + ln -s $(SRCTREE)/nand_spl/nand_boot.c $@ # from drivers/mtd/nand directory $(obj)nand_ecc.c: - @rm -f $(obj)nand_ecc.c - ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $(obj)nand_ecc.c + @rm -f $@ + ln -s $(SRCTREE)/drivers/mtd/nand/nand_ecc.c $@ # diff --git a/nand_spl/board/amcc/bamboo/Makefile b/nand_spl/board/amcc/bamboo/Makefile index e1c1467..14b55e6 100644 --- a/nand_spl/board/amcc/bamboo/Makefile +++ b/nand_spl/board/amcc/bamboo/Makefile @@ -29,8 +29,13 @@ LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL -SOBJS = start.o init.o resetvec.o -COBJS = nand_boot.o nand_ecc.o ndfc.o sdram.o +SOBJS := init.o +SOBJS += resetvec.o +SOBJS += start.o +COBJS := nand_boot.o +COBJS += nand_ecc.o +COBJS += ndfc.o +COBJS += sdram.o SRCS := $(addprefix $(obj),$(SOBJS:.o=.S) $(COBJS:.o=.c)) OBJS := $(addprefix $(obj),$(SOBJS) $(COBJS)) @@ -52,42 +57,42 @@ $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl: $(OBJS) cd $(LNDIR) $(LD) $(LDFLAGS) $(__OBJS) \ -Map $(nandobj)u-boot-spl.map \ - -o $(nandobj)u-boot-spl + -o $@ # create symbolic links for common files # from cpu directory $(obj)ndfc.c: - @rm -f $(obj)ndfc.c - ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $(obj)ndfc.c + @rm -f $@ + ln -s $(SRCTREE)/cpu/ppc4xx/ndfc.c $@ $(obj)resetvec.S: - @rm -f $(obj)resetvec.S - ln -s $(SRCTREE)/cpu/ppc4xx/resetvec.S $(obj)resetvec.S + @rm
Re: [U-Boot-Users] [PATCH] nand_spl: clean up Makefile
In message [EMAIL PROTECTED] you wrote: Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD [EMAIL PROTECTED] --- need Scott Wood patch * NAND: $(obj)-qualify ecc.h in kilauea NAND boot Makefile. This has been in mainline for some time... @@ -53,54 +60,54 @@ $(nandobj)u-boot-spl.bin: $(nandobj)u-boot-spl $(nandobj)u-boot-spl:$(OBJS) cd $(LNDIR) $(LD) $(LDFLAGS) $(__OBJS) \ -Map $(nandobj)u-boot-spl.map \ - -o $(nandobj)u-boot-spl + -o $@ If you do this, you should also change $(nandobj)u-boot-spl.map into [EMAIL PROTECTED] (and put both on one line), I think. --- a/nand_spl/board/amcc/canyonlands/Makefile +++ b/nand_spl/board/amcc/canyonlands/Makefile @@ -29,9 +29,9 @@ LDFLAGS = -Bstatic -T $(LDSCRIPT) -Ttext $(TEXT_BASE) $(PLATFORM_LDFLAGS) AFLAGS += -DCONFIG_NAND_SPL CFLAGS += -DCONFIG_NAND_SPL -SOBJS:= start.o -SOBJS+= init.o +SOBJS:= init.o SOBJS+= resetvec.o +SOBJS+= start.o COBJS:= ddr2_fixed.o COBJS+= nand_boot.o COBJS+= nand_ecc.o I am not sure if changing the order of the object files is a good idea here. Are you absolutley sure that start.o is not required to come first? [Both comments apply to all the boards you touched, of course.] Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [EMAIL PROTECTED] Fascinating, a totally parochial attitude. -- Spock, Metamorphosis, stardate 3219.8 - This SF.Net email is sponsored by the Moblin Your Move Developer's challenge Build the coolest Linux based applications with Moblin SDK win great prizes Grand prize is a trip for two to an Open Source event anywhere in the world http://moblin-contest.org/redirect.php?banner_id=100url=/ ___ U-Boot-Users mailing list U-Boot-Users@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/u-boot-users
