mirror of
https://github.com/brain-hackers/u-boot-brain
synced 2024-06-09 23:36:03 +09:00
onenand: Fix compile errors due to FlexOneNAND
This patch fixes the compile error while trying to compile for omap3evm. env_onenand.c: In function 'env_relocate_spec': env_onenand.c:70: error: 'CONFIG_ENV_ADDR_FLEX' undeclared (first use in this function) env_onenand.c:70: error: (Each undeclared identifier is re ported only once env_onenand.c:70: error: for each function it appears in.) env_onenand.c: In function 'saveenv': env_onenand.c:106: error: 'CONFIG_ENV_ADDR_FLEX' undeclare d (first use in this function) env_onenand.c:107: error: 'CONFIG_ENV_SIZE_FLEX' undeclare d (first use in this function) Signed-off-by: Sanjeev Premi <premi@ti.com> Acked-by: Tom Rix <Tom.Rix@windriver.com>
This commit is contained in:
parent
20da6f4d93
commit
b821cead7d
|
@ -60,15 +60,18 @@ uchar env_get_char_spec(int index)
|
||||||
void env_relocate_spec(void)
|
void env_relocate_spec(void)
|
||||||
{
|
{
|
||||||
struct mtd_info *mtd = &onenand_mtd;
|
struct mtd_info *mtd = &onenand_mtd;
|
||||||
|
#ifdef CONFIG_ENV_ADDR_FLEX
|
||||||
struct onenand_chip *this = &onenand_chip;
|
struct onenand_chip *this = &onenand_chip;
|
||||||
|
#endif
|
||||||
loff_t env_addr;
|
loff_t env_addr;
|
||||||
int use_default = 0;
|
int use_default = 0;
|
||||||
size_t retlen;
|
size_t retlen;
|
||||||
|
|
||||||
env_addr = CONFIG_ENV_ADDR;
|
env_addr = CONFIG_ENV_ADDR;
|
||||||
|
#ifdef CONFIG_ENV_ADDR_FLEX
|
||||||
if (FLEXONENAND(this))
|
if (FLEXONENAND(this))
|
||||||
env_addr = CONFIG_ENV_ADDR_FLEX;
|
env_addr = CONFIG_ENV_ADDR_FLEX;
|
||||||
|
#endif
|
||||||
/* Check OneNAND exist */
|
/* Check OneNAND exist */
|
||||||
if (mtd->writesize)
|
if (mtd->writesize)
|
||||||
/* Ignore read fail */
|
/* Ignore read fail */
|
||||||
|
@ -94,7 +97,9 @@ void env_relocate_spec(void)
|
||||||
int saveenv(void)
|
int saveenv(void)
|
||||||
{
|
{
|
||||||
struct mtd_info *mtd = &onenand_mtd;
|
struct mtd_info *mtd = &onenand_mtd;
|
||||||
|
#ifdef CONFIG_ENV_ADDR_FLEX
|
||||||
struct onenand_chip *this = &onenand_chip;
|
struct onenand_chip *this = &onenand_chip;
|
||||||
|
#endif
|
||||||
loff_t env_addr = CONFIG_ENV_ADDR;
|
loff_t env_addr = CONFIG_ENV_ADDR;
|
||||||
struct erase_info instr = {
|
struct erase_info instr = {
|
||||||
.callback = NULL,
|
.callback = NULL,
|
||||||
|
@ -102,12 +107,14 @@ int saveenv(void)
|
||||||
size_t retlen;
|
size_t retlen;
|
||||||
|
|
||||||
instr.len = CONFIG_ENV_SIZE;
|
instr.len = CONFIG_ENV_SIZE;
|
||||||
|
#ifdef CONFIG_ENV_ADDR_FLEX
|
||||||
if (FLEXONENAND(this)) {
|
if (FLEXONENAND(this)) {
|
||||||
env_addr = CONFIG_ENV_ADDR_FLEX;
|
env_addr = CONFIG_ENV_ADDR_FLEX;
|
||||||
instr.len = CONFIG_ENV_SIZE_FLEX;
|
instr.len = CONFIG_ENV_SIZE_FLEX;
|
||||||
instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ?
|
instr.len <<= onenand_mtd.eraseregions[0].numblocks == 1 ?
|
||||||
1 : 0;
|
1 : 0;
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
instr.addr = env_addr;
|
instr.addr = env_addr;
|
||||||
instr.mtd = mtd;
|
instr.mtd = mtd;
|
||||||
if (mtd->erase(mtd, &instr)) {
|
if (mtd->erase(mtd, &instr)) {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user