From: Sascha Hauer <s.hauer@pengutronix.de>
To: "Robert P. J. Day" <rpjday@crashcourse.ca>
Cc: "U-Boot Version 2 (barebox)" <barebox@lists.infradead.org>
Subject: Re: [PATCH] Documentation: Fix remaining typoes "persistant", "existance".
Date: Thu, 3 Jul 2014 09:13:32 +0200 [thread overview]
Message-ID: <20140703071332.GQ14257@pengutronix.de> (raw)
In-Reply-To: <alpine.LFD.2.11.1407010719440.25792@localhost>
On Tue, Jul 01, 2014 at 07:21:31AM -0400, Robert P. J. Day wrote:
>
> Fix a couple typoes that occur only in Documentation/ or in comments,
> so no functional change.
>
> Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca>
I'll apply this one after I have merged the different for-next topics
into master the next time.
Sascha
>
> ---
>
> diff --git a/Documentation/boards/mxs/Chumby-Falconwing.rst b/Documentation/boards/mxs/Chumby-Falconwing.rst
> index 172d684..97b39f3 100644
> --- a/Documentation/boards/mxs/Chumby-Falconwing.rst
> +++ b/Documentation/boards/mxs/Chumby-Falconwing.rst
> @@ -36,7 +36,7 @@ How to prepare an MCI card to boot the "chumby one" with barebox
> * Create four primary partitions on the MCI card
>
> * the first one for the bootlets (about 256 kiB)
> - * the second one for the persistant environment (size is up to you, at least 256k)
> + * the second one for the persistent environment (size is up to you, at least 256k)
> * the third one for the kernel (2 MiB ... 4 MiB in size)
> * the fourth one for the root filesystem which can fill the rest of the available space
>
> diff --git a/Documentation/boards/x86.rst b/Documentation/boards/x86.rst
> index ee5e869..ea13b91 100644
> --- a/Documentation/boards/x86.rst
> +++ b/Documentation/boards/x86.rst
> @@ -32,7 +32,7 @@ prepared in some special way:
> the first partition must start at a sector behind the ones barebox
> occupies.
> * barebox handles its runtime configuration in a special way: It
> - stores it in a binary way into some reserved sectors ("persistant
> + stores it in a binary way into some reserved sectors ("persistent
> storage").
>
> Boot Preparations
> @@ -52,12 +52,12 @@ simple calulation::
> sectors = (\<size of barebox image\> + 511) / 512
>
> To be able to store the runtime configuration, further free sectors are
> -required. Its up to you and your requirements, how large this persistant
> +required. Its up to you and your requirements, how large this persistent
> storage must be. If you need 16 kiB for this purpose, you need to keep
> additional 32 sectors free.
>
> For this example we are reserving 300 sectors for the barebox image and
> -additionaly 32 sectors for the persistant storage. So, the first partition on
> +additionaly 32 sectors for the persistent storage. So, the first partition on
> the boot media must start at sector 333 or later.
>
> Run the fdisk tool to setup such a partition table::
> @@ -116,18 +116,18 @@ In the next step, barebox gets installed to this boot media::
> This command writes the barebox image file './barebox' onto the device
> /dev/sda.
>
> -The -s option will keep the persistant storage sectors free and untouched
> -and set flags in the MBR to forward its existance, size and location to
> +The -s option will keep the persistent storage sectors free and untouched
> +and set flags in the MBR to forward its existence, size and location to
> barebox at runtime. setupmbr also does not change the partition table.
>
> The barebox image gets stored on the boot media like this::
>
> sector 0 1 33 333
> |---|-------------|--------------- ~~~ ------------|--------------
> - MBR persistant barebox first
> + MBR persistent barebox first
> storage main image partition
>
> -If the -s option is omitted, the "persistant storage" part simply does
> +If the -s option is omitted, the "persistent storage" part simply does
> not exist::
>
> sector 0 1 333
> diff --git a/arch/arm/boards/karo-tx28/tx28-stk5.c b/arch/arm/boards/karo-tx28/tx28-stk5.c
> index 2aaceb4..fe48610 100644
> --- a/arch/arm/boards/karo-tx28/tx28-stk5.c
> +++ b/arch/arm/boards/karo-tx28/tx28-stk5.c
> @@ -311,7 +311,7 @@ static const uint32_t tx28_starterkit_pad_setup[] = {
> * Try to register an environment storage on the attached MCI card
> * @return 0 on success
> *
> - * We rely on the existance of a usable SD card, already attached to
> + * We rely on the existence of a usable SD card, already attached to
> * our system, to get a persistent memory for our environment.
> * If this SD card is also the boot medium, we can use the second partition
> * for our environment purpose (if present!).
> diff --git a/drivers/mtd/nand/nomadik_nand.c b/drivers/mtd/nand/nomadik_nand.c
> index fbd8ecd..653b4f5 100644
> --- a/drivers/mtd/nand/nomadik_nand.c
> +++ b/drivers/mtd/nand/nomadik_nand.c
> @@ -214,7 +214,7 @@ static int nomadik_nand_probe(struct device_d *dev)
> nand->options = pdata->options;
>
> /*
> - * Scan to find existance of the device
> + * Scan to find existence of the device
> */
> if (nand_scan(&host->mtd, 1)) {
> ret = -ENXIO;
> diff --git a/scripts/setupmbr/setupmbr.c b/scripts/setupmbr/setupmbr.c
> index 506ed19..b74b105 100644
> --- a/scripts/setupmbr/setupmbr.c
> +++ b/scripts/setupmbr/setupmbr.c
> @@ -673,7 +673,7 @@ This command writes the @a barebox image file './barebox.bin' onto the device
> @p /dev/sda.
>
> The @p -s option will keep the persistent storage sectors free and untouched
> -and set flags in the MBR to forward its existance, size and location to
> +and set flags in the MBR to forward its existence, size and location to
> @a barebox at runtime. @p setupmbr also does not change the partition table.
>
> The @a barebox image gets stored on the boot media like this:
>
> --
>
> ========================================================================
> Robert P. J. Day Ottawa, Ontario, CANADA
> http://crashcourse.ca
>
> Twitter: http://twitter.com/rpjday
> LinkedIn: http://ca.linkedin.com/in/rpjday
> ========================================================================
>
> _______________________________________________
> barebox mailing list
> barebox@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 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
prev parent reply other threads:[~2014-07-03 7:13 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-01 11:21 Robert P. J. Day
2014-07-03 7:13 ` Sascha Hauer [this message]
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=20140703071332.GQ14257@pengutronix.de \
--to=s.hauer@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=rpjday@crashcourse.ca \
/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