diff options
author | Christian Hemp <c.hemp@phytec.de> | 2014-09-12 15:33:42 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2014-09-15 07:31:51 +0200 |
commit | 40eb863b867574b81bf9906c9a724ba12661ee74 (patch) | |
tree | 2cddc08034f510b083291d4dbf19dd30f22e227e | |
parent | 57fd4426a37d32adf4ee997ad422d3c2a8f3661e (diff) | |
download | barebox-40eb863b867574b81bf9906c9a724ba12661ee74.tar.gz barebox-40eb863b867574b81bf9906c9a724ba12661ee74.tar.xz |
ARM:imx6:pfla02: Remove redundant code
Move redundant code to a common function.
Signed-off-by: Christian Hemp <c.hemp@phytec.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
-rw-r--r-- | 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 1d08f0561a..84014d772a 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) |