iMX/i2som-imx-uboot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i2SOM: modify macro name

Browse Source
This commit is contained in:
SteveChen
2018-04-10 14:48:01 +08:00
parent d2b843b4b8
commit 6fcfc4bdce
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
board/i2som/common/helper.c
View File

@ -1,4 +1,5 @@
/*
* Copyright (C) 2017 i2SOM Team.
* Copyright (C) 2017 by Digi International Inc.
* All rights reserved.
*
@ -247,7 +248,7 @@ int get_default_devpartno(int src, char *devpartno)
return 0;
}
#ifdef CONFIG_DIGI_UBI
#ifdef CONFIG_I2SOM_UBI
bool is_ubi_partition(struct part_info *part)
{
struct mtd_info *nand = &nand_info[0];
@ -275,7 +276,7 @@ bool is_ubi_partition(struct part_info *part)
return ret;
}
#endif /* CONFIG_DIGI_UBI */
#endif /* CONFIG_I2SOM_UBI */
#endif /* CONFIG_CMD_UPDATE || CONFIG_CMD_DBOOT */
#ifdef CONFIG_CMD_UPDATE
@ -407,7 +408,7 @@ int load_firmware(struct load_fw *fwinfo)
}
break;
case SRC_NAND:
#ifdef CONFIG_DIGI_UBI
#ifdef CONFIG_I2SOM_UBI
/*
* If the partition is UBI formatted, use 'ubiload' to read
* a file from the UBIFS file system. Otherwise use a raw

9
board/i2som/common/helper.h
View File

@ -1,4 +1,5 @@
/*
* Copyright (C) 2017 i2SOM Team.
* Copyright (C) 2014 by Digi International Inc.
* All rights reserved.
*
@ -7,8 +8,8 @@
* the Free Software Foundation.
*/
#ifndef __DIGI_HELPER_H
#define __DIGI_HELPER_H
#ifndef __I2SOM_HELPER_H
#define __I2SOM_HELPER_H
#include <jffs2/load_kernel.h>
@ -50,7 +51,7 @@ int get_source(int argc, char * const argv[], struct load_fw *fwinfo);
const char *get_source_string(int src);
int get_fw_filename(int argc, char * const argv[], struct load_fw *fwinfo);
char *get_default_filename(char *partname, int cmd);
#ifdef CONFIG_DIGI_UBI
#ifdef CONFIG_I2SOM_UBI
bool is_ubi_partition(struct part_info *part);
#endif
int strtou32(const char *str, unsigned int base, u32 *result);
@ -72,4 +73,4 @@ unsigned int get_filesystem_key_offset(void);
uint get_env_hwpart(void);
u64 memsize_parse(const char *const ptr, const char **retptr);
#endif /* __DIGI_HELPER_H */
#endif /* __I2SOM_HELPER_H */