diff options
| author | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2008-04-08 00:16:36 +0200 |
| commit | a1b215e2a2a013327693f2fb990957b746f26cf5 (patch) | |
| tree | c998a43b8022f623ac86a0de246d05ed36a86e9e /include/dataflash.h | |
| parent | f9eabcb357ea294e3e01bfe26841bf51d6bd8f05 (diff) | |
| parent | b5873f1732b92a25690e1513b90dfb0d644f6697 (diff) | |
| download | u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.zip u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.gz u-boot-imx-a1b215e2a2a013327693f2fb990957b746f26cf5.tar.bz2 | |
Merge branch 'master' of git://www.denx.de/git/u-boot-at91
Diffstat (limited to 'include/dataflash.h')
| -rw-r--r-- | include/dataflash.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/include/dataflash.h b/include/dataflash.h index fbd5e17..68f0324 100644 --- a/include/dataflash.h +++ b/include/dataflash.h @@ -38,11 +38,7 @@ #include "config.h" /*number of protected area*/ -#ifdef CONFIG_NEW_PARTITION -# define NB_DATAFLASH_AREA 6 -#else -# define NB_DATAFLASH_AREA 4 -#endif +#define NB_DATAFLASH_AREA 5 #ifdef CFG_NO_FLASH |