To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Date: Fri, 03 Sep 2010 09:56:53 +0000 [thread overview] Message-ID: <1283507818-1573-2-git-send-email-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20100903095504.GC13643@pengutronix.de> The calculated value in Makefile.boot isn't used anymore since 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> --- 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 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -61,17 +61,6 @@ comment "SH-Mobile System 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. - 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-y := $(__ZRELADDR) - -# Unsupported legacy stuff -# -#params_phys-y (Instead: Pass atags pointer in r2) -#initrd_phys-y (Instead: Use compiled-in initramfs) diff --git a/arch/arm/mach-shmobile/include/mach/memory.h b/arch/arm/mach-shmobile/include/mach/memory.h index 377584e..100f734 100644 --- 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 -#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 +# elif defined(CONFIG_ARCH_SH7372) +# define PHYS_OFFSET SH7372_PHYS_OFFSET +# elif defined(CONFIG_ARCH_SH7377) +# define PHYS_OFFSET SH7377_PHYS_OFFSET +# endif +#endif /* if !defined(CONFIG_RUNTIME_PHYS_OFFSET) */ + #define MEM_SIZE UL(CONFIG_MEMORY_SIZE) /* DMA memory at 0xf6000000 - 0xffdfffff */ -- 1.7.1
WARNING: multiple messages have this Message-ID (diff)
From: u.kleine-koenig@pengutronix.de (Uwe Kleine-König) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Date: Fri, 3 Sep 2010 11:56:53 +0200 [thread overview] Message-ID: <1283507818-1573-2-git-send-email-u.kleine-koenig@pengutronix.de> (raw) In-Reply-To: <20100903095504.GC13643@pengutronix.de> The calculated value in Makefile.boot isn't used anymore since 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 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 diff --git a/arch/arm/mach-shmobile/Kconfig b/arch/arm/mach-shmobile/Kconfig index 54b479c..45e134e 100644 --- a/arch/arm/mach-shmobile/Kconfig +++ b/arch/arm/mach-shmobile/Kconfig @@ -61,17 +61,6 @@ comment "SH-Mobile System 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. - 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-y := $(__ZRELADDR) - -# Unsupported legacy stuff -# -#params_phys-y (Instead: Pass atags pointer in r2) -#initrd_phys-y (Instead: Use compiled-in initramfs) diff --git a/arch/arm/mach-shmobile/include/mach/memory.h b/arch/arm/mach-shmobile/include/mach/memory.h index 377584e..100f734 100644 --- 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 -#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 +# elif defined(CONFIG_ARCH_SH7372) +# define PHYS_OFFSET SH7372_PHYS_OFFSET +# elif defined(CONFIG_ARCH_SH7377) +# define PHYS_OFFSET SH7377_PHYS_OFFSET +# endif +#endif /* if !defined(CONFIG_RUNTIME_PHYS_OFFSET) */ + #define MEM_SIZE UL(CONFIG_MEMORY_SIZE) /* DMA memory at 0xf6000000 - 0xffdfffff */ -- 1.7.1
next prev parent reply other threads:[~2010-09-03 9:56 UTC|newest] Thread overview: 138+ messages / expand[flat|nested] mbox.gz Atom feed top 2010-06-03 7:36 [PATCH 0/5] Makefile.boot cleanup Eric Miao 2010-06-03 7:36 ` [PATCH 1/5] [ARM] Remove unused PARAMS_PHYS from arch/arm/boot/compressed Eric Miao 2010-06-10 8:48 ` Uwe Kleine-König 2010-06-03 7:36 ` [PATCH 2/5] [ARM] Remove unused INITRD_PHYS " Eric Miao 2010-06-10 8:27 ` Uwe Kleine-König 2010-06-10 9:55 ` Eric Miao 2010-06-03 7:36 ` [PATCH 3/5] [ARM] Make TEXT_OFFSET a configurable option Eric Miao 2010-06-10 8:50 ` Uwe Kleine-König 2010-06-10 9:45 ` Eric Miao 2010-06-10 10:00 ` Uwe Kleine-König 2010-06-03 7:36 ` [PATCH 4/5] [ARM] Auto calculate ZRELADDR and provide option for exceptions Eric Miao 2010-06-07 8:51 ` Tony Lindgren 2010-06-07 15:12 ` Marek Vasut 2010-06-08 6:12 ` Eric Miao 2010-06-10 9:00 ` Uwe Kleine-König 2010-06-10 9:16 ` Russell King - ARM Linux 2010-06-10 9:35 ` Uwe Kleine-König 2010-06-10 9:38 ` Eric Miao 2010-06-10 9:43 ` Uwe Kleine-König 2010-06-10 9:47 ` Eric Miao 2010-06-10 9:18 ` Eric Miao 2010-06-10 9:58 ` Uwe Kleine-König 2010-06-10 10:20 ` Eric Miao 2010-06-10 22:06 ` Linus Walleij 2010-06-10 22:23 ` Linus Walleij 2010-06-11 1:34 ` Eric Miao 2010-06-10 18:40 ` Nicolas Pitre 2010-06-10 22:17 ` Linus Walleij 2010-06-11 6:37 ` Uwe Kleine-König 2010-06-17 19:33 ` Russell King - ARM Linux 2010-06-11 4:27 ` srinidhi 2010-09-02 21:21 ` Russell King - ARM Linux 2010-09-02 21:27 ` Russell King - ARM Linux 2010-09-03 7:48 ` Uwe Kleine-König 2010-09-03 9:55 ` Uwe Kleine-König 2010-09-03 9:56 ` [PATCH 1/7] ARM: specify ZRELADDR for ARCH_TEGRA Uwe Kleine-König 2010-09-03 17:46 ` Erik Gilling 2010-09-03 19:01 ` Uwe Kleine-König 2010-09-03 19:19 ` Erik Gilling 2010-09-03 19:23 ` Uwe Kleine-König 2010-09-08 9:11 ` Russell King - ARM Linux 2010-09-08 11:56 ` Russell King - ARM Linux 2010-09-08 12:16 ` Uwe Kleine-König 2010-09-08 22:07 ` Russell King - ARM Linux 2010-09-09 7:24 ` Uwe Kleine-König 2010-09-09 16:56 ` Erik Gilling 2010-09-03 9:56 ` [this message] 2010-09-03 9:56 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Uwe Kleine-König 2010-09-03 13:39 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to Eric Miao 2010-09-03 13:39 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Eric Miao 2010-09-03 18:53 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to 2010-09-03 18:53 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Uwe Kleine-König 2010-09-14 8:08 ` Paul Mundt 2010-09-14 8:08 ` Paul Mundt 2010-09-14 12:23 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to 2010-09-14 12:23 ` [PATCH 2/7] [RFC] ARM: shmobile: remove unneeded hack to calculate zreladdr Uwe Kleine-König 2010-09-03 9:56 ` [PATCH 3/7] ARM: specify ZRELADDR for ARCH_H720X Uwe Kleine-König 2010-09-03 13:40 ` Eric Miao 2010-09-03 9:56 ` [PATCH 4/7] ARM: specify ZRELADDR for ARCH_LPC32XX Uwe Kleine-König 2010-09-03 13:41 ` Eric Miao 2010-09-03 9:56 ` [PATCH 5/7] ARM: don't expose CONFIG_ZRELADDR to the users Uwe Kleine-König 2010-09-03 13:30 ` Eric Miao 2010-09-03 18:53 ` Uwe Kleine-König 2010-09-04 8:52 ` Eric Miao 2010-09-07 22:39 ` Mathieu Rondonneau 2010-09-08 5:04 ` Uwe Kleine-König 2010-09-03 9:56 ` [PATCH 6/7] ARM: fix ordering of defaults for config ZRELADDR Uwe Kleine-König 2010-09-03 9:56 ` [PATCH 7/7] ARM: removed unused zreladdr specifications in all Makefile.boot files Uwe Kleine-König 2010-09-03 15:01 ` Eric Miao 2010-09-03 18:48 ` [PATCH 7/7 v2] " Uwe Kleine-König 2010-09-03 20:46 ` [PATCH 4/5] [ARM] Auto calculate ZRELADDR and provide option for exceptions Uwe Kleine-König 2010-09-05 18:52 ` Uwe Kleine-König 2010-09-08 9:14 ` Russell King - ARM Linux 2010-09-08 9:11 ` Russell King - ARM Linux 2010-09-08 20:31 ` Robert Schwebel 2010-09-03 13:33 ` Eric Miao 2010-06-03 7:36 ` [PATCH 5/5] [ARM] Move inclusion of Makefile.boot into arch/arm/boot/bootp Eric Miao 2010-06-10 9:01 ` Uwe Kleine-König 2010-06-03 7:43 ` [PATCH 0/5] Makefile.boot cleanup Eric Miao 2010-06-03 8:00 ` Uwe Kleine-König 2010-06-03 8:27 ` Eric Miao 2010-06-03 7:57 ` Uwe Kleine-König 2010-06-10 18:44 ` Nicolas Pitre 2010-06-11 4:55 ` Uwe Kleine-König 2010-06-17 19:22 ` Nicolas Pitre 2010-06-18 1:31 ` Eric Miao 2010-06-18 2:30 ` Eric Miao 2010-06-10 10:24 ` [PATCH 0/10] cleanup in early boot code Uwe Kleine-König 2010-06-10 10:27 ` [PATCH 01/10] arm/zImage: don't hard code the stack size twice Uwe Kleine-König 2010-06-10 10:31 ` Eric Miao 2010-06-10 18:47 ` Nicolas Pitre 2010-06-10 10:27 ` [PATCH 02/10] arm/zImage: some comments for __armv3_mpu_cache_on Uwe Kleine-König 2010-06-10 21:36 ` Sergei Shtylyov 2010-06-16 3:16 ` Eric Miao 2010-06-16 9:19 ` Russell King - ARM Linux 2010-06-10 10:27 ` [PATCH 03/10] arm/zImage: __armv3_mpu_cache_flush: respect should-be-zero specification Uwe Kleine-König 2010-06-11 1:23 ` Eric Miao 2010-06-10 10:27 ` [PATCH 04/10] arm/zImage: fix comments for cache_on, cache_off and cache_clean_flush Uwe Kleine-König 2010-06-17 9:28 ` Eric Miao 2010-06-10 10:27 ` [PATCH 05/10] arm/zImage: annotate debug functions about corrupted registers Uwe Kleine-König 2010-06-17 9:37 ` Eric Miao 2010-06-17 9:49 ` Uwe Kleine-König 2010-06-10 10:27 ` [PATCH 06/10] arm: remove bit-rotten STANDALONE_DEBUG for decompressor Uwe Kleine-König 2010-06-17 9:50 ` Eric Miao 2010-06-10 10:27 ` [PATCH 07/10] arm/zImage: don't define unused symbol initrd_phys Uwe Kleine-König 2010-06-17 9:19 ` Eric Miao 2010-06-10 10:27 ` [PATCH 08/10] arm: deprecate support for old way to pass kernel parameters Uwe Kleine-König 2010-06-17 9:58 ` Eric Miao 2010-06-17 23:00 ` Russell King - ARM Linux 2010-06-10 10:27 ` [PATCH 09/10] arm/uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET Uwe Kleine-König 2010-06-10 10:27 ` [PATCH 10/10] arm: Allow PHYS_OFFSET to be runtime determined Uwe Kleine-König 2010-06-10 10:28 ` [PATCH 0/10] cleanup in early boot code Eric Miao 2010-07-05 14:13 ` [PATCH 0/5] Makefile.boot cleanup Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 01/11] ARM: zImage: don't hard code the stack size twice Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 02/11] ARM: zImage: some comments for __armv3_mpu_cache_on Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 03/11] ARM: zImage: __armv3_mpu_cache_flush: respect should-be-zero specification Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 04/11] ARM: zImage: fix comments for cache_on, cache_off and cache_clean_flush Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 05/11] ARM: zImage: annotate debug functions about corrupted registers Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 06/11] ARM: remove bit-rotten STANDALONE_DEBUG for decompressor Uwe Kleine-König 2010-07-05 15:36 ` Nicolas Pitre 2010-07-05 14:15 ` [PATCH 07/11] ARM: zImage: don't define unused symbol initrd_phys Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 08/11] ARM: deprecate support for old way to pass kernel parameters Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 09/11] ARM: uImage: require passing a LOADADDR when building with RUNTIME_PHYSOFFSET Uwe Kleine-König 2010-07-05 16:03 ` Nicolas Pitre 2010-07-05 14:15 ` [PATCH 10/11] ARM: Remove unused PARAMS_PHYS from arch/arm/boot/compressed Uwe Kleine-König 2010-07-05 14:15 ` [PATCH 11/11] Auto calculate ZRELADDR and provide option for exceptions Uwe Kleine-König 2010-07-05 15:31 ` Nicolas Pitre 2010-07-06 2:09 ` Eric Miao 2010-07-31 15:54 ` Russell King - ARM Linux 2010-07-31 17:44 ` Nicolas Pitre 2010-08-02 8:42 ` [PATCH] ARM: don't expose CONFIG_ZRELADDR to the users Uwe Kleine-König 2010-07-07 14:45 ` [PATCH 0/5] Makefile.boot cleanup Uwe Kleine-König 2010-07-07 15:54 ` Nicolas Pitre 2010-07-08 7:08 ` Uwe Kleine-König 2010-07-08 20:49 ` Nicolas Pitre 2010-07-10 9:16 ` Eric Miao 2010-07-21 8:20 ` Uwe Kleine-König 2010-07-29 16:17 ` Git pull request, was " Nicolas Pitre
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=1283507818-1573-2-git-send-email-u.kleine-koenig@pengutronix.de \ --to=linux-arm-kernel@lists.infradead.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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.