Fix "clocks_in_mhz" typo

diff --git a/CHANGELOG b/CHANGELOG
index 4aba557353c52146db1b1e3c739ed7a73dca51b2..f52e2f62a7eb27b26f0eb9268b320c4cc149d198 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -52,6 +52,12 @@ To do:
 * "last user address" is set even if bootp is used without parameters
   (and it uses default address).
 
+======================================================================
+Modifications for 1.0.6:
+======================================================================
+
+* Fixed "clocks_in_mhz" typo
+
 ======================================================================
 Modifications for 1.0.5:
 ======================================================================

diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 5c02ed1c618cfea6e0b5b0851c83d70951f68513..1e0b73eae834a33ddc59f1005dc8f307b9cb9ba1 100644 (file)
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -187,7 +187,7 @@ static uchar default_environment[] = {
        "loadaddr="     MK_STR(CONFIG_LOADADDR)         "\0"
 #endif
 #ifdef  CONFIG_CLOCKS_IN_MHZ
-       "clock_in_mhz=1\0"
+       "clocks_in_mhz=1\0"
 #endif
        "\0"
 };

diff --git a/common/environment.S b/common/environment.S
index 2cf30f51222e332fbf8253b271202db1637a7c6c..f3fee26b9c97396c734959cc30350bfbad9dbed5 100644 (file)
--- a/common/environment.S
+++ b/common/environment.S
@@ -152,7 +152,7 @@ env_data:
        .ascii          "\0"
 #endif
 #ifdef  CONFIG_CLOCKS_IN_MHZ
-       .ascii  "clock_in_mhz=1\0"
+       .ascii  "clocks_in_mhz=1\0"
 #endif
        /* terminate list of environment strings */
        .ascii  "\0"

diff --git a/include/version.h b/include/version.h
index 05a81dc21b2ce426f16a15d1aa7d0608c056904e..40220e73df0388d6a8b6afffa67b8b502a974048 100644 (file)
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,6 @@
 #ifndef        __VERSION_H__
 #define        __VERSION_H__
 
-#define        PPCBOOT_VERSION "PPCBoot 1.0.5"
+#define        PPCBOOT_VERSION "PPCBoot 1.0.6"
 
 #endif /* __VERSION_H__ */