summaryrefslogtreecommitdiffstats
path: root/arch/x86
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2014-07-04 17:27:06 +0200
committerSascha Hauer <s.hauer@pengutronix.de>2014-07-04 17:27:06 +0200
commitefa4d684d8927428d333f841e37adeedcfe61cfb (patch)
tree5c780a94fdfa9557da018a485d7fe884244aaf48 /arch/x86
parent45d593bc5ec78e26e3a967517ed7a51f27c8b91f (diff)
parent10d63913999fbd5c02a2a8daecf877c24663bdca (diff)
downloadbarebox-efa4d684d8927428d333f841e37adeedcfe61cfb.tar.gz
Merge branch 'for-next/misc'
Conflicts: arch/arm/boards/chumby_falconwing/falconwing.c arch/arm/boards/imx233-olinuxino/imx23-olinuxino.c arch/x86/mach-x86.dox scripts/setupmbr/setupmbr.c
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
2 files changed, 5 insertions, 5 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