All of lore.kernel.org
 help / color / mirror / Atom feed
* [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script
@ 2011-01-31 22:15 Kumar Gala
  2011-01-31 22:37 ` Kumar Gala
  0 siblings, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2011-01-31 22:15 UTC (permalink / raw)
  To: u-boot

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 <galak@kernel.crashing.org>
---
 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

diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk
deleted file mode 100644
index 228d8c0..0000000
--- a/board/freescale/mpc8536ds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk
deleted file mode 100644
index 54b2eb1..0000000
--- a/board/freescale/mpc8569mds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk
deleted file mode 100644
index 9fd30f9..0000000
--- a/board/freescale/mpc8572ds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk
deleted file mode 100644
index 0769804..0000000
--- a/board/freescale/p1_p2_rdb/config.mk
+++ /dev/null
@@ -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
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 11ee650..b7985fd 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -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
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 9e24e12..2beff93 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -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
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index e6b60cf..f2d6cdb 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -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
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index bf34740..2f4f967 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -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
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script
  2011-01-31 22:15 [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script Kumar Gala
@ 2011-01-31 22:37 ` Kumar Gala
  2011-01-31 22:52   ` Scott Wood
  0 siblings, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2011-01-31 22:37 UTC (permalink / raw)
  To: u-boot


On Jan 31, 2011, at 4:15 PM, Kumar Gala wrote:

> 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 <galak@kernel.crashing.org>
> ---
> 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

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script
  2011-01-31 22:37 ` Kumar Gala
@ 2011-01-31 22:52   ` Scott Wood
  2011-02-01  4:02     ` Kumar Gala
  2011-02-01  4:53     ` [U-Boot] [PATCH v2] " Kumar Gala
  0 siblings, 2 replies; 7+ messages in thread
From: Scott Wood @ 2011-01-31 22:52 UTC (permalink / raw)
  To: u-boot

On Mon, 31 Jan 2011 16:37:44 -0600
Kumar Gala <galak@kernel.crashing.org> 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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script
  2011-01-31 22:52   ` Scott Wood
@ 2011-02-01  4:02     ` Kumar Gala
  2011-02-01 16:20       ` Scott Wood
  2011-02-01  4:53     ` [U-Boot] [PATCH v2] " Kumar Gala
  1 sibling, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2011-02-01  4:02 UTC (permalink / raw)
  To: u-boot


On Jan 31, 2011, at 4:52 PM, Scott Wood wrote:

> On Mon, 31 Jan 2011 16:37:44 -0600
> Kumar Gala <galak@kernel.crashing.org> 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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2] powerpc/85xx: Remove config.mk for nand linker script
  2011-01-31 22:52   ` Scott Wood
  2011-02-01  4:02     ` Kumar Gala
@ 2011-02-01  4:53     ` Kumar Gala
  2011-02-10  5:17       ` Kumar Gala
  1 sibling, 1 reply; 7+ messages in thread
From: Kumar Gala @ 2011-02-01  4:53 UTC (permalink / raw)
  To: u-boot

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 <galak@kernel.crashing.org>
---
* 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

diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk
deleted file mode 100644
index 228d8c0..0000000
--- a/board/freescale/mpc8536ds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/mpc8569mds/config.mk b/board/freescale/mpc8569mds/config.mk
deleted file mode 100644
index 54b2eb1..0000000
--- a/board/freescale/mpc8569mds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk
deleted file mode 100644
index 9fd30f9..0000000
--- a/board/freescale/mpc8572ds/config.mk
+++ /dev/null
@@ -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
diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk
deleted file mode 100644
index 0769804..0000000
--- a/board/freescale/p1_p2_rdb/config.mk
+++ /dev/null
@@ -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
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index 11ee650..98b1427 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -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
diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h
index 9e24e12..b815ed0 100644
--- a/include/configs/MPC8569MDS.h
+++ b/include/configs/MPC8569MDS.h
@@ -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
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index bf2fdd6..4224229 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -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
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index bf34740..08ef985 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -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
-- 
1.7.2.3

^ permalink raw reply related	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script
  2011-02-01  4:02     ` Kumar Gala
@ 2011-02-01 16:20       ` Scott Wood
  0 siblings, 0 replies; 7+ messages in thread
From: Scott Wood @ 2011-02-01 16:20 UTC (permalink / raw)
  To: u-boot

On Mon, 31 Jan 2011 22:02:03 -0600
Kumar Gala <galak@kernel.crashing.org> wrote:

> 
> On Jan 31, 2011, at 4:52 PM, Scott Wood wrote:
> 
> > On Mon, 31 Jan 2011 16:37:44 -0600
> > Kumar Gala <galak@kernel.crashing.org> 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.

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

^ permalink raw reply	[flat|nested] 7+ messages in thread
* [U-Boot] [PATCH v2] powerpc/85xx: Remove config.mk for nand linker script
  2011-02-01  4:53     ` [U-Boot] [PATCH v2] " Kumar Gala
@ 2011-02-10  5:17       ` Kumar Gala
  0 siblings, 0 replies; 7+ messages in thread
From: Kumar Gala @ 2011-02-10  5:17 UTC (permalink / raw)
  To: u-boot


On Jan 31, 2011, at 10:53 PM, Kumar Gala wrote:

> 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 <galak@kernel.crashing.org>
> ---
> * 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

applied to 85xx next

- k

^ permalink raw reply	[flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-02-10  5:17 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-01-31 22:15 [U-Boot] [PATCH] powerpc/85xx: Remove config.mk for nand linker script Kumar Gala
2011-01-31 22:37 ` Kumar Gala
2011-01-31 22:52   ` Scott Wood
2011-02-01  4:02     ` Kumar Gala
2011-02-01 16:20       ` Scott Wood
2011-02-01  4:53     ` [U-Boot] [PATCH v2] " Kumar Gala
2011-02-10  5:17       ` Kumar Gala

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.