* [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile
@ 2011-01-27 14:44 Haiying.Wang at freescale.com
2011-02-03 19:35 ` Haiying Wang
2011-03-16 23:23 ` Scott Wood
0 siblings, 2 replies; 3+ messages in thread
From: Haiying.Wang at freescale.com @ 2011-01-27 14:44 UTC (permalink / raw)
To: u-boot
From: Haiying Wang <Haiying.Wang@freescale.com>
Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
Acked-by: Scott Wood <scottwood@freescale.com>
---
Makefile | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 deletions(-)
diff --git a/Makefile b/Makefile
index 5f93646..0d1ea5d 100644
--- a/Makefile
+++ b/Makefile
@@ -287,17 +287,6 @@ LDPPFLAGS += \
$(shell $(LD) --version | \
sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
-ifeq ($(CONFIG_NAND_U_BOOT),y)
-NAND_SPL = nand_spl
-U_BOOT_NAND = $(obj)u-boot-nand.bin
-endif
-
-ifeq ($(CONFIG_ONENAND_U_BOOT),y)
-ONENAND_IPL = onenand_ipl
-U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
-ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
-endif
-
__OBJS := $(subst $(obj),,$(OBJS))
__LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
@@ -320,7 +309,16 @@ BOARD_SIZE_CHECK =
endif
# Always append ALL so that arch config.mk's can add custom ones
-ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
+ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
+
+ifeq ($(CONFIG_NAND_U_BOOT),y)
+ALL += $(obj)u-boot-nand.bin
+endif
+
+ifeq ($(CONFIG_ONENAND_U_BOOT),y)
+ALL += $(obj)u-boot-onenand.bin
+ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
+endif
all: $(ALL)
@@ -401,16 +399,16 @@ $(LDSCRIPT): depend
$(obj)u-boot.lds: $(LDSCRIPT)
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
-$(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend
+nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
$(MAKE) -C nand_spl/board/$(BOARDDIR) all
-$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin
+$(obj)u-boot-nand.bin: nand_spl $(obj)u-boot.bin
cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
-$(ONENAND_IPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
+onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
$(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
-$(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin
+$(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin
cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
$(VERSION_FILE):
--
1.7.3.1.50.g1e633
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile
2011-01-27 14:44 [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile Haiying.Wang at freescale.com
@ 2011-02-03 19:35 ` Haiying Wang
2011-03-16 23:23 ` Scott Wood
1 sibling, 0 replies; 3+ messages in thread
From: Haiying Wang @ 2011-02-03 19:35 UTC (permalink / raw)
To: u-boot
Dear Wolfgang,
On Thu, 2011-01-27 at 09:44 -0500, Haiying.Wang at freescale.com wrote:
> From: Haiying Wang <Haiying.Wang@freescale.com>
>
> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
> Acked-by: Scott Wood <scottwood@freescale.com>
>
> ---
> Makefile | 30 ++++++++++++++----------------
> 1 files changed, 14 insertions(+), 16 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 5f93646..0d1ea5d 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -287,17 +287,6 @@ LDPPFLAGS += \
> $(shell $(LD) --version | \
> sed -ne 's/GNU ld version \([0-9][0-9]*\)\.\([0-9][0-9]*\).*/-DLD_MAJOR=\1 -DLD_MINOR=\2/p')
>
> -ifeq ($(CONFIG_NAND_U_BOOT),y)
> -NAND_SPL = nand_spl
> -U_BOOT_NAND = $(obj)u-boot-nand.bin
> -endif
> -
> -ifeq ($(CONFIG_ONENAND_U_BOOT),y)
> -ONENAND_IPL = onenand_ipl
> -U_BOOT_ONENAND = $(obj)u-boot-onenand.bin
> -ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
> -endif
> -
> __OBJS := $(subst $(obj),,$(OBJS))
> __LIBS := $(subst $(obj),,$(LIBS)) $(subst $(obj),,$(LIBBOARD))
>
> @@ -320,7 +309,16 @@ BOARD_SIZE_CHECK =
> endif
>
> # Always append ALL so that arch config.mk's can add custom ones
> -ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map $(U_BOOT_NAND) $(U_BOOT_ONENAND)
> +ALL += $(obj)u-boot.srec $(obj)u-boot.bin $(obj)System.map
> +
> +ifeq ($(CONFIG_NAND_U_BOOT),y)
> +ALL += $(obj)u-boot-nand.bin
> +endif
> +
> +ifeq ($(CONFIG_ONENAND_U_BOOT),y)
> +ALL += $(obj)u-boot-onenand.bin
> +ONENAND_BIN ?= $(obj)onenand_ipl/onenand-ipl-2k.bin
> +endif
>
> all: $(ALL)
>
> @@ -401,16 +399,16 @@ $(LDSCRIPT): depend
> $(obj)u-boot.lds: $(LDSCRIPT)
> $(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P - <$^ >$@
>
> -$(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend
> +nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> $(MAKE) -C nand_spl/board/$(BOARDDIR) all
>
> -$(U_BOOT_NAND): $(NAND_SPL) $(obj)u-boot.bin
> +$(obj)u-boot-nand.bin: nand_spl $(obj)u-boot.bin
> cat $(obj)nand_spl/u-boot-spl-16k.bin $(obj)u-boot.bin > $(obj)u-boot-nand.bin
>
> -$(ONENAND_IPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> +onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
>
> -$(U_BOOT_ONENAND): $(ONENAND_IPL) $(obj)u-boot.bin
> +$(obj)u-boot-onenand.bin: onenand_ipl $(obj)u-boot.bin
> cat $(ONENAND_BIN) $(obj)u-boot.bin > $(obj)u-boot-onenand.bin
>
> $(VERSION_FILE):
Do you have any comments on this patch? Based on your reply at
http://lists.denx.de/pipermail/u-boot/2011-January/086285.html , I added
the changes for ONENAND_IPL as well.
Thanks.
Haiying
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile
2011-01-27 14:44 [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile Haiying.Wang at freescale.com
2011-02-03 19:35 ` Haiying Wang
@ 2011-03-16 23:23 ` Scott Wood
1 sibling, 0 replies; 3+ messages in thread
From: Scott Wood @ 2011-03-16 23:23 UTC (permalink / raw)
To: u-boot
On Thu, 27 Jan 2011 09:44:59 -0500
<Haiying.Wang@freescale.com> wrote:
> From: Haiying Wang <Haiying.Wang@freescale.com>
>
> Signed-off-by: Haiying Wang <Haiying.Wang@freescale.com>
> Acked-by: Scott Wood <scottwood@freescale.com>
Applied to u-boot-nand-flash next, except:
> -$(NAND_SPL): $(TIMESTAMP_FILE) $(VERSION_FILE) depend
> +nand_spl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> $(MAKE) -C nand_spl/board/$(BOARDDIR) all
You're reverting commit f0fee6a6469509a6cf1df88a81a73735f74b5a5d here.
I've dropped that bit.
> -$(ONENAND_IPL): $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> +onenand_ipl: $(TIMESTAMP_FILE) $(VERSION_FILE) $(obj)include/autoconf.mk
> $(MAKE) -C onenand_ipl/board/$(BOARDDIR) all
I wonder if this should be "depend" as well?
-Scott
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2011-03-16 23:23 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-27 14:44 [U-Boot] [PATCH] Fix NAND_SPL and ONENAND_IPL in Makefile Haiying.Wang at freescale.com
2011-02-03 19:35 ` Haiying Wang
2011-03-16 23:23 ` Scott Wood
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.