mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: Andrey Smirnov <andrew.smirnov@gmail.com>
Cc: Barebox List <barebox@lists.infradead.org>
Subject: Re: [PATCH 11/23] ARM: zii-common: Add common environment directory
Date: Fri, 3 Apr 2020 09:58:39 +0200	[thread overview]
Message-ID: <20200403075839.GR27288@pengutronix.de> (raw)
In-Reply-To: <CAHQ1cqFUH=CbFaFbTAvyy82VsF2F+K=BfARSewYMYeTPt+UFQw@mail.gmail.com>

On Thu, Apr 02, 2020 at 03:27:59PM -0700, Andrey Smirnov wrote:
> On Wed, Apr 1, 2020 at 11:49 PM Sascha Hauer <s.hauer@pengutronix.de> wrote:
> >
> > On Tue, Mar 31, 2020 at 11:47:10AM -0700, Andrey Smirnov wrote:
> > > Establish a common environment directory between all ZII boards, so
> > > that we could share common bits and pieces. As a first step, get rid
> > > of board scecific net boot scripts and replace them with a single
> > > shared one.
> > >
> > > Signed-off-by: Andrey Smirnov <andrew.smirnov@gmail.com>
> > > ---
> > >  arch/arm/boards/zii-common/Makefile           |  1 +
> > >  .../defaultenv-zii-common}/boot/net           |  9 +++++--
> > >  arch/arm/boards/zii-imx51-rdu1/board.c        |  1 +
> > >  arch/arm/boards/zii-imx6q-rdu2/board.c        |  1 +
> > >  .../zii-imx6q-rdu2/defaultenv-rdu2/boot/net   | 24 -------------------
> > >  arch/arm/boards/zii-imx7d-dev/board.c         |  2 ++
> > >  arch/arm/boards/zii-imx8mq-dev/board.c        |  1 +
> > >  .../defaultenv-imx8mq-zii-dev/boot/net        | 24 -------------------
> > >  arch/arm/boards/zii-vf610-dev/board.c         |  1 +
> > >  9 files changed, 14 insertions(+), 50 deletions(-)
> > >  rename arch/arm/boards/{zii-imx51-rdu1/defaultenv-rdu1 => zii-common/defaultenv-zii-common}/boot/net (73%)
> > >  delete mode 100644 arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
> > >  delete mode 100644 arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net
> > >
> > > diff --git a/arch/arm/boards/zii-common/Makefile b/arch/arm/boards/zii-common/Makefile
> > > index fcc5cdf97..90bdf21e7 100644
> > > --- a/arch/arm/boards/zii-common/Makefile
> > > +++ b/arch/arm/boards/zii-common/Makefile
> > > @@ -1 +1,2 @@
> > >  obj-y += board.o switch-cmd.o pn-fixup.o
> > > +bbenv-y += defaultenv-zii-common
> > > diff --git a/arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net b/arch/arm/boards/zii-common/defaultenv-zii-common/boot/net
> > > similarity index 73%
> > > rename from arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net
> > > rename to arch/arm/boards/zii-common/defaultenv-zii-common/boot/net
> > > index 4be8e1e2d..8b07cbbc9 100644
> > > --- a/arch/arm/boards/zii-imx51-rdu1/defaultenv-rdu1/boot/net
> > > +++ b/arch/arm/boards/zii-common/defaultenv-zii-common/boot/net
> > > @@ -2,8 +2,13 @@
> > >
> > >  path="/mnt/tftp"
> > >
> > > -# clear seat network config
> > > -global.linux.bootargs.rdu_network=
> > > +#
> > > +# Clear seat network config. Some boards don't have that config, so
> > > +# check that it is set first
> > > +#
> > > +if [ -n ${global.linux.bootargs.rdu_network} ]; then
> > > +    global.linux.bootargs.rdu_network=
> > > +fi
> > >
> > >  global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
> > >
> > > diff --git a/arch/arm/boards/zii-imx51-rdu1/board.c b/arch/arm/boards/zii-imx51-rdu1/board.c
> > > index 640bb0d1b..8fdcb7626 100644
> > > --- a/arch/arm/boards/zii-imx51-rdu1/board.c
> > > +++ b/arch/arm/boards/zii-imx51-rdu1/board.c
> > > @@ -50,6 +50,7 @@ static int zii_rdu1_init(void)
> > >               BBU_HANDLER_FLAG_DEFAULT |
> > >               IMX_BBU_FLAG_PARTITION_STARTS_AT_HEADER);
> > >
> > > +     defaultenv_append_directory(defaultenv_zii_common);
> > >       defaultenv_append_directory(defaultenv_rdu1);
> > >
> > >       return 0;
> > > diff --git a/arch/arm/boards/zii-imx6q-rdu2/board.c b/arch/arm/boards/zii-imx6q-rdu2/board.c
> > > index 0bb4700b6..6d6bc1caa 100644
> > > --- a/arch/arm/boards/zii-imx6q-rdu2/board.c
> > > +++ b/arch/arm/boards/zii-imx6q-rdu2/board.c
> > > @@ -155,6 +155,7 @@ static int rdu2_devices_init(void)
> > >
> > >       imx6_bbu_internal_mmcboot_register_handler("eMMC", "/dev/mmc3", 0);
> > >
> > > +     defaultenv_append_directory(defaultenv_zii_common);
> > >       defaultenv_append_directory(defaultenv_rdu2);
> > >
> > >       return 0;
> > > diff --git a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net b/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
> > > deleted file mode 100644
> > > index 4090c2f4a..000000000
> > > --- a/arch/arm/boards/zii-imx6q-rdu2/defaultenv-rdu2/boot/net
> > > +++ /dev/null
> > > @@ -1,24 +0,0 @@
> > > -#!/bin/sh
> > > -
> > > -path="/mnt/tftp"
> > > -
> > > -# clear seat network config
> > > -global.linux.bootargs.rdu_network=
> > > -
> > > -global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
> > > -
> > > -oftree="${path}/${global.user}-oftree-${global.hostname}"
> > > -if [ -f "${oftree}" ]; then
> > > -     global.bootm.oftree="$oftree"
> > > -fi
> > > -
> > > -nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
> > > -
> > > -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip
> > > -
> > > -initramfs="${path}/${global.user}-initramfs-${global.hostname}"
> > > -if [ -f "${initramfs}" ]; then
> > > -     global.bootm.initrd="$initramfs"
> > > -else
> > > -     global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
> > > -fi
> > > \ No newline at end of file
> > > diff --git a/arch/arm/boards/zii-imx7d-dev/board.c b/arch/arm/boards/zii-imx7d-dev/board.c
> > > index b53a6af49..6b409e23b 100644
> > > --- a/arch/arm/boards/zii-imx7d-dev/board.c
> > > +++ b/arch/arm/boards/zii-imx7d-dev/board.c
> > > @@ -55,6 +55,8 @@ static int zii_imx7d_dev_init(void)
> > >       else if (of_machine_is_compatible("zii,imx7d-rmu2"))
> > >               barebox_set_hostname("rmu2");
> > >
> > > +     defaultenv_append_directory(defaultenv_zii_common);
> > > +
> > >       return 0;
> > >  }
> > >  late_initcall(zii_imx7d_dev_init);
> > > diff --git a/arch/arm/boards/zii-imx8mq-dev/board.c b/arch/arm/boards/zii-imx8mq-dev/board.c
> > > index ddd15299c..285e889fe 100644
> > > --- a/arch/arm/boards/zii-imx8mq-dev/board.c
> > > +++ b/arch/arm/boards/zii-imx8mq-dev/board.c
> > > @@ -39,6 +39,7 @@ static int zii_imx8mq_dev_init(void)
> > >       else
> > >               of_device_enable_path("/chosen/environment-sd");
> > >
> > > +     defaultenv_append_directory(defaultenv_zii_common);
> > >       defaultenv_append_directory(defaultenv_imx8mq_zii_dev);
> > >
> > >       return 0;
> > > diff --git a/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net b/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net
> > > deleted file mode 100644
> > > index 4090c2f4a..000000000
> > > --- a/arch/arm/boards/zii-imx8mq-dev/defaultenv-imx8mq-zii-dev/boot/net
> > > +++ /dev/null
> > > @@ -1,24 +0,0 @@
> > > -#!/bin/sh
> > > -
> > > -path="/mnt/tftp"
> > > -
> > > -# clear seat network config
> > > -global.linux.bootargs.rdu_network=
> > > -
> > > -global.bootm.image="${path}/${global.user}-linux-${global.hostname}"
> > > -
> > > -oftree="${path}/${global.user}-oftree-${global.hostname}"
> > > -if [ -f "${oftree}" ]; then
> > > -     global.bootm.oftree="$oftree"
> > > -fi
> > > -
> > > -nfsroot="/home/${global.user}/nfsroot/${global.hostname}"
> > > -
> > > -ip_route_get -b ${global.net.server} global.linux.bootargs.dyn.ip
> > > -
> > > -initramfs="${path}/${global.user}-initramfs-${global.hostname}"
> > > -if [ -f "${initramfs}" ]; then
> > > -     global.bootm.initrd="$initramfs"
> > > -else
> > > -     global.linux.bootargs.dyn.root="root=/dev/nfs nfsroot=$nfsroot,v3,tcp"
> > > -fi
> > > \ No newline at end of file
> > > diff --git a/arch/arm/boards/zii-vf610-dev/board.c b/arch/arm/boards/zii-vf610-dev/board.c
> > > index 1d10f12f6..6b80ec428 100644
> > > --- a/arch/arm/boards/zii-vf610-dev/board.c
> > > +++ b/arch/arm/boards/zii-vf610-dev/board.c
> > > @@ -141,6 +141,7 @@ static int zii_vf610_dev_set_hostname(void)
> > >               }
> > >       }
> > >
> > > +     defaultenv_append_directory(defaultenv_zii_common);
> >
> > The zii-vf610 doesn't set CONFIG_MACH_ZII_COMMON, so the common env is not
> > compiled in which results in a linker error. What's the correct way to
> > fix that? Specify CONFIG_MACH_ZII_COMMON for the vf610 board?
> >
> 
> Ugh, sorry about that. I always select all of those boards at the same
> time, so I missed that. Yes, I think CONFIG_MACH_ZII_COMMON for VF610
> would be the way to go. Let me know if you want me to re-spin this
> patch with that fix included.

That shouldn't be necessary, thanks. I added a select to
CONFIG_MACH_ZII_COMMON, it compiles without errors now.

Sascha


-- 
Pengutronix e.K.                           |                             |
Steuerwalder Str. 21                       | http://www.pengutronix.de/  |
31137 Hildesheim, Germany                  | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |

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

  reply	other threads:[~2020-04-03  7:58 UTC|newest]

Thread overview: 34+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-03-31 18:46 [PATCH 00/23] A number of ZII related fixes Andrey Smirnov
2020-03-31 18:47 ` [PATCH 01/23] ARM: zii-common: Gate rdu_i210_invm() call with CONFIG_PCI_IMX6 Andrey Smirnov
2020-04-01  5:20   ` Sascha Hauer
2020-04-01 19:47     ` Andrey Smirnov
2020-04-02  6:46       ` Sascha Hauer
2020-03-31 18:47 ` [PATCH 02/23] ARM: imx7d-zii-rpu2: Drop redundant chosen node Andrey Smirnov
2020-03-31 18:47 ` [PATCH 03/23] ARM: zii-imx7d-dev: Fix compatible name Andrey Smirnov
2020-03-31 18:47 ` [PATCH 04/23] ARM: zii-common: Check for I2C errors in do_rdu2_switch_reset() Andrey Smirnov
2020-04-01  5:23   ` Sascha Hauer
2020-03-31 18:47 ` [PATCH 05/23] i2c: Port of_find_i2c_device_by_node() from Linux Andrey Smirnov
2020-04-01  5:29   ` Sascha Hauer
2020-04-01  5:46     ` Sascha Hauer
2020-03-31 18:47 ` [PATCH 06/23] ARM: zii-common: Find switch watchdog via DT Andrey Smirnov
2020-03-31 18:47 ` [PATCH 07/23] ARM: zii-common: Support rave_switch_reset on ZII Ultra Andrey Smirnov
2020-03-31 18:47 ` [PATCH 08/23] ARM: zii-imx6q-rdu2: Differentiate between RDU2 and RDU2+ Andrey Smirnov
2020-03-31 18:47 ` [PATCH 09/23] ARM: zii-imx7d-dev: Differentiate between RPU2 and RMU2 Andrey Smirnov
2020-03-31 18:47 ` [PATCH 10/23] ARM: zii-imx8mq-dev: Differentiate between Zest and RMB3 Andrey Smirnov
2020-03-31 18:47 ` [PATCH 11/23] ARM: zii-common: Add common environment directory Andrey Smirnov
2020-04-02  6:49   ` Sascha Hauer
2020-04-02 22:27     ` Andrey Smirnov
2020-04-03  7:58       ` Sascha Hauer [this message]
2020-03-31 18:47 ` [PATCH 12/23] ARM: zii-imx6q-rdu2: Register SD card slot with BBU Andrey Smirnov
2020-03-31 18:47 ` [PATCH 13/23] ARM: zii-vf610-dev: " Andrey Smirnov
2020-03-31 18:47 ` [PATCH 14/23] ARM: zii-imx8mq-dev: " Andrey Smirnov
2020-03-31 18:47 ` [PATCH 15/23] ARM: zii-vf610-dev: Add newline to end of board.c Andrey Smirnov
2020-03-31 18:47 ` [PATCH 16/23] ARM: rdu2: Drop redundant USB GPIO hog nodes Andrey Smirnov
2020-03-31 18:47 ` [PATCH 17/23] ARM: imx8mq: Drop trailing whitespace Andrey Smirnov
2020-03-31 18:47 ` [PATCH 18/23] ARM: imx8mq: Drop redundant DT nodes Andrey Smirnov
2020-03-31 18:47 ` [PATCH 19/23] ARM: zii-imx8mq-dev: Add boot source info Andrey Smirnov
2020-03-31 18:47 ` [PATCH 20/23] ARM: zii-imx8mq-dev: Drop redundant "stdout-path" Andrey Smirnov
2020-03-31 18:47 ` [PATCH 21/23] ARM: zii-imx7d-dev: Drop redundant RMU2 .dtsi Andrey Smirnov
2020-03-31 18:47 ` [PATCH 22/23] ARM: zii-imx7d-rmu2: Add SPI NOR partition info Andrey Smirnov
2020-03-31 18:47 ` [PATCH 23/23] ARM: zii-imx7d-rmu2: Add boot source info Andrey Smirnov
2020-04-01  6:10 ` [PATCH 00/23] A number of ZII related fixes 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=20200403075839.GR27288@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=andrew.smirnov@gmail.com \
    --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