[U-Boot] [PATCH] Fix numerous misspellings of "redundand" and "REDUNDAND".
Robert P. J. Day
rpjday at crashcourse.ca
Mon Sep 16 16:10:28 CEST 2013
Do a global spelling fix for all spellings of "redundand", which is a
functional change since it includes the variable
CONFIG_SYS_REDUNDAND_ENVIRONMENT.
Signed-off-by: Robert P. J. Day <rpjday at crashcourse.ca>
---
compile-tested, configured for "am335x_boneblack_config".
diff --git a/common/env_embedded.c b/common/env_embedded.c
index 91d8ba3..f2953bd 100644
--- a/common/env_embedded.c
+++ b/common/env_embedded.c
@@ -77,7 +77,7 @@
#include <env_default.h>
#ifdef CONFIG_ENV_ADDR_REDUND
-env_t redundand_environment __PPCENV__ = {
+env_t redundant_environment __PPCENV__ = {
0, /* CRC Sum: invalid */
0, /* Flags: invalid */
{
diff --git a/common/env_ubi.c b/common/env_ubi.c
index f24a96c..fabbc6b 100644
--- a/common/env_ubi.c
+++ b/common/env_ubi.c
@@ -31,7 +31,7 @@ int env_init(void)
}
#ifdef CONFIG_CMD_SAVEENV
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
static unsigned char env_flags;
int saveenv(void)
@@ -82,7 +82,7 @@ int saveenv(void)
return 0;
}
-#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
+#else /* ! CONFIG_SYS_REDUNDANT_ENVIRONMENT */
int saveenv(void)
{
ALLOC_CACHE_ALIGN_BUFFER(env_t, env_new, 1);
@@ -114,10 +114,10 @@ int saveenv(void)
puts("done\n");
return 0;
}
-#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
+#endif /* CONFIG_SYS_REDUNDANT_ENVIRONMENT */
#endif /* CONFIG_CMD_SAVEENV */
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
void env_relocate_spec(void)
{
ALLOC_CACHE_ALIGN_BUFFER(char, env1_buf, CONFIG_ENV_SIZE);
@@ -179,7 +179,7 @@ void env_relocate_spec(void)
env_flags = ep->flags;
env_import((char *)ep, 0);
}
-#else /* ! CONFIG_SYS_REDUNDAND_ENVIRONMENT */
+#else /* ! CONFIG_SYS_REDUNDANT_ENVIRONMENT */
void env_relocate_spec(void)
{
ALLOC_CACHE_ALIGN_BUFFER(char, buf, CONFIG_ENV_SIZE);
@@ -201,4 +201,4 @@ void env_relocate_spec(void)
env_import(buf, 1);
}
-#endif /* CONFIG_SYS_REDUNDAND_ENVIRONMENT */
+#endif /* CONFIG_SYS_REDUNDANT_ENVIRONMENT */
diff --git a/include/configs/G2000.h b/include/configs/G2000.h
index 5a74abc..7269c24 100644
--- a/include/configs/G2000.h
+++ b/include/configs/G2000.h
@@ -271,7 +271,7 @@
#define CONFIG_ENV_SIZE 0x700 /* 2048 bytes may be used for env vars*/
/* total size of a CAT24WC16 is 2048 bytes */
-#else /* DEFAULT: environment in flash, using redundand flash sectors */
+#else /* DEFAULT: environment in flash, using redundant flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_ADDR 0xFFFA0000 /* environment starts before u-boot */
diff --git a/include/configs/PPChameleonEVB.h b/include/configs/PPChameleonEVB.h
index cd9eb4b..cfb7116 100644
--- a/include/configs/PPChameleonEVB.h
+++ b/include/configs/PPChameleonEVB.h
@@ -387,7 +387,7 @@
#define CONFIG_ENV_OFFSET 0x100 /* environment starts at the beginning of the EEPROM */
#define CONFIG_ENV_SIZE 0x700 /* 2048-256 bytes may be used for env vars (total size of a CAT24WC16 is 2048 bytes)*/
-#else /* DEFAULT: environment in flash, using redundand flash sectors */
+#else /* DEFAULT: environment in flash, using redundant flash sectors */
#define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
#define CONFIG_ENV_ADDR 0xFFFF8000 /* environment starts at the first small sector */
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
index 3de30fc..c338a9a 100644
--- a/include/configs/am335x_evm.h
+++ b/include/configs/am335x_evm.h
@@ -333,7 +333,7 @@
*/
#if defined(CONFIG_SPI_BOOT)
#define CONFIG_ENV_IS_IN_SPI_FLASH
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_REDUNDANT_ENVIRONMENT
#define CONFIG_ENV_SPI_MAX_HZ CONFIG_SF_DEFAULT_SPEED
#define CONFIG_ENV_SECT_SIZE (4 << 10) /* 4 KB sectors */
#define CONFIG_ENV_OFFSET (768 << 10) /* 768 KiB in */
diff --git a/include/configs/igep0033.h b/include/configs/igep0033.h
index 3e18a65..be1e323 100644
--- a/include/configs/igep0033.h
+++ b/include/configs/igep0033.h
@@ -193,7 +193,7 @@
#define CONFIG_SYS_MAX_NAND_DEVICE 1
#define CONFIG_SYS_NAND_ONFI_DETECTION 1
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_REDUNDANT_ENVIRONMENT
#define CONFIG_ENV_IS_IN_NAND
#define CONFIG_ENV_OFFSET 0x180000 /* environment starts here */
#define CONFIG_ENV_ADDR_REDUND (CONFIG_ENV_OFFSET + CONFIG_SYS_ENV_SECT_SIZE)
diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h
index e0368cb..12a89ad 100644
--- a/include/configs/km/km_arm.h
+++ b/include/configs/km/km_arm.h
@@ -245,7 +245,7 @@ int get_scl(void);
#define CONFIG_ENV_SIZE_REDUND (CONFIG_ENV_SIZE)
#endif
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_REDUNDANT_ENVIRONMENT
#define CONFIG_SPI_FLASH
#define CONFIG_SPI_FLASH_STMICRO
diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h
index 07f88ca..2085efe 100644
--- a/include/configs/mx28evk.h
+++ b/include/configs/mx28evk.h
@@ -70,7 +70,7 @@
/* Environemnt is in SPI flash */
#if defined(CONFIG_CMD_SF) && defined(CONFIG_ENV_IS_IN_SPI_FLASH)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_REDUNDANT_ENVIRONMENT
#define CONFIG_ENV_SIZE 0x1000 /* 4KB */
#define CONFIG_ENV_OFFSET 0x40000 /* 256K */
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h
index 0d1c43c..5f2131f 100644
--- a/include/configs/omap5_uevm.h
+++ b/include/configs/omap5_uevm.h
@@ -28,7 +28,7 @@
#define CONFIG_SYS_MMC_ENV_DEV 1 /* SLOT2: eMMC(1) */
#define CONFIG_ENV_OFFSET 0xE0000
#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE)
-#define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#define CONFIG_SYS_REDUNDANT_ENVIRONMENT
#define CONFIG_CMD_SAVEENV
/* Enhance our eMMC support / experience. */
diff --git a/include/env_default.h b/include/env_default.h
index a701026..4bbcab9 100644
--- a/include/env_default.h
+++ b/include/env_default.h
@@ -13,7 +13,7 @@
#ifdef DEFAULT_ENV_INSTANCE_EMBEDDED
env_t environment __PPCENV__ = {
ENV_CRC, /* CRC Sum */
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
1, /* Flags: valid */
#endif
{
diff --git a/include/environment.h b/include/environment.h
index 46a3554..5c1e2b9 100644
--- a/include/environment.h
+++ b/include/environment.h
@@ -51,7 +51,7 @@
# define ENV_IS_EMBEDDED
# endif
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define CONFIG_SYS_REDUNDANT_ENVIRONMENT
# endif
# ifdef CONFIG_ENV_IS_EMBEDDED
# error "do not define CONFIG_ENV_IS_EMBEDDED in your board config"
@@ -61,7 +61,7 @@
#if defined(CONFIG_ENV_IS_IN_MMC)
# ifdef CONFIG_ENV_OFFSET_REDUND
-# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define CONFIG_SYS_REDUNDANT_ENVIRONMENT
# endif
#endif
@@ -78,7 +78,7 @@ extern unsigned long nand_env_oob_offset;
# error "Need to define CONFIG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
# endif
# ifdef CONFIG_ENV_OFFSET_REDUND
-# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define CONFIG_SYS_REDUNDANT_ENVIRONMENT
# endif
# endif /* CONFIG_ENV_OFFSET_OOB */
# ifndef CONFIG_ENV_SIZE
@@ -94,7 +94,7 @@ extern unsigned long nand_env_oob_offset;
# error "Need to define CONFIG_ENV_UBI_VOLUME when using CONFIG_ENV_IS_IN_UBI"
# endif
# if defined(CONFIG_ENV_UBI_VOLUME_REDUND)
-# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define CONFIG_SYS_REDUNDANT_ENVIRONMENT
# endif
# ifndef CONFIG_ENV_SIZE
# error "Need to define CONFIG_ENV_SIZE when using CONFIG_ENV_IS_IN_UBI"
@@ -133,7 +133,7 @@ extern unsigned long nand_env_oob_offset;
#include "compiler.h"
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
# define ENV_HEADER_SIZE (sizeof(uint32_t) + 1)
# define ACTIVE_FLAG 1
@@ -150,7 +150,7 @@ extern char *env_name_spec;
typedef struct environment_s {
uint32_t crc; /* CRC32 over data bytes */
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
unsigned char flags; /* active/obsolete flags */
#endif
unsigned char data[ENV_SIZE]; /* Environment data */
diff --git a/tools/envcrc.c b/tools/envcrc.c
index a9d9b48..a758992 100644
--- a/tools/envcrc.c
+++ b/tools/envcrc.c
@@ -40,7 +40,7 @@
# define ENV_IS_EMBEDDED
# endif
# if defined(CONFIG_ENV_ADDR_REDUND) || defined(CONFIG_ENV_OFFSET_REDUND)
-# define CONFIG_SYS_REDUNDAND_ENVIRONMENT
+# define CONFIG_SYS_REDUNDANT_ENVIRONMENT
# endif
#endif /* CONFIG_ENV_IS_IN_FLASH */
@@ -48,7 +48,7 @@
# define CONFIG_BUILD_ENVCRC
#endif
-#ifdef CONFIG_SYS_REDUNDAND_ENVIRONMENT
+#ifdef CONFIG_SYS_REDUNDANT_ENVIRONMENT
# define ENV_HEADER_SIZE (sizeof(uint32_t) + 1)
#else
# define ENV_HEADER_SIZE (sizeof(uint32_t))
--
========================================================================
Robert P. J. Day Ottawa, Ontario, CANADA
http://crashcourse.ca
Twitter: http://twitter.com/rpjday
LinkedIn: http://ca.linkedin.com/in/rpjday
========================================================================
More information about the U-Boot
mailing list