mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Christian Hemp <c.hemp@phytec.de>
To: barebox@lists.infradead.org
Subject: [PATCH 05/10] ARM:imx6:pfla02: Remove redundant code
Date: Fri, 12 Sep 2014 15:33:42 +0200	[thread overview]
Message-ID: <1410528827-12722-5-git-send-email-c.hemp@phytec.de> (raw)
In-Reply-To: <1410528827-12722-1-git-send-email-c.hemp@phytec.de>

Move redundant code to a common function.

Signed-off-by: Christian Hemp <c.hemp@phytec.de>
---
 arch/arm/boards/phytec-phyflex-imx6/lowlevel.c |   46 ++++++++++--------------
 1 files changed, 19 insertions(+), 27 deletions(-)

diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
index 1d08f05..84014d7 100644
--- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
+++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c
@@ -63,7 +63,7 @@ BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_1G, IMD_TYPE_PARAMETER, "memsize=1024
 BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0);
 BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0);
 
-ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2)
+static void __noreturn start_imx6q_phytec_pbab01_common(uint32_t size)
 {
 	void *fdt;
 
@@ -71,17 +71,16 @@ ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2)
 
 	arm_setup_stack(0x00920000 - 8);
 
-	IMD_USED(phyflex_mx6_memsize_1G);
-
 	if (IS_ENABLED(CONFIG_DEBUG_LL))
 		setup_uart();
 
 	fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset();
 
-	barebox_arm_entry(0x10000000, SZ_1G, fdt);
+	barebox_arm_entry(0x10000000, size, fdt);
 }
 
-ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2)
+
+static void __noreturn start_imx6dl_phytec_pbab01_common(uint32_t size)
 {
 	void *fdt;
 
@@ -89,44 +88,37 @@ ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2)
 
 	arm_setup_stack(0x00920000 - 8);
 
-	IMD_USED(phyflex_mx6_memsize_2G);
+	fdt = __dtb_imx6dl_phytec_pbab01_start - get_runtime_offset();
 
-	if (IS_ENABLED(CONFIG_DEBUG_LL))
-		setup_uart();
+	barebox_arm_entry(0x10000000, size, fdt);
+}
 
-	fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset();
+ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2)
+{
+	IMD_USED(phyflex_mx6_memsize_1G);
 
-	barebox_arm_entry(0x10000000, SZ_2G, fdt);
+	start_imx6q_phytec_pbab01_common(SZ_1G);
 }
 
-ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2)
+ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2)
 {
-	void *fdt;
-
-	imx6_cpu_lowlevel_init();
+	IMD_USED(phyflex_mx6_memsize_2G);
 
-	arm_setup_stack(0x00920000 - 8);
+	start_imx6q_phytec_pbab01_common(SZ_2G);
+}
 
+ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2)
+{
 	IMD_USED(phyflex_mx6_memsize_4G);
 
-	fdt = __dtb_imx6q_phytec_pbab01_start - get_runtime_offset();
-
-	barebox_arm_entry(0x10000000, 0xEFFFFFF8, fdt);
+	start_imx6q_phytec_pbab01_common(0xEFFFFFF8);
 }
 
 ENTRY_FUNCTION(start_phytec_pbab01dl_1gib, r0, r1, r2)
 {
-	void *fdt;
-
-	imx6_cpu_lowlevel_init();
-
-	arm_setup_stack(0x00920000 - 8);
-
 	IMD_USED(phyflex_mx6_memsize_1G);
 
-	fdt = __dtb_imx6dl_phytec_pbab01_start - get_runtime_offset();
-
-	barebox_arm_entry(0x10000000, SZ_1G, fdt);
+	start_imx6dl_phytec_pbab01_common(SZ_1G);
 }
 
 ENTRY_FUNCTION(start_phytec_pbab01s_512mb, r0, r1, r2)
-- 
1.7.0.4


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2014-09-12 13:34 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-09-12 13:33 [PATCH 01/10] dts:imx6:pfla02: Add nand partitions Christian Hemp
2014-09-12 13:33 ` [PATCH 02/10] dts:imx6q:pcaaxl3: Add oftree partition to nand Christian Hemp
2014-09-12 13:33 ` [PATCH 03/10] ARM:imx6:phycard: Switch env to defaultenv_append_directory Christian Hemp
2014-09-12 13:33 ` [PATCH 04/10] ARM:imx6:phyflex: Add defaultenv Christian Hemp
2014-09-12 13:33 ` Christian Hemp [this message]
2014-09-12 13:33 ` [PATCH 06/10] dts:imx6:pfla02: Remove memory node Christian Hemp
2014-09-12 13:33 ` [PATCH 07/10] dts:imx6:pfla02: move mac read to module Christian Hemp
2014-09-12 13:33 ` [PATCH 08/10] dts:imx6:pfla02:Move spi partitions imx6qdl-phytec-pfla02 Christian Hemp
2014-09-12 13:33 ` [PATCH 09/10] dts:imx6:pfla02: Add env node for SPI-NOR and NAND Christian Hemp
2014-09-12 13:33 ` [PATCH 10/10] ARM:phyFLEX-iMX6: Add bootsource detection Christian Hemp
2014-09-15  5:33 ` [PATCH 01/10] dts:imx6:pfla02: Add nand partitions Sascha Hauer

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=1410528827-12722-5-git-send-email-c.hemp@phytec.de \
    --to=c.hemp@phytec.de \
    --cc=barebox@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: 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