All of lore.kernel.org
 help / color / mirror / Atom feed
From: Ovidiu Panait <ovidiu.panait@windriver.com>
To: u-boot@lists.denx.de
Subject: [PATCH v2 09/14] board_f: mips: Factor out mips-specific bdinfo setup
Date: Fri, 10 Jul 2020 13:19:02 +0300	[thread overview]
Message-ID: <20200710101907.11214-9-ovidiu.panait@windriver.com> (raw)
In-Reply-To: <20200710101907.11214-1-ovidiu.panait@windriver.com>

Factor out mips-specific bdinfo setup from generic init sequence to
arch_setup_bdinfo in arch/mips/lib/boot.c. Also, use if(IS_ENABLED())
instead of #ifdef where possible.

Signed-off-by: Ovidiu Panait <ovidiu.panait@windriver.com>
---
v2 updates:
- use "if (IS_ENABLED(CONFIG_SYS_HAS_SRAM))" instead of 
  "#ifdef CONFIG_SYS_SRAM_BASE"

 arch/mips/lib/boot.c | 18 ++++++++++++++++++
 common/board_f.c     | 25 +------------------------
 2 files changed, 19 insertions(+), 24 deletions(-)

diff --git a/arch/mips/lib/boot.c b/arch/mips/lib/boot.c
index db862f6379..1ad9993c73 100644
--- a/arch/mips/lib/boot.c
+++ b/arch/mips/lib/boot.c
@@ -9,6 +9,24 @@
 
 DECLARE_GLOBAL_DATA_PTR;
 
+int arch_setup_bdinfo(void)
+{
+	bd_t *bd = gd->bd;
+
+	/*
+	 * Save local variables to board info struct
+	 */
+	bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;	/* start of memory */
+	bd->bi_memsize = gd->ram_size;			/* size in bytes */
+
+	if (IS_ENABLED(CONFIG_SYS_HAS_SRAM)) {
+		bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;	/* start of SRAM */
+		bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;		/* size  of SRAM */
+	}
+
+	return 0;
+}
+
 unsigned long do_go_exec(ulong (*entry)(int, char * const []),
 			 int argc, char * const argv[])
 {
diff --git a/common/board_f.c b/common/board_f.c
index 9bfcd6b236..fd7e6a17ad 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -602,26 +602,6 @@ __weak int arch_setup_bdinfo(void)
 	return 0;
 }
 
-#if defined(CONFIG_MIPS)
-static int setup_board_part1(void)
-{
-	bd_t *bd = gd->bd;
-
-	/*
-	 * Save local variables to board info struct
-	 */
-	bd->bi_memstart = CONFIG_SYS_SDRAM_BASE;	/* start of memory */
-	bd->bi_memsize = gd->ram_size;			/* size in bytes */
-
-#ifdef CONFIG_SYS_SRAM_BASE
-	bd->bi_sramstart = CONFIG_SYS_SRAM_BASE;	/* start of SRAM */
-	bd->bi_sramsize = CONFIG_SYS_SRAM_SIZE;		/* size  of SRAM */
-#endif
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_POST
 static int init_post(void)
 {
@@ -942,11 +922,8 @@ static const init_fnc_t init_sequence_f[] = {
 	reserve_stacks,
 	dram_init_banksize,
 	show_dram_config,
-	arch_setup_bdinfo,
-#if defined(CONFIG_MIPS)
-	setup_board_part1,
 	INIT_FUNC_WATCHDOG_RESET
-#endif
+	arch_setup_bdinfo,
 	display_new_sp,
 #ifdef CONFIG_OF_BOARD_FIXUP
 	fix_fdt,
-- 
2.17.1

  parent reply	other threads:[~2020-07-10 10:19 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-10 10:18 [PATCH v2 01/14] Kconfig: Introduce CONFIG_SYS_HAS_SRAM Ovidiu Panait
2020-07-10 10:18 ` [PATCH v2 02/14] Kconfig: Convert CONFIG_SYS_SRAM_BASE to Kconfig Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-10 10:18 ` [PATCH v2 03/14] Kconfig: Convert CONFIG_SYS_SRAM_SIZE " Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-10 10:18 ` [PATCH v2 04/14] Kconfig: Remove CONFIG_SYS_SRAM_START Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-10 10:18 ` [PATCH v2 05/14] board_f: Introduce arch_setup_bdinfo initcall Ovidiu Panait
2020-07-10 10:18 ` [PATCH v2 06/14] board_f: m68k: Factor out m68k-specific bdinfo setup Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-15 14:07     ` Ovidiu Panait
2020-07-16 15:44       ` Simon Glass
2020-07-10 10:19 ` [PATCH v2 07/14] board_f: ppc: Factor out ppc-specific " Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-10 10:19 ` [PATCH v2 08/14] board_f: sh: Factor out sh-specific " Ovidiu Panait
2020-07-15  1:05   ` Simon Glass
2020-07-10 10:19 ` Ovidiu Panait [this message]
2020-07-15  1:05   ` [PATCH v2 09/14] board_f: mips: Factor out mips-specific " Simon Glass
2020-07-10 10:19 ` [PATCH v2 10/14] dm: blk: Use IS_ENABLED() instead of #ifdefs in blk_post_probe Ovidiu Panait
2020-07-10 10:19 ` [PATCH v2 11/14] drivers: serial: Make serial_initialize return int Ovidiu Panait
2020-07-10 10:19 ` [PATCH v2 12/14] common/board_r: Remove initr_serial wrapper Ovidiu Panait
2020-07-10 10:19 ` [PATCH v2 13/14] blkcache: Extend blkcache_init to cover CONFIG_NEEDS_MANUAL_RELOC Ovidiu Panait
2020-07-15 19:29   ` Eric Nelson
2020-07-10 10:19 ` [PATCH v2 14/14] common/board_r: Move blkcache_init call earlier in the boot sequence Ovidiu Panait
2020-07-13 17:23   ` Angelo Dureghello
2020-07-15  1:05 ` [PATCH v2 01/14] Kconfig: Introduce CONFIG_SYS_HAS_SRAM Simon Glass

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=20200710101907.11214-9-ovidiu.panait@windriver.com \
    --to=ovidiu.panait@windriver.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.