From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail-pa0-x233.google.com ([2607:f8b0:400e:c03::233]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1XvpmC-0000l7-1c for barebox@lists.infradead.org; Tue, 02 Dec 2014 15:54:09 +0000 Received: by mail-pa0-f51.google.com with SMTP id ey11so13567652pad.24 for ; Tue, 02 Dec 2014 07:53:46 -0800 (PST) From: Andrey Smirnov Date: Tue, 2 Dec 2014 07:52:41 -0800 Message-Id: <1417535561-21750-2-git-send-email-andrew.smirnov@gmail.com> In-Reply-To: <1417535561-21750-1-git-send-email-andrew.smirnov@gmail.com> References: <1417535561-21750-1-git-send-email-andrew.smirnov@gmail.com> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "barebox" Errors-To: barebox-bounces+u.kleine-koenig=pengutronix.de@lists.infradead.org Subject: [PATCH 2/2] i.MX6: phytec: Distil common code pattern into a macro To: barebox@lists.infradead.org Cc: Andrey Smirnov Distil common code pattern for Phytec entry functions into a macro and use it instead. This way a new board derivateve that differs only in device tree file can be added with just one line. Signed-off-by: Andrey Smirnov --- arch/arm/boards/phytec-phyflex-imx6/lowlevel.c | 95 +++++++------------------- 1 file changed, 24 insertions(+), 71 deletions(-) diff --git a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c index d4896cd..54e8ba8 100644 --- a/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c +++ b/arch/arm/boards/phytec-phyflex-imx6/lowlevel.c @@ -54,16 +54,12 @@ static inline void setup_uart(void) putc_ll('>'); } -extern char __dtb_imx6q_phytec_pbab01_start[]; -extern char __dtb_imx6dl_phytec_pbab01_start[]; -extern char __dtb_imx6s_phytec_pbab01_start[]; -extern char __dtb_imx6q_phytec_phyboard_alcor_start[]; -extern char __dtb_imx6dl_phytec_phyboard_subra_start[]; +#define SZ_4G 0xEFFFFFF8 -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_512M, IMD_TYPE_PARAMETER, "memsize=512", 0); -BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0); -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); +BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_512M, IMD_TYPE_PARAMETER, "memsize=512", 0); +BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_1G, IMD_TYPE_PARAMETER, "memsize=1024", 0); +BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_2G, IMD_TYPE_PARAMETER, "memsize=2048", 0); +BAREBOX_IMD_TAG_STRING(phyflex_mx6_memsize_SZ_4G, IMD_TYPE_PARAMETER, "memsize=4096", 0); static void __noreturn start_imx6_phytec_common(uint32_t size, bool do_early_uart_config, @@ -83,66 +79,23 @@ static void __noreturn start_imx6_phytec_common(uint32_t size, barebox_arm_entry(0x10000000, size, fdt); } -ENTRY_FUNCTION(start_phytec_pbab01_1gib, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_1G); - - start_imx6_phytec_common(SZ_1G, true, - __dtb_imx6q_phytec_pbab01_start); -} - -ENTRY_FUNCTION(start_phytec_pbab01_1gib_1bank, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_1G); - - start_imx6_phytec_common(SZ_1G, true, - __dtb_imx6q_phytec_pbab01_start); -} - -ENTRY_FUNCTION(start_phytec_pbab01_2gib, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_2G); - - start_imx6_phytec_common(SZ_2G, true, - __dtb_imx6q_phytec_pbab01_start); -} - -ENTRY_FUNCTION(start_phytec_pbab01_4gib, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_4G); - - start_imx6_phytec_common(0xEFFFFFF8, true, - __dtb_imx6q_phytec_pbab01_start); -} +#define PHYTEC_ENTRY(name, fdt_name, memory_size, do_early_uart_config) \ + ENTRY_FUNCTION(name, r0, r1, r2) \ + { \ + extern char __dtb_##fdt_name##_start[]; \ + \ + IMD_USED(phyflex_mx6_memsize_##memory_size); \ + \ + start_imx6_phytec_common(memory_size, do_early_uart_config, \ + __dtb_##fdt_name##_start); \ + } + +PHYTEC_ENTRY(start_phytec_pbab01_1gib, imx6q_phytec_pbab01, SZ_1G, true) +PHYTEC_ENTRY(start_phytec_pbab01_1gib_1bank, imx6q_phytec_pbab01, SZ_1G, true) +PHYTEC_ENTRY(start_phytec_pbab01_2gib, imx6q_phytec_pbab01, SZ_2G, true) +PHYTEC_ENTRY(start_phytec_pbab01_4gib, imx6q_phytec_pbab01, SZ_4G, true) +PHYTEC_ENTRY(start_phytec_pbab01dl_1gib, imx6dl_phytec_pbab01, SZ_1G, false) +PHYTEC_ENTRY(start_phytec_pbab01s_512mb, imx6s_phytec_pbab01, SZ_512M, false) +PHYTEC_ENTRY(start_phytec_phyboard_alcor_1gib, imx6q_phytec_phyboard_alcor, SZ_1G, false) +PHYTEC_ENTRY(start_phytec_phyboard_subra_512mb, imx6dl_phytec_phyboard_subra, SZ_512M, false) -ENTRY_FUNCTION(start_phytec_pbab01dl_1gib, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_1G); - - start_imx6_phytec_common(SZ_1G, false, - __dtb_imx6dl_phytec_pbab01_start); -} - -ENTRY_FUNCTION(start_phytec_pbab01s_512mb, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_512M); - - start_imx6_phytec_common(SZ_512M, false, - __dtb_imx6s_phytec_pbab01_start); -} - -ENTRY_FUNCTION(start_phytec_phyboard_alcor_1gib, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_1G); - - start_imx6_phytec_common(SZ_1G, false, - __dtb_imx6q_phytec_phyboard_alcor_start); -} - -ENTRY_FUNCTION(start_phytec_phyboard_subra_512mb, r0, r1, r2) -{ - IMD_USED(phyflex_mx6_memsize_512M); - - start_imx6_phytec_common(SZ_512M, false, - __dtb_imx6dl_phytec_phyboard_subra_start); -} -- 2.1.0 _______________________________________________ barebox mailing list barebox@lists.infradead.org http://lists.infradead.org/mailman/listinfo/barebox