Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
On Jan 17, 2011, at 4:46 PM, Wolfgang Denk wrote: > Dear Kumar Gala, > > In message you > wrote: >> >> On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote: >> >>> Dear Kumar Gala, >>> >>> In message > <1294824140-22519-1-git-send-email-ga...@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 >>> >>> 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
Dear Kumar Gala, In message you wrote: > > On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote: > > > Dear Kumar Gala, > > > > In message > <1294824140-22519-1-git-send-email-ga...@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 > > > > 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 -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Prepare for tomorrow -- get ready. -- Edith Keeler, "The City On the Edge of Forever", stardate unknown ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
On Jan 12, 2011, at 3:27 AM, Wolfgang Denk wrote: > Dear Kumar Gala, > > In message <1294824140-22519-1-git-send-email-ga...@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 > > 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 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
Dear Kumar Gala, In message <1294824140-22519-1-git-send-email-ga...@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 What's this? A resubmit of the previous posting? Or a new version? With any changes? Which changes? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Insufficient facts always invite danger. -- Spock, "Space Seed", stardate 3141.9 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
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 --- 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 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 0xfffc #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..000 --- 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 = 0xeffc 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 = 0xf8fc -endif - -ifeq ($(CONFIG_SPIFLASH), y) -RESET_VECTOR_ADDRESS = 0xf8fc -endif - -ifndef RESET_VECTOR_ADDRESS -RESET_VECTOR_ADDRESS = 0xeffc -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 = 0xeffc diff --git a/board/freescale/p1022ds/config.mk b/board/freescale/p1022ds/config.mk deleted file mode 100644 index a953fdd..000 --- 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 = 0xeffc 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
Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
On Jan 12, 2011, at 2:59 AM, Wolfgang Denk wrote: > Dear Kumar Gala, > > In message <1294822268-22266-1-git-send-email-ga...@kernel.crashing.org> you > wrote: >> >> #ifndef RESET_VECTOR_ADDRESS >> +#ifdef CONFIG_RESET_VECTOR_ADDRESS >> +#define RESET_VECTOR_ADDRESSCONFIG_RESET_VECTOR_ADDRESS >> +#else >> #define RESET_VECTOR_ADDRESS 0xfffc >> #endif >> +#endif > > In which case is the "#ifndef RESET_VECTOR_ADDRESS" needed? I don't think there is any, I was mimicing what is in the 4xx/u-boot.lds - k ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
Dear Kumar Gala, In message <1294822268-22266-1-git-send-email-ga...@kernel.crashing.org> you wrote: > > #ifndef RESET_VECTOR_ADDRESS > +#ifdef CONFIG_RESET_VECTOR_ADDRESS > +#define RESET_VECTOR_ADDRESS CONFIG_RESET_VECTOR_ADDRESS > +#else > #define RESET_VECTOR_ADDRESS 0xfffc > #endif > +#endif In which case is the "#ifndef RESET_VECTOR_ADDRESS" needed? Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: w...@denx.de Severe culture shock results when experts from another protocol suite [...] try to read OSI documents. The term "osified" is used to refer to such documents. [...] Any relationship to the word "ossified" is purely intentional.- Marshall T. Rose ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH] powerpc/85xx: Move RESET_VECTOR_ADDRESS into config.h
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 --- 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 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 0xfffc #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..000 --- 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 = 0xeffc 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 = 0xf8fc -endif - -ifeq ($(CONFIG_SPIFLASH), y) -RESET_VECTOR_ADDRESS = 0xf8fc -endif - -ifndef RESET_VECTOR_ADDRESS -RESET_VECTOR_ADDRESS = 0xeffc -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 = 0xeffc diff --git a/board/freescale/p1022ds/config.mk b/board/freescale/p1022ds/config.mk deleted file mode 100644 index a953fdd..000 --- 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 = 0xeffc 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