diff for duplicates of <20100903185332.GC17152@pengutronix.de> diff --git a/a/1.txt b/N1/1.txt index ddd3c1f..4ad443d 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,24 +1,24 @@ Hello Eric, On Fri, Sep 03, 2010 at 09:39:45PM +0800, Eric Miao wrote: -> 2010/9/3 Uwe Kleine-König <u.kleine-koenig@pengutronix.de>: +> 2010/9/3 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>: > > The calculated value in Makefile.boot isn't used anymore since > > -> > e69edc79 (ARM: Auto calculate ZRELADDR and provide option for exceptions) +> > ? ? ? ?e69edc79 (ARM: Auto calculate ZRELADDR and provide option for exceptions) > > > > and physoffset can better be set in mach/memory.h depending on the > > actual machine type. > > > > Cc: Paul Mundt <lethal@linux-sh.org> > > Cc: Magnus Damm <magnus.damm@gmail.com> -> > Cc: linux-sh@vger.kernel.org -> > Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de> +> > Cc: linux-sh at vger.kernel.org +> > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de> > > --- -> > arch/arm/mach-shmobile/Kconfig | 11 ----------- -> > arch/arm/mach-shmobile/Makefile.boot | 9 --------- -> > arch/arm/mach-shmobile/include/mach/memory.h | 15 ++++++++++++++- -> > 3 files changed, 14 insertions(+), 21 deletions(-) -> > delete mode 100644 arch/arm/mach-shmobile/Makefile.boot +> > ?arch/arm/mach-shmobile/Kconfig ? ? ? ? ? ? ? | ? 11 ----------- +> > ?arch/arm/mach-shmobile/Makefile.boot ? ? ? ? | ? ?9 --------- +> > ?arch/arm/mach-shmobile/include/mach/memory.h | ? 15 ++++++++++++++- +> > ?3 files changed, 14 insertions(+), 21 deletions(-) +> > ?delete mode 100644 arch/arm/mach-shmobile/Makefile.boot > > > > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig > > index 54b479c..45e134e 100644 @@ -26,32 +26,32 @@ On Fri, Sep 03, 2010 at 09:39:45PM +0800, Eric Miao wrote: > > +++ b/arch/arm/mach-shmobile/Kconfig > > @@ -61,17 +61,6 @@ comment "SH-Mobile System Configuration" > > -> > menu "Memory configuration" +> > ?menu "Memory configuration" > > > > -config MEMORY_START -> > - hex "Physical memory start address" -> > - default "0x50000000" if MACH_G3EVM -> > - default "0x40000000" if MACH_G4EVM -> > - default "0x40000000" if MACH_AP4EVB -> > - default "0x00000000" -> > - ---help--- -> > - Tweak this only when porting to a new machine which does not -> > - already have a defconfig. Changing it from the known correct -> > - value on any of the known systems will only lead to disaster. +> > - ? ? ? hex "Physical memory start address" +> > - ? ? ? default "0x50000000" if MACH_G3EVM +> > - ? ? ? default "0x40000000" if MACH_G4EVM +> > - ? ? ? default "0x40000000" if MACH_AP4EVB +> > - ? ? ? default "0x00000000" +> > - ? ? ? ---help--- +> > - ? ? ? ? Tweak this only when porting to a new machine which does not +> > - ? ? ? ? already have a defconfig. Changing it from the known correct +> > - ? ? ? ? value on any of the known systems will only lead to disaster. > > - -> > config MEMORY_SIZE -> > hex "Physical memory size" -> > default "0x08000000" if MACH_G3EVM +> > ?config MEMORY_SIZE +> > ? ? ? ?hex "Physical memory size" +> > ? ? ? ?default "0x08000000" if MACH_G3EVM > > diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot > > deleted file mode 100644 > > index 1c08ee9..0000000 > > --- a/arch/arm/mach-shmobile/Makefile.boot > > +++ /dev/null > > @@ -1,9 +0,0 @@ -> > -__ZRELADDR := $(shell /bin/bash -c 'printf "0x%08x" \ -> > - $$[$(CONFIG_MEMORY_START) + 0x8000]') +> > -__ZRELADDR ? ? := $(shell /bin/bash -c 'printf "0x%08x" \ +> > - ? ? ? ? ? ? ? ? ? ?$$[$(CONFIG_MEMORY_START) + 0x8000]') > > - -> > - zreladdr-y := $(__ZRELADDR) +> > - ? zreladdr-y ? := $(__ZRELADDR) > > - > > -# Unsupported legacy stuff > > -# @@ -62,21 +62,21 @@ On Fri, Sep 03, 2010 at 09:39:45PM +0800, Eric Miao wrote: > > --- a/arch/arm/mach-shmobile/include/mach/memory.h > > +++ b/arch/arm/mach-shmobile/include/mach/memory.h > > @@ -1,7 +1,20 @@ -> > #ifndef __ASM_MACH_MEMORY_H -> > #define __ASM_MACH_MEMORY_H +> > ?#ifndef __ASM_MACH_MEMORY_H +> > ?#define __ASM_MACH_MEMORY_H > > -> > -#define PHYS_OFFSET UL(CONFIG_MEMORY_START) +> > -#define PHYS_OFFSET ? ?UL(CONFIG_MEMORY_START) > > +#define SH7367_PHYS_OFFSET UL(0x50000000) > > +#define SH7372_PHYS_OFFSET UL(0x40000000) > > +#define SH7377_PHYS_OFFSET UL(0x40000000) > > + > > +#if !defined(CONFIG_RUNTIME_PHYS_OFFSET) > > +# if defined(CONFIG_ARCH_SH7367) -> > +# define PHYS_OFFSET SH7367_PHYS_OFFSET +> > +# ?define PHYS_OFFSET ?SH7367_PHYS_OFFSET > > +# elif defined(CONFIG_ARCH_SH7372) -> > +# define PHYS_OFFSET SH7372_PHYS_OFFSET +> > +# ?define PHYS_OFFSET ?SH7372_PHYS_OFFSET > > +# elif defined(CONFIG_ARCH_SH7377) -> > +# define PHYS_OFFSET SH7377_PHYS_OFFSET +> > +# ?define PHYS_OFFSET ?SH7377_PHYS_OFFSET > > +# endif > > +#endif /* if !defined(CONFIG_RUNTIME_PHYS_OFFSET) */ > > + @@ -97,5 +97,5 @@ Best regards Uwe -- -Pengutronix e.K. | Uwe Kleine-König | +Pengutronix e.K. | Uwe Kleine-K?nig | Industrial Linux Solutions | http://www.pengutronix.de/ | diff --git a/a/content_digest b/N1/content_digest index b3cf3b2..c775899 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,33 +1,33 @@ "ref\020100903095504.GC13643@pengutronix.de\0" "ref\01283507818-1573-2-git-send-email-u.kleine-koenig@pengutronix.de\0" "ref\0AANLkTimV5MFqQ+r-uE2M3bVtEqtNfuxq+jkGdW-J8Bis@mail.gmail.com\0" - "From\0\0" - "Subject\0Re: [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to\0" - "Date\0Fri, 03 Sep 2010 18:53:32 +0000\0" + "From\0u.kleine-koenig@pengutronix.de (Uwe Kleine-K\303\266nig)\0" + "Subject\0[PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr\0" + "Date\0Fri, 3 Sep 2010 20:53:32 +0200\0" "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hello Eric,\n" "\n" "On Fri, Sep 03, 2010 at 09:39:45PM +0800, Eric Miao wrote:\n" - "> 2010/9/3 Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>:\n" + "> 2010/9/3 Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>:\n" "> > The calculated value in Makefile.boot isn't used anymore since\n" "> >\n" - "> > \302\240 \302\240 \302\240 \302\240e69edc79 (ARM: Auto calculate ZRELADDR and provide option for exceptions)\n" + "> > ? ? ? ?e69edc79 (ARM: Auto calculate ZRELADDR and provide option for exceptions)\n" "> >\n" "> > and physoffset can better be set in mach/memory.h depending on the\n" "> > actual machine type.\n" "> >\n" "> > Cc: Paul Mundt <lethal@linux-sh.org>\n" "> > Cc: Magnus Damm <magnus.damm@gmail.com>\n" - "> > Cc: linux-sh@vger.kernel.org\n" - "> > Signed-off-by: Uwe Kleine-K\303\266nig <u.kleine-koenig@pengutronix.de>\n" + "> > Cc: linux-sh at vger.kernel.org\n" + "> > Signed-off-by: Uwe Kleine-K?nig <u.kleine-koenig@pengutronix.de>\n" "> > ---\n" - "> > \302\240arch/arm/mach-shmobile/Kconfig \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 | \302\240 11 -----------\n" - "> > \302\240arch/arm/mach-shmobile/Makefile.boot \302\240 \302\240 \302\240 \302\240 | \302\240 \302\2409 ---------\n" - "> > \302\240arch/arm/mach-shmobile/include/mach/memory.h | \302\240 15 ++++++++++++++-\n" - "> > \302\2403 files changed, 14 insertions(+), 21 deletions(-)\n" - "> > \302\240delete mode 100644 arch/arm/mach-shmobile/Makefile.boot\n" + "> > ?arch/arm/mach-shmobile/Kconfig ? ? ? ? ? ? ? | ? 11 -----------\n" + "> > ?arch/arm/mach-shmobile/Makefile.boot ? ? ? ? | ? ?9 ---------\n" + "> > ?arch/arm/mach-shmobile/include/mach/memory.h | ? 15 ++++++++++++++-\n" + "> > ?3 files changed, 14 insertions(+), 21 deletions(-)\n" + "> > ?delete mode 100644 arch/arm/mach-shmobile/Makefile.boot\n" "> >\n" "> > diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig\n" "> > index 54b479c..45e134e 100644\n" @@ -35,32 +35,32 @@ "> > +++ b/arch/arm/mach-shmobile/Kconfig\n" "> > @@ -61,17 +61,6 @@ comment \"SH-Mobile System Configuration\"\n" "> >\n" - "> > \302\240menu \"Memory configuration\"\n" + "> > ?menu \"Memory configuration\"\n" "> >\n" "> > -config MEMORY_START\n" - "> > - \302\240 \302\240 \302\240 hex \"Physical memory start address\"\n" - "> > - \302\240 \302\240 \302\240 default \"0x50000000\" if MACH_G3EVM\n" - "> > - \302\240 \302\240 \302\240 default \"0x40000000\" if MACH_G4EVM\n" - "> > - \302\240 \302\240 \302\240 default \"0x40000000\" if MACH_AP4EVB\n" - "> > - \302\240 \302\240 \302\240 default \"0x00000000\"\n" - "> > - \302\240 \302\240 \302\240 ---help---\n" - "> > - \302\240 \302\240 \302\240 \302\240 Tweak this only when porting to a new machine which does not\n" - "> > - \302\240 \302\240 \302\240 \302\240 already have a defconfig. Changing it from the known correct\n" - "> > - \302\240 \302\240 \302\240 \302\240 value on any of the known systems will only lead to disaster.\n" + "> > - ? ? ? hex \"Physical memory start address\"\n" + "> > - ? ? ? default \"0x50000000\" if MACH_G3EVM\n" + "> > - ? ? ? default \"0x40000000\" if MACH_G4EVM\n" + "> > - ? ? ? default \"0x40000000\" if MACH_AP4EVB\n" + "> > - ? ? ? default \"0x00000000\"\n" + "> > - ? ? ? ---help---\n" + "> > - ? ? ? ? Tweak this only when porting to a new machine which does not\n" + "> > - ? ? ? ? already have a defconfig. Changing it from the known correct\n" + "> > - ? ? ? ? value on any of the known systems will only lead to disaster.\n" "> > -\n" - "> > \302\240config MEMORY_SIZE\n" - "> > \302\240 \302\240 \302\240 \302\240hex \"Physical memory size\"\n" - "> > \302\240 \302\240 \302\240 \302\240default \"0x08000000\" if MACH_G3EVM\n" + "> > ?config MEMORY_SIZE\n" + "> > ? ? ? ?hex \"Physical memory size\"\n" + "> > ? ? ? ?default \"0x08000000\" if MACH_G3EVM\n" "> > diff --git a/arch/arm/mach-shmobile/Makefile.boot b/arch/arm/mach-shmobile/Makefile.boot\n" "> > deleted file mode 100644\n" "> > index 1c08ee9..0000000\n" "> > --- a/arch/arm/mach-shmobile/Makefile.boot\n" "> > +++ /dev/null\n" "> > @@ -1,9 +0,0 @@\n" - "> > -__ZRELADDR \302\240 \302\240 := $(shell /bin/bash -c 'printf \"0x%08x\" \\\n" - "> > - \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240 \302\240$$[$(CONFIG_MEMORY_START) + 0x8000]')\n" + "> > -__ZRELADDR ? ? := $(shell /bin/bash -c 'printf \"0x%08x\" \\\n" + "> > - ? ? ? ? ? ? ? ? ? ?$$[$(CONFIG_MEMORY_START) + 0x8000]')\n" "> > -\n" - "> > - \302\240 zreladdr-y \302\240 := $(__ZRELADDR)\n" + "> > - ? zreladdr-y ? := $(__ZRELADDR)\n" "> > -\n" "> > -# Unsupported legacy stuff\n" "> > -#\n" @@ -71,21 +71,21 @@ "> > --- a/arch/arm/mach-shmobile/include/mach/memory.h\n" "> > +++ b/arch/arm/mach-shmobile/include/mach/memory.h\n" "> > @@ -1,7 +1,20 @@\n" - "> > \302\240#ifndef __ASM_MACH_MEMORY_H\n" - "> > \302\240#define __ASM_MACH_MEMORY_H\n" + "> > ?#ifndef __ASM_MACH_MEMORY_H\n" + "> > ?#define __ASM_MACH_MEMORY_H\n" "> >\n" - "> > -#define PHYS_OFFSET \302\240 \302\240UL(CONFIG_MEMORY_START)\n" + "> > -#define PHYS_OFFSET ? ?UL(CONFIG_MEMORY_START)\n" "> > +#define SH7367_PHYS_OFFSET UL(0x50000000)\n" "> > +#define SH7372_PHYS_OFFSET UL(0x40000000)\n" "> > +#define SH7377_PHYS_OFFSET UL(0x40000000)\n" "> > +\n" "> > +#if !defined(CONFIG_RUNTIME_PHYS_OFFSET)\n" "> > +# if defined(CONFIG_ARCH_SH7367)\n" - "> > +# \302\240define PHYS_OFFSET \302\240SH7367_PHYS_OFFSET\n" + "> > +# ?define PHYS_OFFSET ?SH7367_PHYS_OFFSET\n" "> > +# elif defined(CONFIG_ARCH_SH7372)\n" - "> > +# \302\240define PHYS_OFFSET \302\240SH7372_PHYS_OFFSET\n" + "> > +# ?define PHYS_OFFSET ?SH7372_PHYS_OFFSET\n" "> > +# elif defined(CONFIG_ARCH_SH7377)\n" - "> > +# \302\240define PHYS_OFFSET \302\240SH7377_PHYS_OFFSET\n" + "> > +# ?define PHYS_OFFSET ?SH7377_PHYS_OFFSET\n" "> > +# endif\n" "> > +#endif /* if !defined(CONFIG_RUNTIME_PHYS_OFFSET) */\n" "> > +\n" @@ -106,7 +106,7 @@ "Uwe\n" "\n" "-- \n" - "Pengutronix e.K. | Uwe Kleine-K\303\266nig |\n" + "Pengutronix e.K. | Uwe Kleine-K?nig |\n" Industrial Linux Solutions | http://www.pengutronix.de/ | -9a437d87a305337ec15d6fde3e0a062e680fba99e6e419af2be4aac6d3b54607 +b7c2494f67bb2e777efe08f24b01fd12632f5554427a225eab1426afa1fe5765
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.