diff mbox

[U-Boot] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h

Message ID 1294824140-22519-1-git-send-email-galak@kernel.crashing.org
State Superseded
Delegated to: Kumar Gala
Headers show

Commit Message

Kumar Gala Jan. 12, 2011, 9:22 a.m. UTC 
Rather than defining it config.mk we can set it in config.h and remove
config.mk from several boards that don't need it.

We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for
config.h to set.

Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
---
 arch/powerpc/cpu/mpc85xx/u-boot.lds  |    8 +++++++-
 board/freescale/corenet_ds/config.mk |   27 ---------------------------
 board/freescale/mpc8536ds/config.mk  |   14 +-------------
 board/freescale/mpc8572ds/config.mk  |    2 --
 board/freescale/p1022ds/config.mk    |   10 ----------
 board/freescale/p1_p2_rdb/config.mk  |   12 ------------
 board/freescale/p2020ds/config.mk    |   26 --------------------------
 include/configs/MPC8536DS.h          |    6 ++++++
 include/configs/MPC8572DS.h          |    4 ++++
 include/configs/P1022DS.h            |    4 ++++
 include/configs/P1_P2_RDB.h          |    6 ++++++
 include/configs/P2020DS.h            |    4 ++++
 include/configs/corenet_ds.h         |    4 ++++
 13 files changed, 36 insertions(+), 91 deletions(-)
 delete mode 100644 board/freescale/corenet_ds/config.mk
 delete mode 100644 board/freescale/p1022ds/config.mk
 delete mode 100644 board/freescale/p2020ds/config.mk

Comments

Wolfgang Denk Jan. 12, 2011, 9:27 a.m. UTC | #1 
Dear Kumar Gala,

In message <1294824140-22519-1-git-send-email-galak@kernel.crashing.org> you wrote:
> Rather than defining it config.mk we can set it in config.h and remove
> config.mk from several boards that don't need it.
> 
> We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for
> config.h to set.
> 
> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>

What's this?  A resubmit of the previous posting? Or a new version?
With any changes? Which changes?



Best regards,

Wolfgang Denk
Kumar Gala Jan. 12, 2011, 3:40 p.m. UTC | #2 
On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote:

> Dear Kumar Gala,
> 
> In message <1294824140-22519-1-git-send-email-galak@kernel.crashing.org> you wrote:
>> Rather than defining it config.mk we can set it in config.h and remove
>> config.mk from several boards that don't need it.
>> 
>> We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for
>> config.h to set.
>> 
>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> 
> What's this?  A resubmit of the previous posting? Or a new version?
> With any changes? Which changes?
> 

SOrry, for got the 'v2' when I posted.

Its a new version that removes the extra ifdef checking around RESET_VECTOR_ADDRESS in u-boot.lds

- k
Wolfgang Denk Jan. 17, 2011, 10:46 p.m. UTC | #3 
Dear Kumar Gala,

In message <C1777A39-1166-4B3F-8484-8B193D0FC525@kernel.crashing.org> you wrote:
> 
> On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote:
>
> > Dear Kumar Gala,
> > 
> > In message > <1294824140-22519-1-git-send-email-galak@kernel.crashing.org> you wrote:
> >> Rather than defining it config.mk we can set it in config.h and > remove
> >> config.mk from several boards that don't need it.
> >> 
> >> We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for
> >> config.h to set.
> >> 
> >> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
> > 
> > What's this?  A resubmit of the previous posting? Or a new version?
> > With any changes? Which changes?
> > 
>
> SOrry, for got the 'v2' when I posted.
>
> Its a new version that removes the extra ifdef checking around
> RESET_VECTOR_ADDRESS in u-boot.lds

But it still has the "#ifndef RESET_VECTOR_ADDRESS" part where you
said it was not needed ?

Best regards,

Wolfgang Denk
Kumar Gala Jan. 17, 2011, 11:35 p.m. UTC | #4 
On Jan 17, 2011, at 4:46 PM, Wolfgang Denk wrote:

> Dear Kumar Gala,
> 
> In message <C1777A39-1166-4B3F-8484-8B193D0FC525@kernel.crashing.org> you wrote:
>> 
>> On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote:
>> 
>>> Dear Kumar Gala,
>>> 
>>> In message > <1294824140-22519-1-git-send-email-galak@kernel.crashing.org> you wrote:
>>>> Rather than defining it config.mk we can set it in config.h and > remove
>>>> config.mk from several boards that don't need it.
>>>> 
>>>> We mimic what 4xx does and introduce CONFIG_RESET_VECTOR_ADDRESS for
>>>> config.h to set.
>>>> 
>>>> Signed-off-by: Kumar Gala <galak@kernel.crashing.org>
>>> 
>>> What's this?  A resubmit of the previous posting? Or a new version?
>>> With any changes? Which changes?
>>> 
>> 
>> SOrry, for got the 'v2' when I posted.
>> 
>> Its a new version that removes the extra ifdef checking around
>> RESET_VECTOR_ADDRESS in u-boot.lds
> 
> But it still has the "#ifndef RESET_VECTOR_ADDRESS" part where you
> said it was not needed ?
> 
> Best regards,
> 
> Wolfgang Denk
> 
> -- 

Most have posted the wrong version.

- k
diff mbox

Patch

diff --git a/arch/powerpc/cpu/mpc85xx/u-boot.lds b/arch/powerpc/cpu/mpc85xx/u-boot.lds
index 67d7763..b931897 100644
--- a/arch/powerpc/cpu/mpc85xx/u-boot.lds
+++ b/arch/powerpc/cpu/mpc85xx/u-boot.lds
@@ -1,5 +1,5 @@ 
 /*
- * Copyright 2007-2009 Freescale Semiconductor, Inc.
+ * Copyright 2007-2009, 2011 Freescale Semiconductor, Inc.
  *
  * See file CREDITS for list of people who contributed to this
  * project.
@@ -20,9 +20,15 @@ 
  * MA 02111-1307 USA
  */
 
+#include "config.h"	/* CONFIG_BOARDDIR */
+
 #ifndef RESET_VECTOR_ADDRESS
+#ifdef CONFIG_RESET_VECTOR_ADDRESS
+#define RESET_VECTOR_ADDRESS	CONFIG_RESET_VECTOR_ADDRESS
+#else
 #define RESET_VECTOR_ADDRESS	0xfffffffc
 #endif
+#endif
 
 OUTPUT_ARCH(powerpc)
 
diff --git a/board/freescale/corenet_ds/config.mk b/board/freescale/corenet_ds/config.mk
deleted file mode 100644
index 15bbf20..0000000
--- a/board/freescale/corenet_ds/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@ 
-#
-# Copyright 2007-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
-#
-
-#
-# P4080DS board
-#
-
-RESET_VECTOR_ADDRESS = 0xeffffffc
diff --git a/board/freescale/mpc8536ds/config.mk b/board/freescale/mpc8536ds/config.mk
index b7deb4a..228d8c0 100644
--- a/board/freescale/mpc8536ds/config.mk
+++ b/board/freescale/mpc8536ds/config.mk
@@ -1,5 +1,5 @@ 
 #
-# Copyright 2008 Freescale Semiconductor.
+# Copyright 2008, 2011 Freescale Semiconductor.
 #
 # See file CREDITS for list of people who contributed to this
 # project.
@@ -28,15 +28,3 @@  ifeq ($(CONFIG_NAND), y)
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
-
-ifeq ($(CONFIG_SDCARD), y)
-RESET_VECTOR_ADDRESS = 0xf8fffffc
-endif
-
-ifeq ($(CONFIG_SPIFLASH), y)
-RESET_VECTOR_ADDRESS = 0xf8fffffc
-endif
-
-ifndef RESET_VECTOR_ADDRESS
-RESET_VECTOR_ADDRESS = 0xeffffffc
-endif
diff --git a/board/freescale/mpc8572ds/config.mk b/board/freescale/mpc8572ds/config.mk
index 7fd6412..53fda6f 100644
--- a/board/freescale/mpc8572ds/config.mk
+++ b/board/freescale/mpc8572ds/config.mk
@@ -28,5 +28,3 @@  ifeq ($(CONFIG_NAND), y)
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
-
-RESET_VECTOR_ADDRESS = 0xeffffffc
diff --git a/board/freescale/p1022ds/config.mk b/board/freescale/p1022ds/config.mk
deleted file mode 100644
index a953fdd..0000000
--- a/board/freescale/p1022ds/config.mk
+++ /dev/null
@@ -1,10 +0,0 @@ 
-#
-# Copyright 2010 Freescale Semiconductor, Inc.
-#
-# 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.
-#
-
-RESET_VECTOR_ADDRESS = 0xeffffffc
diff --git a/board/freescale/p1_p2_rdb/config.mk b/board/freescale/p1_p2_rdb/config.mk
index eececaa..d57b50e 100644
--- a/board/freescale/p1_p2_rdb/config.mk
+++ b/board/freescale/p1_p2_rdb/config.mk
@@ -29,15 +29,3 @@  ifeq ($(CONFIG_NAND), y)
 LDSCRIPT := $(TOPDIR)/$(CPUDIR)/u-boot-nand.lds
 endif
 endif
-
-ifeq ($(CONFIG_SDCARD), y)
-RESET_VECTOR_ADDRESS = 0xf8fffffc
-endif
-
-ifeq ($(CONFIG_SPIFLASH), y)
-RESET_VECTOR_ADDRESS = 0xf8fffffc
-endif
-
-ifndef RESET_VECTOR_ADDRESS
-RESET_VECTOR_ADDRESS = 0xeffffffc
-endif
diff --git a/board/freescale/p2020ds/config.mk b/board/freescale/p2020ds/config.mk
deleted file mode 100644
index f5c07e5..0000000
--- a/board/freescale/p2020ds/config.mk
+++ /dev/null
@@ -1,26 +0,0 @@ 
-#
-# Copyright 2007-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
-#
-
-#
-# p2020ds board
-#
-RESET_VECTOR_ADDRESS = 0xeffffffc
diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h
index d1ae35d..11ee650 100644
--- a/include/configs/MPC8536DS.h
+++ b/include/configs/MPC8536DS.h
@@ -47,17 +47,23 @@ 
 #ifdef CONFIG_SDCARD
 #define CONFIG_RAMBOOT_SDCARD		1
 #define CONFIG_SYS_TEXT_BASE	0xf8f80000
+#define CONFIG_RESET_VECTOR_ADDRESS	0xf8fffffc
 #endif
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RAMBOOT_SPIFLASH		1
 #define CONFIG_SYS_TEXT_BASE	0xf8f80000
+#define CONFIG_RESET_VECTOR_ADDRESS	0xf8fffffc
 #endif
 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE	0xeff80000
 #endif
 
+#ifndef	CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #ifndef CONFIG_SYS_MONITOR_BASE
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
 #endif
diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h
index ea15831..e6b60cf 100644
--- a/include/configs/MPC8572DS.h
+++ b/include/configs/MPC8572DS.h
@@ -48,6 +48,10 @@ 
 #define CONFIG_SYS_TEXT_BASE	0xeff80000
 #endif
 
+#ifndef CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #ifndef CONFIG_SYS_MONITOR_BASE
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
 #endif
diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h
index 2b8fc7d..f310768 100644
--- a/include/configs/P1022DS.h
+++ b/include/configs/P1022DS.h
@@ -26,6 +26,10 @@ 
 #define CONFIG_SYS_TEXT_BASE	0xeff80000
 #endif
 
+#ifndef CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #define CONFIG_FSL_ELBC			/* Has Enhanced localbus controller */
 #define CONFIG_PCI			/* Enable PCI/PCIE */
 #define CONFIG_PCIE1			/* PCIE controler 1 (slot 1) */
diff --git a/include/configs/P1_P2_RDB.h b/include/configs/P1_P2_RDB.h
index 80b0b40..d18d2f6 100644
--- a/include/configs/P1_P2_RDB.h
+++ b/include/configs/P1_P2_RDB.h
@@ -57,17 +57,23 @@ 
 #ifdef CONFIG_SDCARD
 #define CONFIG_RAMBOOT_SDCARD		1
 #define CONFIG_SYS_TEXT_BASE		0xf8f80000
+#define CONFIG_RESET_VECTOR_ADDRESS	0xf8fffffc
 #endif
 
 #ifdef CONFIG_SPIFLASH
 #define CONFIG_RAMBOOT_SPIFLASH		1
 #define CONFIG_SYS_TEXT_BASE		0xf8f80000
+#define CONFIG_RESET_VECTOR_ADDRESS	0xf8fffffc
 #endif
 
 #ifndef CONFIG_SYS_TEXT_BASE
 #define CONFIG_SYS_TEXT_BASE		0xeff80000
 #endif
 
+#ifndef CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #ifndef CONFIG_SYS_MONITOR_BASE
 #define CONFIG_SYS_MONITOR_BASE	CONFIG_SYS_TEXT_BASE	/* start of monitor */
 #endif
diff --git a/include/configs/P2020DS.h b/include/configs/P2020DS.h
index b6e3260..b32a997 100644
--- a/include/configs/P2020DS.h
+++ b/include/configs/P2020DS.h
@@ -45,6 +45,10 @@ 
 #define CONFIG_SYS_TEXT_BASE	0xeff80000
 #endif
 
+#ifndef CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #define CONFIG_SYS_SRIO
 #define CONFIG_SRIO1			/* SRIO port 1 */
 #define CONFIG_SRIO2			/* SRIO port 2 */
diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h
index 23bbd42..fa05baa 100644
--- a/include/configs/corenet_ds.h
+++ b/include/configs/corenet_ds.h
@@ -41,6 +41,10 @@ 
 #define CONFIG_SYS_TEXT_BASE	0xeff80000
 #endif
 
+#ifndef CONFIG_RESET_VECTOR_ADDRESS
+#define CONFIG_RESET_VECTOR_ADDRESS	0xeffffffc
+#endif
+
 #define CONFIG_SYS_FSL_CPC		/* Corenet Platform Cache */
 #define CONFIG_SYS_NUM_CPC		CONFIG_NUM_DDR_CONTROLLERS
 #define CONFIG_FSL_ELBC			/* Has Enhanced localbus controller */