powerpc/85xx: Remove config.mk for nand linker script

PATCH New Kumar Gala 2 participants 7 messages Jan 31, 2011 – Feb 10, 2011

lore

Share & tools

lore

Kumar Gala

author

2011-01-31 22:15 UTC #0 lore raw

PATCH 1/1 powerpc/85xx: Remove config.mk for nand linker script

Move the include of mpc85xx/u-boot-nand.lds to utilize CONFIG_SYS_LDSCRIPT rather than having an explicit config.mk

Signed-off-by Kumar Gala <[email protected]>

---
 board/freescale/mpc8536ds/config.mk  |   30 ------------------------------
 board/freescale/mpc8569mds/config.mk |   30 ------------------------------
 board/freescale/mpc8572ds/config.mk  |   30 ------------------------------
 board/freescale/p1_p2_rdb/config.mk  |   31 -------------------------------
 include/configs/MPC8536DS.h          |    1 +
 include/configs/MPC8569MDS.h         |    1 +
 include/configs/MPC8572DS.h          |    1 +
 include/configs/P1_P2_RDB.h          |    1 +
 8 files changed, 4 insertions(+), 121 deletions(-)
 delete mode 100644 board/freescale/mpc8536ds/config.mk
 delete mode 100644 board/freescale/mpc8569mds/config.mk
 delete mode 100644 board/freescale/mpc8572ds/config.mk
 delete mode 100644 board/freescale/p1_p2_rdb/config.mk

board/freescale/mpc8536ds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 228d8c0..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright 2008, 2011 Freescale Semiconductor.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8536ds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/mpc8569mds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 54b2eb1..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2009 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8569mds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/mpc8572ds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 9fd30f9..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8572ds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/p1_p2_rdb/config.mk deleted +0 ~~-31~~

deleted file mode 100644
index 0769804..0000000
@@ -1,31 +0,0 @@
-#
-# Copyright 2009, 2011 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# p1_p2rdb board
-#
-
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

include/configs/MPC8536DS.h +1 -0

index 11ee650..b7985fd 100644
@@ -37,6 +37,7 @@
 #define CONFIG_NAND_U_BOOT		1
 #define CONFIG_RAMBOOT_NAND		1
 #ifdef CONFIG_NAND_SPL
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else

include/configs/MPC8569MDS.h +1 -0

index 9e24e12..2beff93 100644
@@ -69,6 +69,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_NAND_U_BOOT		1
 #define CONFIG_RAMBOOT_NAND		1
 #ifdef CONFIG_NAND_SPL
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else

include/configs/MPC8572DS.h +1 -0

index e6b60cf..f2d6cdb 100644
@@ -37,6 +37,7 @@
 #define CONFIG_NAND_U_BOOT
 #define CONFIG_RAMBOOT_NAND
 #ifdef CONFIG_NAND_SPL
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else

include/configs/P1_P2_RDB.h +1 -0

index bf34740..2f4f967 100644
@@ -47,6 +47,7 @@
 #define CONFIG_NAND_U_BOOT		1
 #define CONFIG_RAMBOOT_NAND		1
 #ifdef CONFIG_NAND_SPL
+#define CONFIG_SYS_LDSCRIPT "arch/powerpc/cpu/mpc85xx/u-boot-nand.lds"
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else

Signature · 1 line

1.7.2.3

Kumar Gala

author

2011-01-31 22:37 UTC #1 lore raw

PATCH 1/1 powerpc/85xx: Remove config.mk for nand linker script

Quoted 14 lines · Kumar Gala

Move the include of mpc85xx/u-boot-nand.lds to utilize CONFIG_SYS_LDSCRIPT rather than having an explicit config.mk

Signed-off-by Kumar Gala <[email protected]>

---

board/freescale/mpc8536ds/config.mk  |   30 ------------------------------
board/freescale/mpc8569mds/config.mk |   30 ------------------------------
board/freescale/mpc8572ds/config.mk  |   30 ------------------------------
board/freescale/p1_p2_rdb/config.mk  |   31 -------------------------------
include/configs/MPC8536DS.h          |    1 +
include/configs/MPC8569MDS.h         |    1 +
include/configs/MPC8572DS.h          |    1 +
include/configs/P1_P2_RDB.h          |    1 +
8 files changed, 4 insertions(+), 121 deletions(-)

Quoted 4 lines

delete mode 100644 board/freescale/mpc8536ds/config.mk delete mode 100644 board/freescale/mpc8569mds/config.mk delete mode 100644 board/freescale/mpc8572ds/config.mk delete mode 100644 board/freescale/p1_p2_rdb/config.mk

broken in two different ways, will fix both of them:

* use of $(TOPDIR)/$(CPUDIR)
* fix where we define this, it should !CONFIG_NAND_SPL, read the old config.mk incorrectly.

- k

Scott Wood

2011-01-31 22:52 UTC #2 lore raw

PATCH 1/1 powerpc/85xx: Remove config.mk for nand linker script

Quoted 1 line · On Mon, 31 Jan 2011 16:37:44 -0600 Kumar Gala <[email protected]> wrote:

* fix where we define this, it should !CONFIG_NAND_SPL, read the old config.mk incorrectly.

I don't think that will make a difference -- CONFIG_NAND_SPL is never set when symbols are extracted into autoconf.mk, and CONFIG_SYS_LDSCRIPT is not used when building the SPL.

-Scott

Kumar Gala

author

2011-02-01 04:02 UTC #3 lore raw

PATCH 1/1 powerpc/85xx: Remove config.mk for nand linker script

Quoted 8 lines · Scott Wood

Quoted 1 line · On Mon, 31 Jan 2011 16:37:44 -0600 Kumar Gala <[email protected]> wrote:
* fix where we define this, it should !CONFIG_NAND_SPL, read the old config.mk incorrectly.
I don't think that will make a difference -- CONFIG_NAND_SPL is never set when symbols are extracted into autoconf.mk, and CONFIG_SYS_LDSCRIPT is not used when building the SPL.

it seems to work out ok.

- k

Scott Wood

2011-02-01 16:20 UTC #4 lore raw

PATCH 1/1 powerpc/85xx: Remove config.mk for nand linker script

Quoted 6 lines · On Mon, 31 Jan 2011 22:02:03 -0600 Kumar Gala <[email protected]> wrote:

Quoted 3 lines · Scott Wood
On Mon, 31 Jan 2011 16:37:44 -0600
Kumar Gala <[email protected]> wrote:

Quoted 7 lines

Quoted 5 lines
Quoted 1 line
* fix where we define this, it should !CONFIG_NAND_SPL, read the old config.mk incorrectly.
I don't think that will make a difference -- CONFIG_NAND_SPL is never set when symbols are extracted into autoconf.mk, and CONFIG_SYS_LDSCRIPT is not used when building the SPL.
it seems to work out ok.

My point is it will work either way, the ifdef just confuses things, since that's not actually the mechanism by which a different linker script is used for SPL (nor would it work if you relied on the ifdef for that).

-Scott

Kumar Gala

author

2011-02-01 04:53 UTC #5 lore raw

PATCH v2 1/1 powerpc/85xx: Remove config.mk for nand linker script

In reply to Scott Wood

Move the include of mpc85xx/u-boot-nand.lds to utilize CONFIG_SYS_LDSCRIPT rather than having an explicit config.mk

Signed-off-by Kumar Gala <[email protected]>

---
* Use $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds so we should work in O=
* Move CONFIG_SYS_LDSCRIPT for NAND to !CONFIG_NAND_SPL case

 board/freescale/mpc8536ds/config.mk  |   30 ------------------------------
 board/freescale/mpc8569mds/config.mk |   30 ------------------------------
 board/freescale/mpc8572ds/config.mk  |   30 ------------------------------
 board/freescale/p1_p2_rdb/config.mk  |   31 -------------------------------
 include/configs/MPC8536DS.h          |    1 +
 include/configs/MPC8569MDS.h         |    1 +
 include/configs/MPC8572DS.h          |    1 +
 include/configs/P1_P2_RDB.h          |    1 +
 8 files changed, 4 insertions(+), 121 deletions(-)
 delete mode 100644 board/freescale/mpc8536ds/config.mk
 delete mode 100644 board/freescale/mpc8569mds/config.mk
 delete mode 100644 board/freescale/mpc8572ds/config.mk
 delete mode 100644 board/freescale/p1_p2_rdb/config.mk

board/freescale/mpc8536ds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 228d8c0..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright 2008, 2011 Freescale Semiconductor.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8536ds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/mpc8569mds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 54b2eb1..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright (C) 2009 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8569mds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/mpc8572ds/config.mk deleted +0 ~~-30~~

deleted file mode 100644
index 9fd30f9..0000000
@@ -1,30 +0,0 @@
-#
-# Copyright 2007-2008,2010-2011 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# mpc8572ds board
-#
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

board/freescale/p1_p2_rdb/config.mk deleted +0 ~~-31~~

deleted file mode 100644
index 0769804..0000000
@@ -1,31 +0,0 @@
-#
-# Copyright 2009, 2011 Freescale Semiconductor, Inc.
-#
-# See file CREDITS for list of people who contributed to this
-# project.
-#
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
-# MA 02111-1307 USA
-#
-
-#
-# p1_p2rdb board
-#
-
-ifndef NAND_SPL
-ifeq ($(CONFIG_NAND), y)
-LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
-endif
-endif

include/configs/MPC8536DS.h +1 -0

index 11ee650..98b1427 100644
@@ -40,6 +40,7 @@
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else
+#define CONFIG_SYS_LDSCRIPT $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 #define CONFIG_SYS_TEXT_BASE	0xf8f82000
 #endif /* CONFIG_NAND_SPL */
 #endif

include/configs/MPC8569MDS.h +1 -0

index 9e24e12..b815ed0 100644
@@ -72,6 +72,7 @@ extern unsigned long get_clock_freq(void);
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else
+#define CONFIG_SYS_LDSCRIPT $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 #define CONFIG_SYS_TEXT_BASE	0xf8f82000
 #endif
 #endif

include/configs/MPC8572DS.h +1 -0

index bf2fdd6..4224229 100644
@@ -40,6 +40,7 @@
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else
+#define CONFIG_SYS_LDSCRIPT $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 #define CONFIG_SYS_TEXT_BASE	0xf8f82000
 #endif /* CONFIG_NAND_SPL */
 #endif

include/configs/P1_P2_RDB.h +1 -0

index bf34740..08ef985 100644
@@ -50,6 +50,7 @@
 #define CONFIG_SYS_TEXT_BASE_SPL 0xfff00000
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE_SPL /* start of monitor */
 #else
+#define CONFIG_SYS_LDSCRIPT $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 #define CONFIG_SYS_TEXT_BASE		0xf8f82000
 #endif /* CONFIG_NAND_SPL */
 #endif

Signature · 1 line

1.7.2.3

Kumar Gala

author Applied

2011-02-10 05:17 UTC #6 lore raw

PATCH v2 1/1 powerpc/85xx: Remove config.mk for nand linker script

Quoted 17 lines · Kumar Gala

Move the include of mpc85xx/u-boot-nand.lds to utilize CONFIG_SYS_LDSCRIPT rather than having an explicit config.mk
Signed-off-by Kumar Gala <[email protected]>
---
* Use $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds so we should work in O=
* Move CONFIG_SYS_LDSCRIPT for NAND to !CONFIG_NAND_SPL case
board/freescale/mpc8536ds/config.mk  |   30 ------------------------------
board/freescale/mpc8569mds/config.mk |   30 ------------------------------
board/freescale/mpc8572ds/config.mk  |   30 ------------------------------
board/freescale/p1_p2_rdb/config.mk  |   31 -------------------------------
include/configs/MPC8536DS.h          |    1 +
include/configs/MPC8569MDS.h         |    1 +
include/configs/MPC8572DS.h          |    1 +
include/configs/P1_P2_RDB.h          |    1 +
8 files changed, 4 insertions(+), 121 deletions(-)

Quoted 4 lines

delete mode 100644 board/freescale/mpc8536ds/config.mk delete mode 100644 board/freescale/mpc8569mds/config.mk delete mode 100644 board/freescale/mpc8572ds/config.mk delete mode 100644 board/freescale/p1_p2_rdb/config.mk

applied to 85xx next

- k