summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/chumby_falconwing/falconwing.c2
-rw-r--r--arch/arm/boards/freescale-mx23-evk/mx23-evk.c6
-rw-r--r--arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c2
-rw-r--r--arch/x86/lib/barebox.lds.S2
-rw-r--r--arch/x86/mach-i386/include/mach/barebox.lds.h8
-rw-r--r--arch/x86/mach-x86.dox18
6 files changed, 19 insertions, 19 deletions
diff --git a/arch/arm/boards/chumby_falconwing/falconwing.c b/arch/arm/boards/chumby_falconwing/falconwing.c
index 77581f668f..6546680ffe 100644
--- a/arch/arm/boards/chumby_falconwing/falconwing.c
+++ b/arch/arm/boards/chumby_falconwing/falconwing.c
@@ -355,7 +355,7 @@ make ARCH=arm CROSS_COMPILE=armv5compiler
- 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 4th one for the root filesystem which can fill the rest of the available space
diff --git a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
index 1eae37722c..a5798ee5bf 100644
--- a/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
+++ b/arch/arm/boards/freescale-mx23-evk/mx23-evk.c
@@ -70,7 +70,7 @@ mem_initcall(mx23_evk_mem_init);
* If this SD card is also the boot media, we can use the second partition
* for our environment purpose (if present!).
*/
-static int register_persistant_environment(void)
+static int register_persistent_environment(void)
{
struct cdev *cdev;
@@ -116,9 +116,9 @@ static int mx23_evk_devices_init(void)
add_generic_device("mxs_mci", DEVICE_ID_DYNAMIC, NULL, IMX_SSP1_BASE,
0x8000, IORESOURCE_MEM, &mci_pdata);
- rc = register_persistant_environment();
+ rc = register_persistent_environment();
if (rc != 0)
- printf("Cannot create the 'env0' persistant "
+ printf("Cannot create the 'env0' persistent "
"environment storage (%d)\n", rc);
#ifdef CONFIG_USB_GADGET_DRIVER_ARC
diff --git a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
index fae4d91469..40a6bff48d 100644
--- a/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
+++ b/arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c
@@ -180,7 +180,7 @@ the imx233-olinuxino 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
+ - 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 4th one for the root filesystem which can fill the
diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S
index 05d0f778e5..6cf6b10d1b 100644
--- a/arch/x86/lib/barebox.lds.S
+++ b/arch/x86/lib/barebox.lds.S
@@ -85,7 +85,7 @@ SECTIONS
boot_disk = .;
BYTE(0x00); /* boot disk number (provided by the BIOS)
- /* information about the persistant environment storage */
+ /* information about the persistent environment storage */
. = PATCH_AREA + PATCH_AREA_PERS_START;
pers_env_storage = .;
LONG(0x00000000); /* LBA start lower */
diff --git a/arch/x86/mach-i386/include/mach/barebox.lds.h b/arch/x86/mach-i386/include/mach/barebox.lds.h
index 12eeeacd63..f6f6346398 100644
--- a/arch/x86/mach-i386/include/mach/barebox.lds.h
+++ b/arch/x86/mach-i386/include/mach/barebox.lds.h
@@ -31,27 +31,27 @@
#define PATCH_AREA_BOOT_DEV 16
/**
- * Offset where to store information about the persistant environment storage
+ * Offset where to store information about the persistent environment storage
* It points to an LBA number (8 bytes) and defines the first sector of this
* storage on disk.
*/
#define PATCH_AREA_PERS_START 20
/**
- * Offset where to store information about the persistant environment storage
+ * Offset where to store information about the persistent environment storage
* It points to a short number (2 bytes) and defines the sector count of this
* storage on disk.
*/
#define PATCH_AREA_PERS_SIZE 28
/**
- * Offset where to store information about the persistant environment storage
+ * Offset where to store information about the persistent environment storage
* drive number (BIOS number, 1 byte)
*/
#define PATCH_AREA_PERS_DRIVE 30
/**
- * Mark the persistant environment as not used
+ * Mark the persistent environment as not used
*/
#define PATCH_AREA_PERS_SIZE_UNUSED 0x000
diff --git a/arch/x86/mach-x86.dox b/arch/x86/mach-x86.dox
index 661e905bac..3835a43d7f 100644
--- a/arch/x86/mach-x86.dox
+++ b/arch/x86/mach-x86.dox
@@ -53,7 +53,7 @@ code. Thats why not the PIC is touched nor the IDT.
@todo Add some notes about drive numbers used by the BIOS. They may change
if one change orders in the BIOS setup. Drive orders and numbers may be
different at BIOS runtime and Linux runtime! But these numbers are required
-at BIOS runtime for booting and the persistant environment storage.
+at BIOS runtime for booting and the persistent environment storage.
@attention Currently there is a 4 GiB limit for the disk sizes!
@@ -82,11 +82,11 @@ gets stored when this image will be written to a boot media. This information
is required to load all parts of the image from the boot media at runtime.
The image gets installed in two ways onto the boot media, depending on the
-need for a persistant storage.
+need for a persistent storage.
-@subsection mach_x86_drive_layout_wops barebox's boot media layout without persistant storage
+@subsection mach_x86_drive_layout_wops barebox's boot media layout without persistent storage
-In this case @a barebox's persistant storage is anywhere:
+In this case @a barebox's persistent storage is anywhere:
@verbatim
Sector Content
@@ -100,9 +100,9 @@ In this case @a barebox's persistant storage is anywhere:
0 MBR, Partition table, boot code
@endverbatim
-@subsection mach_x86_drive_layout_wps barebox's boot media layout with persistant storage
+@subsection mach_x86_drive_layout_wps barebox's boot media layout with persistent storage
-@a barebox's persistant storage is part of the boot media (more
+@a barebox's persistent storage is part of the boot media (more
space required in front of the first partition) and interferes with the
boot loader image itself:
@@ -115,13 +115,13 @@ boot loader image itself:
. 32 bit barebox code
n+2 16 bit bootstrap code, BIOS calling code
n+1 indirect sector
- n end of persistant environment storage
+ n end of persistent environment storage
.
- 1 start of persistant environment storage
+ 1 start of persistent environment storage
0 MBR, Partition table, boot code
@endverbatim
-The information where the persistant storage is located is also stored into
+The information where the persistent storage is located is also stored into
the MBR at specific locations by @p setupmbr. The @a barebox runtime will use
it to load and store all environment relevant data.
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-19 08:23:20 +0000