From: Tom Rini <trini@konsulko.com>
To: u-boot@lists.denx.de
Subject: [PATCH 15/20] dm: core: Convert #ifdef to if() in root.c
Date: Wed, 4 Nov 2020 08:59:01 -0500 [thread overview]
Message-ID: <20201104135901.GU5340@bill-the-cat> (raw)
In-Reply-To: <CAHTX3dJSWdmC6etGTF_=6LUWekGiZ57SbY-AD=dOVRJojy830g@mail.gmail.com>
On Wed, Nov 04, 2020 at 01:55:50PM +0100, Michal Simek wrote:
> Hi Simon,
>
> so 3. 10. 2020 v 19:35 odes?latel Simon Glass <sjg@chromium.org> napsal:
> >
> > Convert a few conditions to use compile-time checks to reduce the number
> > of build paths.
> >
> > Signed-off-by: Simon Glass <sjg@chromium.org>
> > ---
> >
> > drivers/core/root.c | 18 +++++++-----------
> > 1 file changed, 7 insertions(+), 11 deletions(-)
> >
> > diff --git a/drivers/core/root.c b/drivers/core/root.c
> > index e8df5aebe84..5f10d7a39c7 100644
> > --- a/drivers/core/root.c
> > +++ b/drivers/core/root.c
> > @@ -50,7 +50,6 @@ void dm_fixup_for_gd_move(struct global_data *new_gd)
> > }
> > }
> >
> > -#if defined(CONFIG_NEEDS_MANUAL_RELOC)
> > void fix_drivers(void)
> > {
> > struct driver *drv =
> > @@ -129,8 +128,6 @@ void fix_devices(void)
> > }
> > }
> >
> > -#endif
> > -
> > int dm_init(bool of_live)
> > {
> > int ret;
> > @@ -141,11 +138,11 @@ int dm_init(bool of_live)
> > }
> > INIT_LIST_HEAD(&DM_UCLASS_ROOT_NON_CONST);
> >
> > -#if defined(CONFIG_NEEDS_MANUAL_RELOC)
> > - fix_drivers();
> > - fix_uclass();
> > - fix_devices();
> > -#endif
> > + if (IS_ENABLED(CONFIG_NEEDS_MANUAL_RELOC)) {
> > + fix_drivers();
> > + fix_uclass();
> > + fix_devices();
> > + }
>
> This change is causing a hang on the Microblaze system.
> CONFIG_NEEDS_MANUAL_RELOC is out of Kconfig that's why likely this
> condition is not handled properly.
Can you do the migration or should I? It looks like just adding to the
top-level Kconfig and select'ing for microblaze/m68k.
--
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 659 bytes
Desc: not available
URL: <https://lists.denx.de/pipermail/u-boot/attachments/20201104/81531075/attachment.sig>
next prev parent reply other threads:[~2020-11-04 13:59 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-03 17:31 [PATCH 00/20] dm: Enhance of-platdata to support parent devices Simon Glass
2020-10-03 17:31 ` [PATCH 01/20] sandbox: Drop ad-hoc device declarations in SPL Simon Glass
2020-10-27 1:01 ` Simon Glass
2020-10-03 17:31 ` [PATCH 02/20] dtoc: Document the return value of scan_structs() Simon Glass
2020-10-27 1:01 ` Simon Glass
2020-10-03 17:31 ` [PATCH 03/20] dtoc: Order the structures internally by name Simon Glass
2020-10-27 1:01 ` Simon Glass
2020-10-03 17:31 ` [PATCH 04/20] dm: core: Allow dm_warn() to be used in SPL Simon Glass
2020-10-27 1:01 ` Simon Glass
2020-10-03 17:31 ` [PATCH 05/20] dtoc: Fix widening of int to bytes Simon Glass
2020-10-27 1:01 ` Simon Glass
2020-10-03 17:31 ` [PATCH 06/20] dm: Add a C test for of-platdata properties Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 07/20] sandbox: Allow selection of SPL unit tests Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 08/20] dm: test: Drop of-platdata pytest Simon Glass
2020-10-03 17:31 ` [PATCH 09/20] dm: test: Add a check that all devices have a dev value Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 10/20] dm: test: Add a test for of-platdata phandles Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 11/20] dm: Use an allocated array for run-time device info Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 12/20] sandbox: Fix up building for of-platdata Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 13/20] dm: Support parent devices with of-platdata Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 14/20] dm: Add a test for of-platdata parent information Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 15/20] dm: core: Convert #ifdef to if() in root.c Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-11-04 12:55 ` Michal Simek
2020-11-04 13:59 ` Tom Rini [this message]
2020-11-04 14:33 ` Michal Simek
2020-10-03 17:31 ` [PATCH 16/20] x86: apl: Enable SPI flash in TPL with APL_SPI_FLASH_BOOT Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 17/20] x86: apl: Take advantage of the of-platdata parent support Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 18/20] dm: Use driver_info index instead of pointer Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 19/20] dm: Don't allow U_BOOT_DEVICE() when of-platdata is used Simon Glass
2020-10-30 3:34 ` Simon Glass
2020-10-03 17:31 ` [PATCH 20/20] dm: doc: Update the of-platadata documentation Simon Glass
2020-10-30 3:34 ` 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=20201104135901.GU5340@bill-the-cat \
--to=trini@konsulko.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox