* [U-Boot] [PATCH] mx31pdk: Remove board config.mk file
@ 2011-09-09 15:38 Fabio Estevam
2011-09-09 16:04 ` Stefano Babic
2011-09-09 21:56 ` Scott Wood
0 siblings, 2 replies; 4+ messages in thread
From: Fabio Estevam @ 2011-09-09 15:38 UTC (permalink / raw)
To: u-boot
config.mk files should not be used in board level directory.
Remove this file and also use CONFIG_SYS_TEXT_BASE_SPL, which is the
correct base address for the SPL case.
Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
board/freescale/mx31pdk/config.mk | 5 -----
nand_spl/board/freescale/mx31pdk/Makefile | 3 ++-
2 files changed, 2 insertions(+), 6 deletions(-)
delete mode 100644 board/freescale/mx31pdk/config.mk
diff --git a/board/freescale/mx31pdk/config.mk b/board/freescale/mx31pdk/config.mk
deleted file mode 100644
index de2c642..0000000
--- a/board/freescale/mx31pdk/config.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-ifdef CONFIG_NAND_SPL
-CONFIG_SYS_TEXT_BASE = 0x87ec0000
-else
-CONFIG_SYS_TEXT_BASE = 0x87f00000
-endif
diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
index e6ec10a..a5dc0ce 100644
--- a/nand_spl/board/freescale/mx31pdk/Makefile
+++ b/nand_spl/board/freescale/mx31pdk/Makefile
@@ -1,4 +1,5 @@
CONFIG_NAND_SPL = y
+CONFIG_SYS_TEXT_BASE_SPL := 0x87ec0000
include $(TOPDIR)/config.mk
include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
@@ -6,7 +7,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
nandobj := $(OBJTREE)/nand_spl/
LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
-LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
+LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(LDFLAGS) \
$(LDFLAGS_FINAL)
AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
--
1.6.0.4
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] mx31pdk: Remove board config.mk file
2011-09-09 15:38 [U-Boot] [PATCH] mx31pdk: Remove board config.mk file Fabio Estevam
@ 2011-09-09 16:04 ` Stefano Babic
2011-09-12 14:08 ` Fabio Estevam
2011-09-09 21:56 ` Scott Wood
1 sibling, 1 reply; 4+ messages in thread
From: Stefano Babic @ 2011-09-09 16:04 UTC (permalink / raw)
To: u-boot
On 09/09/2011 05:38 PM, Fabio Estevam wrote:
> config.mk files should not be used in board level directory.
>
> Remove this file and also use CONFIG_SYS_TEXT_BASE_SPL, which is the
> correct base address for the SPL case.
>
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
Hi Fabio,
> ---
> board/freescale/mx31pdk/config.mk | 5 -----
> nand_spl/board/freescale/mx31pdk/Makefile | 3 ++-
> 2 files changed, 2 insertions(+), 6 deletions(-)
> delete mode 100644 board/freescale/mx31pdk/config.mk
>
> diff --git a/board/freescale/mx31pdk/config.mk b/board/freescale/mx31pdk/config.mk
> deleted file mode 100644
> index de2c642..0000000
> --- a/board/freescale/mx31pdk/config.mk
> +++ /dev/null
> @@ -1,5 +0,0 @@
> -ifdef CONFIG_NAND_SPL
> -CONFIG_SYS_TEXT_BASE = 0x87ec0000
> -else
> -CONFIG_SYS_TEXT_BASE = 0x87f00000
> -endif
> diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
> index e6ec10a..a5dc0ce 100644
> --- a/nand_spl/board/freescale/mx31pdk/Makefile
> +++ b/nand_spl/board/freescale/mx31pdk/Makefile
> @@ -1,4 +1,5 @@
> CONFIG_NAND_SPL = y
> +CONFIG_SYS_TEXT_BASE_SPL := 0x87ec0000
>
> include $(TOPDIR)/config.mk
> include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
> @@ -6,7 +7,7 @@ include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk
> nandobj := $(OBJTREE)/nand_spl/
>
> LDSCRIPT= $(TOPDIR)/nand_spl/board/$(BOARDDIR)/u-boot.lds
> -LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE) $(LDFLAGS) \
> +LDFLAGS := -T $(nandobj)u-boot.lds -Ttext $(CONFIG_SYS_TEXT_BASE_SPL) $(LDFLAGS) \
> $(LDFLAGS_FINAL)
> AFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
> CFLAGS += -DCONFIG_SPL_BUILD -DCONFIG_NAND_SPL
It sounds good. I'll wait only a couple of days for comments, then I
will merge into u-boot-imx.
Acked-by: Stefano Babic <sbabic@denx.de>
Best regards,
Stefano Babic
--
=====================================================================
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: office at denx.de
=====================================================================
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] mx31pdk: Remove board config.mk file
2011-09-09 15:38 [U-Boot] [PATCH] mx31pdk: Remove board config.mk file Fabio Estevam
2011-09-09 16:04 ` Stefano Babic
@ 2011-09-09 21:56 ` Scott Wood
1 sibling, 0 replies; 4+ messages in thread
From: Scott Wood @ 2011-09-09 21:56 UTC (permalink / raw)
To: u-boot
On Fri, Sep 09, 2011 at 12:38:54PM -0300, Fabio Estevam wrote:
> diff --git a/nand_spl/board/freescale/mx31pdk/Makefile b/nand_spl/board/freescale/mx31pdk/Makefile
> index e6ec10a..a5dc0ce 100644
> --- a/nand_spl/board/freescale/mx31pdk/Makefile
> +++ b/nand_spl/board/freescale/mx31pdk/Makefile
> @@ -1,4 +1,5 @@
> CONFIG_NAND_SPL = y
> +CONFIG_SYS_TEXT_BASE_SPL := 0x87ec0000
Any reason not to define this in the board config header?
-Scott
^ permalink raw reply [flat|nested] 4+ messages in thread
* [U-Boot] [PATCH] mx31pdk: Remove board config.mk file
2011-09-09 16:04 ` Stefano Babic
@ 2011-09-12 14:08 ` Fabio Estevam
0 siblings, 0 replies; 4+ messages in thread
From: Fabio Estevam @ 2011-09-12 14:08 UTC (permalink / raw)
To: u-boot
Hi Stefano,
On Fri, Sep 9, 2011 at 1:04 PM, Stefano Babic <sbabic@denx.de> wrote:
...
> It sounds good. I'll wait only a couple of days for comments, then I
> will merge into u-boot-imx.
Please wait until I address Scott's suggestion.
Thanks,
Fabio Estevam
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-09-12 14:08 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-09-09 15:38 [U-Boot] [PATCH] mx31pdk: Remove board config.mk file Fabio Estevam
2011-09-09 16:04 ` Stefano Babic
2011-09-12 14:08 ` Fabio Estevam
2011-09-09 21:56 ` Scott Wood
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox