On Tue, 5 Oct 2010, Wolfgang Denk wrote:
Ack-by: Sergey Kubushyn <k...@koi8.net>
---
> commit 6d014adf dropped support for the forceenv() function, but failed
> to remove references to it from board/davinci/schmoogie/schmoogie.c
>
> Replace forceenv() by setenv() and set CONFIG_ENV_OVERWRITE instead in
> the board config file to allow overwriting the serial number.
>
> Signed-off-by: Wolfgang Denk <w...@denx.de>
> Cc: Sergey Kubushyn <k...@koi8.net>
> ---
> board/davinci/schmoogie/schmoogie.c | 8 ++++----
> include/configs/davinci-schmoogie.h | 1 +
> 2 files changed, 5 insertions(+), 4 deletions(-)
>
> diff --git a/board/davinci/schmoogie/schmoogie.c
> b/board/davinci/schmoogie/schmoogie.c
> index 19c9580..80a0f9f 100644
> --- a/board/davinci/schmoogie/schmoogie.c
> +++ b/board/davinci/schmoogie/schmoogie.c
> @@ -107,12 +107,12 @@ int misc_init_r(void)
> /* Set serial number from UID chip */
> if (i2c_read(CONFIG_SYS_UID_ADDR, 0, 1, buf, 8)) {
> printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR);
> - forceenv("serial#", "FAILED");
> + setenv("serial#", "FAILED");
> } else {
> if (buf[0] != 0x70) {
> /* Device Family Code */
> printf("\nUID @ 0x%02x read FAILED!!!\n",
> CONFIG_SYS_UID_ADDR);
> - forceenv("serial#", "FAILED");
> + setenv("serial#", "FAILED");
> }
> }
> /* Now check CRC */
> @@ -122,12 +122,12 @@ int misc_init_r(void)
>
> if (tmp[0] != 0) {
> printf("\nUID @ 0x%02x - BAD CRC!!!\n", CONFIG_SYS_UID_ADDR);
> - forceenv("serial#", "FAILED");
> + setenv("serial#", "FAILED");
> } else {
> /* CRC OK, set "serial" env variable */
> sprintf((char *)&tmp[0], "%02x%02x%02x%02x%02x%02x",
> buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]);
> - forceenv("serial#", (char *)&tmp[0]);
> + setenv("serial#", (char *)&tmp[0]);
> }
>
> return(0);
> diff --git a/include/configs/davinci-schmoogie.h
> b/include/configs/davinci-schmoogie.h
> index 04cdc21..5b140fc 100644
> --- a/include/configs/davinci-schmoogie.h
> +++ b/include/configs/davinci-schmoogie.h
> @@ -83,6 +83,7 @@
> /*=====================*/
> #undef CONFIG_ENV_IS_IN_FLASH
> #define CONFIG_SYS_NO_FLASH
> +#define CONFIG_ENV_OVERWRITE /* instead if obsoleted forceenv() */
> #define CONFIG_NAND_DAVINCI
> #define CONFIG_SYS_NAND_CS 2
> #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
> --
> 1.7.2.3
>
---
******************************************************************
* k...@home KOI8 Net < > The impossible we do immediately. *
* Las Vegas NV, USA < > Miracles require 24-hour notice. *
******************************************************************
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot
