Skip to contentSkip to conversation

mx31pdk: Remove board config.mk file

PATCH New Fabio Estevam 4 participants 4 messages Sep 9, 2011 – Sep 12, 2011

lore
Share & tools
lore

Fabio Estevam

author
#0 lore raw

PATCH 1/1 mx31pdk: Remove board config.mk file

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 <[email protected]>
---
 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
board/freescale/mx31pdk/config.mk deleted +0 -5
deleted file mode 100644
index de2c642..0000000
@@ -1,5 +0,0 @@
-ifdef CONFIG_NAND_SPL
-CONFIG_SYS_TEXT_BASE = 0x87ec0000
-else
-CONFIG_SYS_TEXT_BASE = 0x87f00000
-endif
nand_spl/board/freescale/mx31pdk/Makefile +2 -1
index e6ec10a..a5dc0ce 100644
@@ -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
Signature · 1 line
1.6.0.4
#1 lore raw

PATCH 1/1 mx31pdk: Remove board config.mk file

Quoted 6 lines · Fabio Estevam

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 <[email protected]>

Hi Fabio,

Quoted 28 lines
---
 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
board/freescale/mx31pdk/config.mk deleted +0 -5
deleted file mode 100644
index de2c642..0000000
@@ -1,5 +0,0 @@
-ifdef CONFIG_NAND_SPL
-CONFIG_SYS_TEXT_BASE = 0x87ec0000
-else
-CONFIG_SYS_TEXT_BASE = 0x87f00000
-endif
nand_spl/board/freescale/mx31pdk/Makefile +1 -0
index e6ec10a..a5dc0ce 100644
@@ -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

nand_spl/board/freescale/mx31pdk/Makefile include $(TOPDIR)/nand_spl/board/$(BOARDDIR)/config.mk · line 13

Quoted 8 lines
nand_spl/board/freescale/mx31pdk/Makefile +1 -1
@@ -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 <[email protected]>

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
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
=====================================================================
#2 lore raw

PATCH 1/1 mx31pdk: Remove board config.mk file

Hi Stefano,

On Fri, Sep 9, 2011 at 1:04 PM, Stefano Babic <[email protected]> wrote:
...

Quoted 2 lines

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

#3 lore raw

PATCH 1/1 mx31pdk: Remove board config.mk file

In reply to Fabio Estevam

nand_spl/board/freescale/mx31pdk/Makefile line 2

Quoted 7 lines · Fabio Estevam
nand_spl/board/freescale/mx31pdk/Makefile +1 -0
index e6ec10a..a5dc0ce 100644
@@ -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