libdigi: update mach_id for merged platforms

This fixes 'update_flash' related problems.

update_flash needs to know in which platform is running so it can decide
whether to write clean-markers for JFFS2 images or not (for example in
FSL platforms).

https://jira.digi.com/browse/DEL-221 #resolve
https://jira.digi.com/browse/DEL-222 #resolve

Signed-off-by: Javier Viguera <javier.viguera@digi.com>
This commit is contained in:
Javier Viguera 2013-01-28 19:29:51 +01:00
parent 7fffaecfa2
commit cf4c248cf8
2 changed files with 19 additions and 1 deletions

View File

@ -97,6 +97,18 @@
#define MACH_TYPE_CCARDWMX28JS_NAME "ccardwmx28js" #define MACH_TYPE_CCARDWMX28JS_NAME "ccardwmx28js"
#define MACH_TYPE_CCARDMX28JS 3918 #define MACH_TYPE_CCARDMX28JS 3918
#define MACH_TYPE_CCARDMX28JS_NAME "ccardmx28js" #define MACH_TYPE_CCARDMX28JS_NAME "ccardmx28js"
#define MACH_TYPE_CCXMX53 9980
#define MACH_TYPE_CCXMX53_NAME "ccxmx53"
#define MACH_TYPE_CCXMX53JS 9981
#define MACH_TYPE_CCXMX53JS_NAME "ccxmx53js"
#define MACH_TYPE_CCXMX51 9982
#define MACH_TYPE_CCXMX51_NAME "ccxmx51"
#define MACH_TYPE_CCXMX51JS 9983
#define MACH_TYPE_CCXMX51JS_NAME "ccxmx51js"
#define MACH_TYPE_CCARDXMX28 9984
#define MACH_TYPE_CCARDXMX28_NAME "ccardxmx28"
#define MACH_TYPE_CCARDXMX28JS 9985
#define MACH_TYPE_CCARDXMX28JS_NAME "ccardxmx28js"
int get_platform_id(void); int get_platform_id(void);
char is_nand_oob_atomic(void); char is_nand_oob_atomic(void);

View File

@ -54,14 +54,20 @@ char is_nand_oob_atomic(void)
MACH_TYPE_CCMX51JS == platform_id || MACH_TYPE_CCMX51JS == platform_id ||
MACH_TYPE_CCWMX51 == platform_id || MACH_TYPE_CCWMX51 == platform_id ||
MACH_TYPE_CCWMX51JS == platform_id || MACH_TYPE_CCWMX51JS == platform_id ||
MACH_TYPE_CCXMX51 == platform_id ||
MACH_TYPE_CCXMX51JS == platform_id ||
MACH_TYPE_CCMX53 == platform_id || MACH_TYPE_CCMX53 == platform_id ||
MACH_TYPE_CCMX53JS == platform_id || MACH_TYPE_CCMX53JS == platform_id ||
MACH_TYPE_CCWMX53 == platform_id || MACH_TYPE_CCWMX53 == platform_id ||
MACH_TYPE_CCWMX53JS == platform_id || MACH_TYPE_CCWMX53JS == platform_id ||
MACH_TYPE_CCXMX53 == platform_id ||
MACH_TYPE_CCXMX53JS == platform_id ||
MACH_TYPE_CCARDMX28 == platform_id || MACH_TYPE_CCARDMX28 == platform_id ||
MACH_TYPE_CCARDMX28JS == platform_id || MACH_TYPE_CCARDMX28JS == platform_id ||
MACH_TYPE_CCARDWMX28 == platform_id || MACH_TYPE_CCARDWMX28 == platform_id ||
MACH_TYPE_CCARDWMX28JS == platform_id) { MACH_TYPE_CCARDWMX28JS == platform_id ||
MACH_TYPE_CCARDXMX28 == platform_id ||
MACH_TYPE_CCARDXMX28JS == platform_id) {
return 1; return 1;
} }