Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
OS
U-Boot.Mirror
提交
51bfee19
U
U-Boot.Mirror
项目概览
OS
/
U-Boot.Mirror
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
U-Boot.Mirror
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
51bfee19
编写于
9月 10, 2008
作者:
J
Jean-Christophe PLAGNIOL-VILLARD
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rename CFG_ENV_IS_IN_NAND in CONFIG_ENV_IS_IN_NAND
Signed-off-by:
N
Jean-Christophe PLAGNIOL-VILLARD
<
plagnioj@jcrosoft.com
>
上级
d8cc04d0
变更
24
隐藏空白更改
内联
并排
Showing
24 changed file
with
34 addition
and
34 deletion
+34
-34
README
README
+1
-1
common/cmd_nvedit.c
common/cmd_nvedit.c
+1
-1
common/env_common.c
common/env_common.c
+1
-1
common/env_nand.c
common/env_nand.c
+2
-2
include/configs/MPC8313ERDB.h
include/configs/MPC8313ERDB.h
+1
-1
include/configs/PMC440.h
include/configs/PMC440.h
+2
-2
include/configs/acadia.h
include/configs/acadia.h
+2
-2
include/configs/at91sam9260ek.h
include/configs/at91sam9260ek.h
+1
-1
include/configs/at91sam9261ek.h
include/configs/at91sam9261ek.h
+1
-1
include/configs/at91sam9263ek.h
include/configs/at91sam9263ek.h
+1
-1
include/configs/at91sam9rlek.h
include/configs/at91sam9rlek.h
+1
-1
include/configs/bamboo.h
include/configs/bamboo.h
+2
-2
include/configs/canyonlands.h
include/configs/canyonlands.h
+2
-2
include/configs/davinci_dvevm.h
include/configs/davinci_dvevm.h
+1
-1
include/configs/davinci_schmoogie.h
include/configs/davinci_schmoogie.h
+1
-1
include/configs/davinci_sffsdr.h
include/configs/davinci_sffsdr.h
+1
-1
include/configs/davinci_sonata.h
include/configs/davinci_sonata.h
+1
-1
include/configs/delta.h
include/configs/delta.h
+1
-1
include/configs/kilauea.h
include/configs/kilauea.h
+2
-2
include/configs/omap2420h4.h
include/configs/omap2420h4.h
+1
-1
include/configs/sequoia.h
include/configs/sequoia.h
+2
-2
include/configs/smdk6400.h
include/configs/smdk6400.h
+1
-1
include/configs/zylonite.h
include/configs/zylonite.h
+1
-1
include/environment.h
include/environment.h
+4
-4
未找到文件。
README
浏览文件 @
51bfee19
...
...
@@ -2255,7 +2255,7 @@ to save the current settings.
environment area within the total memory of your DataFlash placed
at the specified address.
- C
F
G_ENV_IS_IN_NAND:
- C
ONFI
G_ENV_IS_IN_NAND:
Define this if you have a NAND device which you want to use
for the environment.
...
...
common/cmd_nvedit.c
浏览文件 @
51bfee19
...
...
@@ -56,7 +56,7 @@ DECLARE_GLOBAL_DATA_PTR;
!defined(CONFIG_ENV_IS_IN_EEPROM) && \
!defined(CFG_ENV_IS_IN_FLASH) && \
!defined(CONFIG_ENV_IS_IN_DATAFLASH) && \
!defined(C
F
G_ENV_IS_IN_NAND) && \
!defined(C
ONFI
G_ENV_IS_IN_NAND) && \
!defined(CFG_ENV_IS_IN_ONENAND) && \
!defined(CFG_ENV_IS_IN_SPI_FLASH) && \
!defined(CFG_ENV_IS_NOWHERE)
...
...
common/env_common.c
浏览文件 @
51bfee19
...
...
@@ -133,7 +133,7 @@ uchar default_environment[] = {
"
\0
"
};
#if defined(C
F
G_ENV_IS_IN_NAND)
/* Environment is in Nand Flash */
\
#if defined(C
ONFI
G_ENV_IS_IN_NAND)
/* Environment is in Nand Flash */
\
|| defined(CFG_ENV_IS_IN_SPI_FLASH)
int
default_environment_size
=
sizeof
(
default_environment
);
#endif
...
...
common/env_nand.c
浏览文件 @
51bfee19
...
...
@@ -34,7 +34,7 @@
#include <common.h>
#if defined(C
F
G_ENV_IS_IN_NAND)
/* Environment is in Nand Flash */
#if defined(C
ONFI
G_ENV_IS_IN_NAND)
/* Environment is in Nand Flash */
#include <command.h>
#include <environment.h>
...
...
@@ -367,4 +367,4 @@ static void use_default()
}
#endif
#endif
/* C
F
G_ENV_IS_IN_NAND */
#endif
/* C
ONFI
G_ENV_IS_IN_NAND */
include/configs/MPC8313ERDB.h
浏览文件 @
51bfee19
...
...
@@ -385,7 +385,7 @@
* Environment
*/
#if defined(CONFIG_NAND_U_BOOT)
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET (512 * 1024)
#define CFG_ENV_SECT_SIZE CFG_NAND_BLOCK_SIZE
#define CFG_ENV_SIZE CFG_ENV_SECT_SIZE
...
...
include/configs/PMC440.h
浏览文件 @
51bfee19
...
...
@@ -107,7 +107,7 @@
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CONFIG_ENV_IS_IN_EEPROM 1
/* use FLASH for environment vars */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -200,7 +200,7 @@
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
#endif
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/acadia.h
浏览文件 @
51bfee19
...
...
@@ -98,7 +98,7 @@
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CFG_ENV_IS_IN_FLASH 1
/* use FLASH for environment vars */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -180,7 +180,7 @@
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/at91sam9260ek.h
浏览文件 @
51bfee19
...
...
@@ -162,7 +162,7 @@
#else
/* CFG_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x60000
#define CFG_ENV_OFFSET_REDUND 0x80000
#define CFG_ENV_SIZE 0x20000
/* 1 sector = 128 kB */
...
...
include/configs/at91sam9261ek.h
浏览文件 @
51bfee19
...
...
@@ -162,7 +162,7 @@
#else
/* CFG_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x60000
#define CFG_ENV_OFFSET_REDUND 0x80000
#define CFG_ENV_SIZE 0x20000
/* 1 sector = 128 kB */
...
...
include/configs/at91sam9263ek.h
浏览文件 @
51bfee19
...
...
@@ -168,7 +168,7 @@
#else
/* CFG_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x60000
#define CFG_ENV_OFFSET_REDUND 0x80000
#define CFG_ENV_SIZE 0x20000
/* 1 sector = 128 kB */
...
...
include/configs/at91sam9rlek.h
浏览文件 @
51bfee19
...
...
@@ -137,7 +137,7 @@
#else
/* CFG_USE_NANDFLASH */
/* bootstrap + u-boot + env + linux in nandflash */
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x60000
#define CFG_ENV_OFFSET_REDUND 0x80000
#define CFG_ENV_SIZE 0x20000
/* 1 sector = 128 kB */
...
...
include/configs/bamboo.h
浏览文件 @
51bfee19
...
...
@@ -105,7 +105,7 @@
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CFG_ENV_IS_IN_FLASH 1
/* use FLASH for environment vars */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -183,7 +183,7 @@
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/canyonlands.h
浏览文件 @
51bfee19
...
...
@@ -115,7 +115,7 @@
#define CFG_ENV_IS_IN_FLASH 1
/* use FLASH for environment vars */
#define CFG_NAND_CS 3
/* NAND chip connected to CSx */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define CFG_NAND_CS 0
/* NAND chip connected to CSx */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -174,7 +174,7 @@
48, 49, 50, 51, 52, 53, 54, 55, \
56, 57, 58, 59, 60, 61, 62, 63}
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/davinci_dvevm.h
浏览文件 @
51bfee19
...
...
@@ -114,7 +114,7 @@
#ifdef CFG_USE_NAND
#undef CFG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define C
F
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define C
ONFI
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#ifdef CFG_NAND_SMALLPAGE
#define CFG_ENV_SECT_SIZE 512
/* Env sector Size */
#define CFG_ENV_SIZE SZ_16K
...
...
include/configs/davinci_schmoogie.h
浏览文件 @
51bfee19
...
...
@@ -81,7 +81,7 @@
/*=====================*/
#undef CFG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define C
F
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define C
ONFI
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 2048
/* Env sector Size */
#define CFG_ENV_SIZE SZ_128K
#define CONFIG_SKIP_LOWLEVEL_INIT
/* U-Boot is loaded by a bootloader */
...
...
include/configs/davinci_sffsdr.h
浏览文件 @
51bfee19
...
...
@@ -77,7 +77,7 @@
/* Flash & Environment */
#undef CFG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define C
F
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define C
ONFI
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 2048
/* Env sector Size */
#define CFG_ENV_SIZE SZ_128K
#define CONFIG_SKIP_LOWLEVEL_INIT
/* U-Boot is loaded by a bootloader */
...
...
include/configs/davinci_sonata.h
浏览文件 @
51bfee19
...
...
@@ -114,7 +114,7 @@
#ifdef CFG_USE_NAND
#undef CFG_ENV_IS_IN_FLASH
#define CFG_NO_FLASH
#define C
F
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define C
ONFI
G_ENV_IS_IN_NAND
/* U-Boot env in NAND Flash */
#define CFG_ENV_SECT_SIZE 512
/* Env sector Size */
#define CFG_ENV_SIZE SZ_16K
#define CONFIG_SKIP_LOWLEVEL_INIT
/* U-Boot is loaded by a bootloader */
...
...
include/configs/delta.h
浏览文件 @
51bfee19
...
...
@@ -262,7 +262,7 @@
#define CFG_NO_FLASH 1
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x40000
#define CFG_ENV_OFFSET_REDUND 0x44000
#define CFG_ENV_SIZE 0x4000
...
...
include/configs/kilauea.h
浏览文件 @
51bfee19
...
...
@@ -123,7 +123,7 @@
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CFG_ENV_IS_IN_FLASH 1
/* use FLASH for environment vars */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environment vars */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -200,7 +200,7 @@
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/omap2420h4.h
浏览文件 @
51bfee19
...
...
@@ -270,7 +270,7 @@
#define CFG_FLASH_BANKS_LIST { CFG_FLASH_BASE, CFG_FLASH_BASE + PHYS_FLASH_SIZE_1 }
#ifdef CFG_NAND_BOOT
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x80000
/* environment starts here */
#else
#define CFG_ENV_ADDR (CFG_FLASH_BASE + SZ_128K)
...
...
include/configs/sequoia.h
浏览文件 @
51bfee19
...
...
@@ -115,7 +115,7 @@
#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
#define CFG_ENV_IS_IN_FLASH 1
/* use FLASH for environ vars */
#else
#define C
F
G_ENV_IS_IN_NAND 1
/* use NAND for environ vars */
#define C
ONFI
G_ENV_IS_IN_NAND 1
/* use NAND for environ vars */
#define CFG_ENV_IS_EMBEDDED 1
/* use embedded environment */
#endif
...
...
@@ -197,7 +197,7 @@
#define CFG_NAND_ECCTOTAL (CFG_NAND_ECCBYTES * CFG_NAND_ECCSTEPS)
#define CFG_NAND_ECCPOS {0, 1, 2, 3, 6, 7}
#ifdef C
F
G_ENV_IS_IN_NAND
#ifdef C
ONFI
G_ENV_IS_IN_NAND
/*
* 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.
...
...
include/configs/smdk6400.h
浏览文件 @
51bfee19
...
...
@@ -284,7 +284,7 @@
*/
/* Settings as above boot configuration */
#define C
F
G_ENV_IS_IN_NAND
#define C
ONFI
G_ENV_IS_IN_NAND
#define CONFIG_BOOTARGS "console=ttySAC,115200"
#if !defined(CONFIG_ENABLE_MMU)
...
...
include/configs/zylonite.h
浏览文件 @
51bfee19
...
...
@@ -231,7 +231,7 @@
#define CFG_NO_FLASH 1
#define C
F
G_ENV_IS_IN_NAND 1
#define C
ONFI
G_ENV_IS_IN_NAND 1
#define CFG_ENV_OFFSET 0x40000
#define CFG_ENV_OFFSET_REDUND 0x44000
#define CFG_ENV_SIZE 0x4000
...
...
include/environment.h
浏览文件 @
51bfee19
...
...
@@ -69,12 +69,12 @@
# endif
#endif
/* CFG_ENV_IS_IN_FLASH */
#if defined(C
F
G_ENV_IS_IN_NAND)
#if defined(C
ONFI
G_ENV_IS_IN_NAND)
# ifndef CFG_ENV_OFFSET
# error "Need to define CFG_ENV_OFFSET when using C
F
G_ENV_IS_IN_NAND"
# error "Need to define CFG_ENV_OFFSET when using C
ONFI
G_ENV_IS_IN_NAND"
# endif
# ifndef CFG_ENV_SIZE
# error "Need to define CFG_ENV_SIZE when using C
F
G_ENV_IS_IN_NAND"
# error "Need to define CFG_ENV_SIZE when using C
ONFI
G_ENV_IS_IN_NAND"
# endif
# ifdef CFG_ENV_OFFSET_REDUND
# define CFG_REDUNDAND_ENVIRONMENT
...
...
@@ -82,7 +82,7 @@
# ifdef CFG_ENV_IS_EMBEDDED
# define ENV_IS_EMBEDDED 1
# endif
#endif
/* C
F
G_ENV_IS_IN_NAND */
#endif
/* C
ONFI
G_ENV_IS_IN_NAND */
#ifdef USE_HOSTCC
# include <stdint.h>
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录