summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorRobert P. J. Day <rpjday@crashcourse.ca>2014-06-26 16:25:05 -0400
committerSascha Hauer <s.hauer@pengutronix.de>2014-06-30 08:16:00 +0200
commitac705a462f680629afca71dba6bc766463b0356a (patch)
treee8d1a247caa034b4c0c7a2524121b6fabd7655ef /arch/x86
parenteab148a80c5ba33aeec4edd9c97a7facaecbecf3 (diff)
downloadbarebox-ac705a462f680629afca71dba6bc766463b0356a.tar.gz
Fix misspellings of "persistant" -> "persistent" in various places
Fix misspellings of "persistent", including the renaming of a function to "register_persistant_environment". Signed-off-by: Robert P. J. Day <rpjday@crashcourse.ca> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/x86')
-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
3 files changed, 14 insertions, 14 deletions
diff --git a/arch/x86/lib/barebox.lds.S b/arch/x86/lib/barebox.lds.S
index 05d0f77..6cf6b10 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 12eeeac..f6f6346 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 661e905..3835a43 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.