From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v5 1/7] powerpc: Extract EPAPR_MAGIC constants into processor.h
Date: Tue, 23 Oct 2012 10:28:29 +0200 [thread overview]
Message-ID: <1350980915-27940-2-git-send-email-sr@denx.de> (raw)
In-Reply-To: <1350980915-27940-1-git-send-email-sr@denx.de>
By extracting these defines into a header, they can be re-used by other
C sources as well. This will be done by the SPL framework OS boot
support.
Signed-off-by: Stefan Roese <sr@denx.de>
---
arch/powerpc/include/asm/processor.h | 6 ++++++
arch/powerpc/lib/bootm.c | 6 ------
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/arch/powerpc/include/asm/processor.h b/arch/powerpc/include/asm/processor.h
index 7aa3231..19fe250 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -1342,4 +1342,10 @@ void _nmask_and_or_msr(unsigned long nmask, unsigned long or_val);
#endif
#endif /* CONFIG_MACH_SPECIFIC */
+#if defined(CONFIG_MPC85xx) || defined(CONFIG_440)
+ #define EPAPR_MAGIC (0x45504150)
+#else
+ #define EPAPR_MAGIC (0x65504150)
+#endif
+
#endif /* __ASM_PPC_PROCESSOR_H */
diff --git a/arch/powerpc/lib/bootm.c b/arch/powerpc/lib/bootm.c
index 53dc4df..e3fee0b 100644
--- a/arch/powerpc/lib/bootm.c
+++ b/arch/powerpc/lib/bootm.c
@@ -87,12 +87,6 @@ static void boot_jump_linux(bootm_headers_t *images)
* r8: 0
* r9: 0
*/
-#if defined(CONFIG_MPC85xx) || defined(CONFIG_440)
- #define EPAPR_MAGIC (0x45504150)
-#else
- #define EPAPR_MAGIC (0x65504150)
-#endif
-
debug (" Booting using OF flat tree...\n");
WATCHDOG_RESET ();
(*kernel) ((bd_t *)of_flat_tree, 0, 0, EPAPR_MAGIC,
--
1.8.0
next prev parent reply other threads:[~2012-10-23 8:28 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-23 8:28 [U-Boot] [PATCH v5 0/7] SPL: Port SPL framework to powerpc Stefan Roese
2012-10-23 8:28 ` Stefan Roese [this message]
2012-10-29 20:55 ` [U-Boot] [PATCH v5 1/7] powerpc: Extract EPAPR_MAGIC constants into processor.h Tom Rini
2012-10-30 7:28 ` Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 2/7] SPL: Port SPL framework to powerpc Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 3/7] env: Enable getenv_f() for SPL_BUILD Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 4/7] mpc5200: Add SPL support Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 5/7] mpc5200: Add a3m071 board support Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 6/7] Makefile: Add possibility to set entry-point for u-boot.img Stefan Roese
2012-10-23 8:28 ` [U-Boot] [PATCH v5 7/7] Makefile: Add target for combined spl/u-boot.bin & u-boot.img Stefan Roese
2012-10-23 15:15 ` [U-Boot] [PATCH v5 0/7] SPL: Port SPL framework to powerpc Tom Rini
2012-11-07 22:37 ` Anatolij Gustschin
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=1350980915-27940-2-git-send-email-sr@denx.de \
--to=sr@denx.de \
--cc=u-boot@lists.denx.de \
/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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox