Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2025-02-27 04:47:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

schmoogie: fix build error due to removal of forceenv()

Browse source 
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 <wd@denx.de>
Cc: Sergey Kubushyn <ksi@koi8.net>
Acked-by: Sergey Kubushyn <ksi@koi8.net>
This commit is contained in:
Wolfgang Denk 2010-10-05 21:17:28 +02:00
parent 439f6f7ec1
commit b6e7bd9740
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
board/davinci/schmoogie/schmoogie.c
View file

@ -107,12 +107,12 @@ int misc_init_r(void)
/* Set serial number from UID chip */ /* Set serial number from UID chip */
if (i2c_read(CONFIG_SYS_UID_ADDR, 0, 1, buf, 8)) { if (i2c_read(CONFIG_SYS_UID_ADDR, 0, 1, buf, 8)) {
printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR);
forceenv("serial#", "FAILED"); setenv("serial#", "FAILED");
} else { } else {
if (buf[0] != 0x70) { if (buf[0] != 0x70) {
/* Device Family Code */ /* Device Family Code */
printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR); printf("\nUID @ 0x%02x read FAILED!!!\n", CONFIG_SYS_UID_ADDR);
forceenv("serial#", "FAILED"); setenv("serial#", "FAILED");
} }
} }
/* Now check CRC */ /* Now check CRC */
@ -122,12 +122,12 @@ int misc_init_r(void)
if (tmp[0] != 0) { if (tmp[0] != 0) {
printf("\nUID @ 0x%02x - BAD CRC!!!\n", CONFIG_SYS_UID_ADDR); printf("\nUID @ 0x%02x - BAD CRC!!!\n", CONFIG_SYS_UID_ADDR);
forceenv("serial#", "FAILED"); setenv("serial#", "FAILED");
} else { } else {
/* CRC OK, set "serial" env variable */ /* CRC OK, set "serial" env variable */
sprintf((char *)&tmp[0], "%02x%02x%02x%02x%02x%02x", sprintf((char *)&tmp[0], "%02x%02x%02x%02x%02x%02x",
buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]); buf[6], buf[5], buf[4], buf[3], buf[2], buf[1]);
forceenv("serial#", (char *)&tmp[0]); setenv("serial#", (char *)&tmp[0]);
} }
return(0); return(0);

1
include/configs/davinci_sonata.h
View file

@ -118,6 +118,7 @@
#define CONFIG_SYS_NAND_CS 2 #define CONFIG_SYS_NAND_CS 2
#undef CONFIG_ENV_IS_IN_FLASH #undef CONFIG_ENV_IS_IN_FLASH
#define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_NO_FLASH
#define CONFIG_ENV_OVERWRITE /* instead if obsoleted forceenv() */
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */ #define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
#define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */ #define CONFIG_ENV_SECT_SIZE 512 /* Env sector Size */
#define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */ #define CONFIG_ENV_SIZE (16 << 10) /* 16 KiB */