Patchwork [U-Boot] mx31pdk: Remove board config.mk file

login
register
mail settings
Submitter Fabio Estevam
Date Sept. 9, 2011, 3:38 p.m.
Message ID <1315582734-20137-1-git-send-email-fabio.estevam@freescale.com>
Download mbox | patch
Permalink /patch/114110/
State Changes Requested
Headers show

Comments

Fabio Estevam - Sept. 9, 2011, 3:38 p.m.
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
Stefano Babic - Sept. 9, 2011, 4:04 p.m.
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
Scott Wood - Sept. 9, 2011, 9:56 p.m.
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
Fabio Estevam - Sept. 12, 2011, 2:08 p.m.
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

Patch

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