Patchwork [U-Boot,2/2,NEXT] Move LDSCRIPT definitions to board config files.

login
register
mail settings
Submitter Wolfgang Denk
Date Nov. 28, 2010, 8:18 p.m.
Message ID <1290975538-18561-2-git-send-email-wd@denx.de>
Download mbox | patch
Permalink /patch/73351/
State Accepted
Commit 2ced53e1ad552a7a192b2f3c9671e60eb668ecfa
Headers show

Comments

Wolfgang Denk - Nov. 28, 2010, 8:18 p.m.
Recent cleanup actions resulted in a number of config.mk files that
contained only LDSCRIPT definitions.  Move these into th respective
board config files and remove the now empty config.mk files.

Signed-off-by: Wolfgang Denk <wd@denx.de>
Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
Cc: Detlev Zundel <dzu@denx.de>
Cc: Heiko Schocher <hs@denx.de>
Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
Cc: Peter De Schrijver <p2@mind.be>
---
 board/amirix/ap1000/config.mk       |   25 -------------------------
 board/esd/dasa_sim/config.mk        |   25 -------------------------
 board/inka4x0/config.mk             |   27 ---------------------------
 board/manroland/uc101/config.mk     |   24 ------------------------
 board/matrix_vision/mvsmr/config.mk |   24 ------------------------
 board/ml2/config.mk                 |   25 -------------------------
 board/mousse/config.mk              |   27 ---------------------------
 board/rsdproto/config.mk            |   28 ----------------------------
 include/configs/AP1000.h            |    1 +
 include/configs/DASA_SIM.h          |    1 +
 include/configs/ML2.h               |    1 +
 include/configs/MOUSSE.h            |    1 +
 include/configs/MVSMR.h             |    1 +
 include/configs/inka4x0.h           |    1 +
 include/configs/rsdproto.h          |    1 +
 include/configs/uc101.h             |    1 +
 16 files changed, 8 insertions(+), 205 deletions(-)
 delete mode 100644 board/amirix/ap1000/config.mk
 delete mode 100644 board/esd/dasa_sim/config.mk
 delete mode 100644 board/inka4x0/config.mk
 delete mode 100644 board/manroland/uc101/config.mk
 delete mode 100644 board/matrix_vision/mvsmr/config.mk
 delete mode 100644 board/ml2/config.mk
 delete mode 100644 board/mousse/config.mk
 delete mode 100644 board/rsdproto/config.mk
Detlev Zundel - Nov. 29, 2010, 12:43 p.m.
Hi Wolfgang,

> Recent cleanup actions resulted in a number of config.mk files that
> contained only LDSCRIPT definitions.  Move these into th respective
> board config files and remove the now empty config.mk files.
>
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
> Cc: Peter De Schrijver <p2@mind.be>

Acked-by: Detlev Zundel < dzu@denx.de>

Cheers
  Detlev
Andre Schwarz - Nov. 30, 2010, 9:31 a.m.
> Recent cleanup actions resulted in a number of config.mk files that
> contained only LDSCRIPT definitions.  Move these into th respective
> board config files and remove the now empty config.mk files.
>
> Signed-off-by: Wolfgang Denk<wd@denx.de>
> Cc: Matthias Fuchs<matthias.fuchs@esd-electronics.com>
> Cc: Detlev Zundel<dzu@denx.de>
> Cc: Heiko Schocher<hs@denx.de>
> Cc: Andre Schwarz<andre.schwarz@matrix-vision.de>
> Cc: Peter De Schrijver<p2@mind.be>
> ---
Acked-by: Andre Schwarz <andre.schwarz@matrix-vision.de>


Regards,
André

MATRIX VISION GmbH, Talstrasse 16, DE-71570 Oppenweiler
Registergericht: Amtsgericht Stuttgart, HRB 271090
Geschaeftsfuehrer: Gerhard Thullner, Werner Armingeon, Uwe Furtner
Heiko Schocher - Dec. 1, 2010, 6:26 a.m.
Hello Wolfgang,

Wolfgang Denk wrote:
> Recent cleanup actions resulted in a number of config.mk files that
> contained only LDSCRIPT definitions.  Move these into th respective
> board config files and remove the now empty config.mk files.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
> Cc: Peter De Schrijver <p2@mind.be>
> ---


Thanks!

Acked-by: Heiko Schocher<hs@denx.de>

bye,
Heiko
Matthias Fuchs - Dec. 1, 2010, 7:27 a.m.
Hi Wolfgang,

On Sunday 28 November 2010 21:18, Wolfgang Denk wrote:
> Recent cleanup actions resulted in a number of config.mk files that
> contained only LDSCRIPT definitions.  Move these into th respective
> board config files and remove the now empty config.mk files.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
> Cc: Peter De Schrijver <p2@mind.be>
> ---

thanks for maintenance.

Acked-by: Matthias Fuchs <matthias.fuchs@esd.eu>

Matthias
Wolfgang Denk - Dec. 9, 2010, 9:28 a.m.
Dear Wolfgang Denk,

In message <1290975538-18561-2-git-send-email-wd@denx.de> you wrote:
> Recent cleanup actions resulted in a number of config.mk files that
> contained only LDSCRIPT definitions.  Move these into th respective
> board config files and remove the now empty config.mk files.
> 
> Signed-off-by: Wolfgang Denk <wd@denx.de>
> Cc: Matthias Fuchs <matthias.fuchs@esd-electronics.com>
> Cc: Detlev Zundel <dzu@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> Cc: Andre Schwarz <andre.schwarz@matrix-vision.de>
> Cc: Peter De Schrijver <p2@mind.be>
> ---
>  board/amirix/ap1000/config.mk       |   25 -------------------------
>  board/esd/dasa_sim/config.mk        |   25 -------------------------
>  board/inka4x0/config.mk             |   27 ---------------------------
>  board/manroland/uc101/config.mk     |   24 ------------------------
>  board/matrix_vision/mvsmr/config.mk |   24 ------------------------
>  board/ml2/config.mk                 |   25 -------------------------
>  board/mousse/config.mk              |   27 ---------------------------
>  board/rsdproto/config.mk            |   28 ----------------------------
>  include/configs/AP1000.h            |    1 +
>  include/configs/DASA_SIM.h          |    1 +
>  include/configs/ML2.h               |    1 +
>  include/configs/MOUSSE.h            |    1 +
>  include/configs/MVSMR.h             |    1 +
>  include/configs/inka4x0.h           |    1 +
>  include/configs/rsdproto.h          |    1 +
>  include/configs/uc101.h             |    1 +
>  16 files changed, 8 insertions(+), 205 deletions(-)
>  delete mode 100644 board/amirix/ap1000/config.mk
>  delete mode 100644 board/esd/dasa_sim/config.mk
>  delete mode 100644 board/inka4x0/config.mk
>  delete mode 100644 board/manroland/uc101/config.mk
>  delete mode 100644 board/matrix_vision/mvsmr/config.mk
>  delete mode 100644 board/ml2/config.mk
>  delete mode 100644 board/mousse/config.mk
>  delete mode 100644 board/rsdproto/config.mk

Applied to next.

Best regards,

Wolfgang Denk

Patch

diff --git a/board/amirix/ap1000/config.mk b/board/amirix/ap1000/config.mk
deleted file mode 100644
index 2d075b6..0000000
--- a/board/amirix/ap1000/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@ 
-#
-# (C) Copyright 2000
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-# Use board specific linker script
-LDSCRIPT := $(SRCTREE)/board/amirix/ap1000/u-boot.lds
diff --git a/board/esd/dasa_sim/config.mk b/board/esd/dasa_sim/config.mk
deleted file mode 100644
index a92d9a9..0000000
--- a/board/esd/dasa_sim/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@ 
-#
-# (C) Copyright 2000
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-# Use board specific linker script
-LDSCRIPT := $(SRCTREE)/board/esd/dasa_sim/u-boot.lds
diff --git a/board/inka4x0/config.mk b/board/inka4x0/config.mk
deleted file mode 100644
index a42d124..0000000
--- a/board/inka4x0/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@ 
-#
-# (C) Copyright 2004
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-#
-# INKA 4X0 board:
-#
-LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/manroland/uc101/config.mk b/board/manroland/uc101/config.mk
deleted file mode 100644
index 54dc1c4..0000000
--- a/board/manroland/uc101/config.mk
+++ /dev/null
@@ -1,24 +0,0 @@ 
-#
-# (C) Copyright 2004
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-LDSCRIPT := $(SRCTREE)/arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds
diff --git a/board/matrix_vision/mvsmr/config.mk b/board/matrix_vision/mvsmr/config.mk
deleted file mode 100644
index d5308d9..0000000
--- a/board/matrix_vision/mvsmr/config.mk
+++ /dev/null
@@ -1,24 +0,0 @@ 
-#
-# (C) Copyright 2003-2010
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-LDSCRIPT := $(SRCTREE)/board/matrix_vision/mvsmr/u-boot.lds
diff --git a/board/ml2/config.mk b/board/ml2/config.mk
deleted file mode 100644
index 06ba43f..0000000
--- a/board/ml2/config.mk
+++ /dev/null
@@ -1,25 +0,0 @@ 
-#
-# (C) Copyright 2000
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-# Use board specific linker script
-LDSCRIPT := $(SRCTREE)/board/ml2/u-boot.lds
diff --git a/board/mousse/config.mk b/board/mousse/config.mk
deleted file mode 100644
index a69215b..0000000
--- a/board/mousse/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@ 
-#
-# (C) Copyright 2001
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-#
-# MOUSSE boards
-#
-LDSCRIPT := $(SRCTREE)/board/mousse/u-boot.lds
diff --git a/board/rsdproto/config.mk b/board/rsdproto/config.mk
deleted file mode 100644
index 9617f08..0000000
--- a/board/rsdproto/config.mk
+++ /dev/null
@@ -1,28 +0,0 @@ 
-#
-# (C) Copyright 2000
-# Sysgo Real-Time Solutions, GmbH <www.elinos.com>
-# Marius Groeger <mgroeger@sysgo.de>
-#
-# (C) Copyright 2000
-# Wolfgang Denk, DENX Software Engineering, wd@denx.de.
-#
-# 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
-#
-
-LDSCRIPT := $(SRCTREE)/board/rsdproto/u-boot.lds
diff --git a/include/configs/AP1000.h b/include/configs/AP1000.h
index ffaab79..37dd757 100644
--- a/include/configs/AP1000.h
+++ b/include/configs/AP1000.h
@@ -33,6 +33,7 @@ 
  * run from RAM instead of Flash.
  */
 #define	CONFIG_SYS_TEXT_BASE	0x08000000
+#define CONFIG_SYS_LDSCRIPT	"board/amirix/ap1000/u-boot.lds"
 
 #define CONFIG_PCI	1
 
diff --git a/include/configs/DASA_SIM.h b/include/configs/DASA_SIM.h
index 3706071..53229d9 100644
--- a/include/configs/DASA_SIM.h
+++ b/include/configs/DASA_SIM.h
@@ -37,6 +37,7 @@ 
 #define CONFIG_DASA_SIM		1	/* ...on a DASA_SIM board	*/
 
 #define	CONFIG_SYS_TEXT_BASE	0xFFFC0000
+#define CONFIG_SYS_LDSCRIPT	"board/esd/dasa_sim/u-boot.lds"
 
 #define CONFIG_BOARD_EARLY_INIT_F 1	/* call board_early_init_f()	*/
 
diff --git a/include/configs/ML2.h b/include/configs/ML2.h
index 1e96b9e..4df9f4c 100644
--- a/include/configs/ML2.h
+++ b/include/configs/ML2.h
@@ -31,6 +31,7 @@ 
 #define CONFIG_ML2	1	/* ...on a ML2 board	*/
 
 #define	CONFIG_SYS_TEXT_BASE	0x18000000
+#define CONFIG_SYS_LDSCRIPT	"board/ml2/u-boot.lds"
 
 #define CONFIG_ENV_IS_IN_FLASH     1
 
diff --git a/include/configs/MOUSSE.h b/include/configs/MOUSSE.h
index 9529c87..c809a6b 100644
--- a/include/configs/MOUSSE.h
+++ b/include/configs/MOUSSE.h
@@ -50,6 +50,7 @@ 
 #define CONFIG_MOUSSE       1
 
 #define	CONFIG_SYS_TEXT_BASE	0xFFF00000
+#define	CONFIG_SYS_LDSCRIPT	"board/mousse/u-boot.lds"
 
 #define CONFIG_SYS_ADDR_MAP_B      1
 
diff --git a/include/configs/MVSMR.h b/include/configs/MVSMR.h
index f7fd9b2..f94ad5c 100644
--- a/include/configs/MVSMR.h
+++ b/include/configs/MVSMR.h
@@ -35,6 +35,7 @@ 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xFF800000
 #endif
+#define CONFIG_SYS_LDSCRIPT	"board/matrix_vision/mvsmr/u-boot.lds"
 
 #define CONFIG_SYS_MPC5XXX_CLKIN	33000000
 
diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h
index 9b116e6..b19d544 100644
--- a/include/configs/inka4x0.h
+++ b/include/configs/inka4x0.h
@@ -44,6 +44,7 @@ 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xFFE00000	/* Standard: boot low */
 #endif
+#define CONFIG_SYS_LDSCRIPT	"arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds"
 
 #define CONFIG_SYS_MPC5XXX_CLKIN	33000000 /* ... running at 33.000000MHz		*/
 
diff --git a/include/configs/rsdproto.h b/include/configs/rsdproto.h
index 5761f20..2ed189e 100644
--- a/include/configs/rsdproto.h
+++ b/include/configs/rsdproto.h
@@ -40,6 +40,7 @@ 
 #define CONFIG_CPM2		1	/* Has a CPM2 */
 
 #define	CONFIG_SYS_TEXT_BASE	0xff000000
+#define	CONFIG_SYS_LDSCRIPT	"board/rsdproto/u-boot.lds"
 
 #define	CONFIG_MISC_INIT_F	1	/* Use misc_init_f()		*/
 
diff --git a/include/configs/uc101.h b/include/configs/uc101.h
index 483534c..f136691 100644
--- a/include/configs/uc101.h
+++ b/include/configs/uc101.h
@@ -35,6 +35,7 @@ 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xFFF00000
 #endif
+#define CONFIG_SYS_LDSCRIPT	"arch/powerpc/cpu/mpc5xxx/u-boot-customlayout.lds"
 
 #include "manroland/common.h"
 #include "manroland/mpc5200-common.h"