ksi@koi8.net wrote:
Signed-off-by: Sergey Kubushyn ksi@koi8.net
...
diff -purN u-boot.git.orig/include/configs/davinci.h u-boot.git/include/configs/davinci.h --- u-boot.git.orig/include/configs/davinci.h 1969-12-31 16:00:00.000000000 -0800 +++ u-boot.git/include/configs/davinci.h 2007-08-05 16:19:52.000000000 -0700
...
+/*===========================================================================*/ +/* Board, choose one */ +/*===========================================================================*/ +#define DV_EVM +/* +#define DV_EVM +#define SONATA_BOARD +#define SCHMOOGIE +*/
...
+#ifdef SONATA_BOARD +#define CFG_FLASH_SECT_SZ 0x20000 /* 128KB sect size AMD Flash */ +#define CFG_ENV_OFFSET (CFG_FLASH_SECT_SZ*2) +#elif defined(DV_EVM) +#define CFG_FLASH_SECT_SZ 0x10000 /* 64KB sect size AMD Flash */ +#define CFG_ENV_OFFSET (CFG_FLASH_SECT_SZ*3) +#else +#error "Unknown board in NOR Flash config (davinci.h) !!!" +#endif
- Can you please check if this really compiles for all three boards, especially for SCHMOOGIE?
- I vote for at least having three config files, one for each board (as done by my patch ;) ).
+/*=================*/ +/* U-Boot commands */ +/*=================*/ +#define COMMON_CMD_SET (CONFIG_CMD_DFL |\
CFG_CMD_PING |\CFG_CMD_DHCP |\CFG_CMD_I2C |\CFG_CMD_DIAG |\CFG_CMD_ASKENV |\CFG_CMD_SAVES |\CFG_CMD_MII)+#ifdef CFG_USE_NAND +#define CUSTOM_CMD_SET ((COMMON_CMD_SET |\
CFG_CMD_NAND) &\~(CFG_CMD_FLASH |\CFG_CMD_IMLS))+#elif defined(CFG_USE_NOR) +#define CUSTOM_CMD_SET ((COMMON_CMD_SET |\
CFG_CMD_FLASH |\CFG_CMD_JFFS2) &\~(CFG_CMD_NAND))+#else +#error "Either CFG_USE_NAND or CFG_USE_NOR _MUST_ be defined !!!" +#endif +#ifdef SCHMOOGIE +#define CONFIG_COMMANDS ((CUSTOM_CMD_SET) |\
(CFG_CMD_DATE))+#elif defined(DV_EVM) || defined(SONATA_BOARD) +#define CONFIG_COMMANDS ((CUSTOM_CMD_SET) |\
(CFG_CMD_EEPROM))+#else +#define CONFIG_COMMANDS (CUSTOM_CMD_SET) +#endif +/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */ +#include <cmd_confdefs.h>
- I had to learn that recent git update from today needs update to this stuff (there is no cmd_confdefs.h any more). So, with git from yesterday, Sunday, this still works, but recent git update needs an update of this as well. See e.g.
http://www.denx.de/cgi-bin/gitweb.cgi?p=u-boot.git;a=commitdiff;h=a5cb23092a...
Best regards
Dirk