From: Stefan Roese <sr@denx.de>
To: u-boot@lists.denx.de
Subject: [U-Boot] [PATCH v2 05/12] powerpc: Extract EPAPR_MAGIC constants into processor.h
Date: Mon, 27 Aug 2012 12:51:00 +0200 [thread overview]
Message-ID: <1346064667-29692-6-git-send-email-sr@denx.de> (raw)
In-Reply-To: <1346064667-29692-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 dc009d6..daa670b 100644
--- a/arch/powerpc/include/asm/processor.h
+++ b/arch/powerpc/include/asm/processor.h
@@ -1329,4 +1329,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.7.12
next prev parent reply other threads:[~2012-08-27 10:51 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-27 10:50 [U-Boot] [PATCH v2 0/12] SPL: Port SPL framework to powerpc Stefan Roese
2012-08-27 10:50 ` [U-Boot] [PATCH v2 01/12] SPL: Fix build problems on ARM with new SPL framework Stefan Roese
2012-08-27 16:30 ` Tom Rini
2012-08-27 10:50 ` [U-Boot] [PATCH v2 02/12] SPL: Use image_get_xxx() functions to access header values Stefan Roese
2012-08-27 16:31 ` Tom Rini
2012-08-27 10:50 ` [U-Boot] [PATCH v2 03/12] SPL: Add option to skip copying of the mkimage header Stefan Roese
2012-08-27 10:50 ` [U-Boot] [PATCH v2 04/12] SPL: Add NOR flash booting support Stefan Roese
2012-08-27 16:45 ` Tom Rini
2012-08-27 17:29 ` Daniel Schwierzeck
2012-08-27 17:59 ` Tom Rini
2012-08-28 8:32 ` Stefan Roese
2012-08-27 10:51 ` Stefan Roese [this message]
2012-08-27 10:51 ` [U-Boot] [PATCH v2 06/12] SPL: Port SPL framework to powerpc Stefan Roese
2012-08-27 16:27 ` Tom Rini
2012-08-28 8:21 ` Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 07/12] env: Extract getenv_f() into separate source file Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 08/12] mpc5200: Add SPL support Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 09/12] mpc5200: Add a3m071 board support Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 10/12] fdt: cmd_fdt: Call fdt_chosen() from "fdt boardsetup" Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 11/12] Makefile: Add possibility to set entry-point for u-boot.img Stefan Roese
2012-08-27 10:51 ` [U-Boot] [PATCH v2 12/12] Makefile: Add target for combined spl/u-boot.bin & u-boot.img Stefan Roese
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=1346064667-29692-6-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