mirror of
https://github.com/Fishwaldo/u-boot.git
synced 2025-04-01 12:01:31 +00:00
rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
This commit is contained in:
parent
d8cc04d0ac
commit
51bfee1920
24 changed files with 34 additions and 34 deletions
2
README
2
README
|
@ -2255,7 +2255,7 @@ to save the current settings.
|
||||||
environment area within the total memory of your DataFlash placed
|
environment area within the total memory of your DataFlash placed
|
||||||
at the specified address.
|
at the specified address.
|
||||||
|
|
||||||
- CFG_ENV_IS_IN_NAND:
|
- CONFIG_ENV_IS_IN_NAND:
|
||||||
|
|
||||||
Define this if you have a NAND device which you want to use
|
Define this if you have a NAND device which you want to use
|
||||||
for the environment.
|
for the environment.
|
||||||
|
|
|
@ -56,7 +56,7 @@ DECLARE_GLOBAL_DATA_PTR;
|
||||||
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
|
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
|
||||||
!defined(CFG_ENV_IS_IN_FLASH) && \
|
!defined(CFG_ENV_IS_IN_FLASH) && \
|
||||||
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
|
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
|
||||||
!defined(CFG_ENV_IS_IN_NAND) && \
|
!defined(CONFIG_ENV_IS_IN_NAND) && \
|
||||||
!defined(CFG_ENV_IS_IN_ONENAND) && \
|
!defined(CFG_ENV_IS_IN_ONENAND) && \
|
||||||
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \
|
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \
|
||||||
!defined(CFG_ENV_IS_NOWHERE)
|
!defined(CFG_ENV_IS_NOWHERE)
|
||||||
|
|
|
@ -133,7 +133,7 @@ uchar default_environment[] = {
|
||||||
"\0"
|
"\0"
|
||||||
};
|
};
|
||||||
|
|
||||||
#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
|
#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */ \
|
||||||
|| defined(CFG_ENV_IS_IN_SPI_FLASH)
|
|| defined(CFG_ENV_IS_IN_SPI_FLASH)
|
||||||
int default_environment_size = sizeof(default_environment);
|
int default_environment_size = sizeof(default_environment);
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -34,7 +34,7 @@
|
||||||
|
|
||||||
#include <common.h>
|
#include <common.h>
|
||||||
|
|
||||||
#if defined(CFG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
|
#if defined(CONFIG_ENV_IS_IN_NAND) /* Environment is in Nand Flash */
|
||||||
|
|
||||||
#include <command.h>
|
#include <command.h>
|
||||||
#include <environment.h>
|
#include <environment.h>
|
||||||
|
@ -367,4 +367,4 @@ static void use_default()
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#endif /* CFG_ENV_IS_IN_NAND */
|
#endif /* CONFIG_ENV_IS_IN_NAND */
|
||||||
|
|
|
@ -385,7 +385,7 @@
|
||||||
* Environment
|
* Environment
|
||||||
*/
|
*/
|
||||||
#if defined(CONFIG_NAND_U_BOOT)
|
#if defined(CONFIG_NAND_U_BOOT)
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET (512 * 1024)
|
#define CFG_ENV_OFFSET (512 * 1024)
|
||||||
#define CFG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE
|
#define CFG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE
|
||||||
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
|
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
|
||||||
|
|
|
@ -107,7 +107,7 @@
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
|
#define CONFIG_ENV_IS_IN_EEPROM 1 /* use FLASH for environment vars */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@
|
||||||
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -98,7 +98,7 @@
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -180,7 +180,7 @@
|
||||||
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
||||||
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -162,7 +162,7 @@
|
||||||
#else /* CFG_USE_NANDFLASH */
|
#else /* CFG_USE_NANDFLASH */
|
||||||
|
|
||||||
/* bootstrap + u-boot + env + linux in nandflash */
|
/* bootstrap + u-boot + env + linux in nandflash */
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x60000
|
#define CFG_ENV_OFFSET 0x60000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x80000
|
#define CFG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
||||||
|
|
|
@ -162,7 +162,7 @@
|
||||||
#else /* CFG_USE_NANDFLASH */
|
#else /* CFG_USE_NANDFLASH */
|
||||||
|
|
||||||
/* bootstrap + u-boot + env + linux in nandflash */
|
/* bootstrap + u-boot + env + linux in nandflash */
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x60000
|
#define CFG_ENV_OFFSET 0x60000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x80000
|
#define CFG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
||||||
|
|
|
@ -168,7 +168,7 @@
|
||||||
#else /* CFG_USE_NANDFLASH */
|
#else /* CFG_USE_NANDFLASH */
|
||||||
|
|
||||||
/* bootstrap + u-boot + env + linux in nandflash */
|
/* bootstrap + u-boot + env + linux in nandflash */
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x60000
|
#define CFG_ENV_OFFSET 0x60000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x80000
|
#define CFG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
||||||
|
|
|
@ -137,7 +137,7 @@
|
||||||
#else /* CFG_USE_NANDFLASH */
|
#else /* CFG_USE_NANDFLASH */
|
||||||
|
|
||||||
/* bootstrap + u-boot + env + linux in nandflash */
|
/* bootstrap + u-boot + env + linux in nandflash */
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x60000
|
#define CFG_ENV_OFFSET 0x60000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x80000
|
#define CFG_ENV_OFFSET_REDUND 0x80000
|
||||||
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
#define CFG_ENV_SIZE 0x20000 /* 1 sector = 128 kB */
|
||||||
|
|
|
@ -105,7 +105,7 @@
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -183,7 +183,7 @@
|
||||||
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
||||||
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
||||||
#define CFG_NAND_CS 3 /* NAND chip connected to CSx */
|
#define CFG_NAND_CS 3 /* NAND chip connected to CSx */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||||
#define CFG_NAND_CS 0 /* NAND chip connected to CSx */
|
#define CFG_NAND_CS 0 /* NAND chip connected to CSx */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
@ -174,7 +174,7 @@
|
||||||
48, 49, 50, 51, 52, 53, 54, 55, \
|
48, 49, 50, 51, 52, 53, 54, 55, \
|
||||||
56, 57, 58, 59, 60, 61, 62, 63}
|
56, 57, 58, 59, 60, 61, 62, 63}
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
|
* look at the file board/amcc/canyonlands/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -114,7 +114,7 @@
|
||||||
#ifdef CFG_USE_NAND
|
#ifdef CFG_USE_NAND
|
||||||
#undef CFG_ENV_IS_IN_FLASH
|
#undef CFG_ENV_IS_IN_FLASH
|
||||||
#define CFG_NO_FLASH
|
#define CFG_NO_FLASH
|
||||||
#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
||||||
#ifdef CFG_NAND_SMALLPAGE
|
#ifdef CFG_NAND_SMALLPAGE
|
||||||
#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
|
#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
|
||||||
#define CFG_ENV_SIZE SZ_16K
|
#define CFG_ENV_SIZE SZ_16K
|
||||||
|
|
|
@ -81,7 +81,7 @@
|
||||||
/*=====================*/
|
/*=====================*/
|
||||||
#undef CFG_ENV_IS_IN_FLASH
|
#undef CFG_ENV_IS_IN_FLASH
|
||||||
#define CFG_NO_FLASH
|
#define CFG_NO_FLASH
|
||||||
#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
||||||
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
|
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
|
||||||
#define CFG_ENV_SIZE SZ_128K
|
#define CFG_ENV_SIZE SZ_128K
|
||||||
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
||||||
|
|
|
@ -77,7 +77,7 @@
|
||||||
/* Flash & Environment */
|
/* Flash & Environment */
|
||||||
#undef CFG_ENV_IS_IN_FLASH
|
#undef CFG_ENV_IS_IN_FLASH
|
||||||
#define CFG_NO_FLASH
|
#define CFG_NO_FLASH
|
||||||
#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
||||||
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
|
#define CFG_ENV_SECT_SIZE 2048 /* Env sector Size */
|
||||||
#define CFG_ENV_SIZE SZ_128K
|
#define CFG_ENV_SIZE SZ_128K
|
||||||
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
||||||
|
|
|
@ -114,7 +114,7 @@
|
||||||
#ifdef CFG_USE_NAND
|
#ifdef CFG_USE_NAND
|
||||||
#undef CFG_ENV_IS_IN_FLASH
|
#undef CFG_ENV_IS_IN_FLASH
|
||||||
#define CFG_NO_FLASH
|
#define CFG_NO_FLASH
|
||||||
#define CFG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
#define CONFIG_ENV_IS_IN_NAND /* U-Boot env in NAND Flash */
|
||||||
#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
|
#define CFG_ENV_SECT_SIZE 512 /* Env sector Size */
|
||||||
#define CFG_ENV_SIZE SZ_16K
|
#define CFG_ENV_SIZE SZ_16K
|
||||||
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
#define CONFIG_SKIP_LOWLEVEL_INIT /* U-Boot is loaded by a bootloader */
|
||||||
|
|
|
@ -262,7 +262,7 @@
|
||||||
|
|
||||||
#define CFG_NO_FLASH 1
|
#define CFG_NO_FLASH 1
|
||||||
|
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x40000
|
#define CFG_ENV_OFFSET 0x40000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x44000
|
#define CFG_ENV_OFFSET_REDUND 0x44000
|
||||||
#define CFG_ENV_SIZE 0x4000
|
#define CFG_ENV_SIZE 0x4000
|
||||||
|
|
|
@ -123,7 +123,7 @@
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -200,7 +200,7 @@
|
||||||
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
||||||
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -270,7 +270,7 @@
|
||||||
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
|
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
|
||||||
|
|
||||||
#ifdef CFG_NAND_BOOT
|
#ifdef CFG_NAND_BOOT
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x80000 /* environment starts here */
|
#define CFG_ENV_OFFSET 0x80000 /* environment starts here */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
|
#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
|
||||||
|
|
|
@ -115,7 +115,7 @@
|
||||||
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
|
||||||
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
|
#define CFG_ENV_IS_IN_FLASH 1 /* use FLASH for environ vars */
|
||||||
#else
|
#else
|
||||||
#define CFG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */
|
#define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environ vars */
|
||||||
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
#define CFG_ENV_IS_EMBEDDED 1 /* use embedded environment */
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
@ -197,7 +197,7 @@
|
||||||
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
|
||||||
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
|
||||||
|
|
||||||
#ifdef CFG_ENV_IS_IN_NAND
|
#ifdef CONFIG_ENV_IS_IN_NAND
|
||||||
/*
|
/*
|
||||||
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
* For NAND booting the environment is embedded in the U-Boot image. Please take
|
||||||
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
* look at the file board/amcc/sequoia/u-boot-nand.lds for details.
|
||||||
|
|
|
@ -284,7 +284,7 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
/* Settings as above boot configuration */
|
/* Settings as above boot configuration */
|
||||||
#define CFG_ENV_IS_IN_NAND
|
#define CONFIG_ENV_IS_IN_NAND
|
||||||
#define CONFIG_BOOTARGS "console=ttySAC,115200"
|
#define CONFIG_BOOTARGS "console=ttySAC,115200"
|
||||||
|
|
||||||
#if !defined(CONFIG_ENABLE_MMU)
|
#if !defined(CONFIG_ENABLE_MMU)
|
||||||
|
|
|
@ -231,7 +231,7 @@
|
||||||
|
|
||||||
#define CFG_NO_FLASH 1
|
#define CFG_NO_FLASH 1
|
||||||
|
|
||||||
#define CFG_ENV_IS_IN_NAND 1
|
#define CONFIG_ENV_IS_IN_NAND 1
|
||||||
#define CFG_ENV_OFFSET 0x40000
|
#define CFG_ENV_OFFSET 0x40000
|
||||||
#define CFG_ENV_OFFSET_REDUND 0x44000
|
#define CFG_ENV_OFFSET_REDUND 0x44000
|
||||||
#define CFG_ENV_SIZE 0x4000
|
#define CFG_ENV_SIZE 0x4000
|
||||||
|
|
|
@ -69,12 +69,12 @@
|
||||||
# endif
|
# endif
|
||||||
#endif /* CFG_ENV_IS_IN_FLASH */
|
#endif /* CFG_ENV_IS_IN_FLASH */
|
||||||
|
|
||||||
#if defined(CFG_ENV_IS_IN_NAND)
|
#if defined(CONFIG_ENV_IS_IN_NAND)
|
||||||
# ifndef CFG_ENV_OFFSET
|
# ifndef CFG_ENV_OFFSET
|
||||||
# error "Need to define CFG_ENV_OFFSET when using CFG_ENV_IS_IN_NAND"
|
# error "Need to define CFG_ENV_OFFSET when using CONFIG_ENV_IS_IN_NAND"
|
||||||
# endif
|
# endif
|
||||||
# ifndef CFG_ENV_SIZE
|
# ifndef CFG_ENV_SIZE
|
||||||
# error "Need to define CFG_ENV_SIZE when using CFG_ENV_IS_IN_NAND"
|
# error "Need to define CFG_ENV_SIZE when using CONFIG_ENV_IS_IN_NAND"
|
||||||
# endif
|
# endif
|
||||||
# ifdef CFG_ENV_OFFSET_REDUND
|
# ifdef CFG_ENV_OFFSET_REDUND
|
||||||
# define CFG_REDUNDAND_ENVIRONMENT
|
# define CFG_REDUNDAND_ENVIRONMENT
|
||||||
|
@ -82,7 +82,7 @@
|
||||||
# ifdef CFG_ENV_IS_EMBEDDED
|
# ifdef CFG_ENV_IS_EMBEDDED
|
||||||
# define ENV_IS_EMBEDDED 1
|
# define ENV_IS_EMBEDDED 1
|
||||||
# endif
|
# endif
|
||||||
#endif /* CFG_ENV_IS_IN_NAND */
|
#endif /* CONFIG_ENV_IS_IN_NAND */
|
||||||
|
|
||||||
#ifdef USE_HOSTCC
|
#ifdef USE_HOSTCC
|
||||||
# include <stdint.h>
|
# include <stdint.h>
|
||||||
|
|
Loading…
Add table
Reference in a new issue