diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:54 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:54 +0200 |
| commit | a350d0d37d7c113afbd9b0d2cf60ac542007f9e6 (patch) | |
| tree | 67f27eba89982fe1e67b0663b19ad44e02d4fcb6 /include | |
| parent | 23bca26ab0d09c043bfcada881e423a28cb6b574 (diff) | |
| parent | d073aeea4f46c2d2842010edba8e8a6ed92dbe1b (diff) | |
| download | u-boot-imx-a350d0d37d7c113afbd9b0d2cf60ac542007f9e6.zip u-boot-imx-a350d0d37d7c113afbd9b0d2cf60ac542007f9e6.tar.gz u-boot-imx-a350d0d37d7c113afbd9b0d2cf60ac542007f9e6.tar.bz2 | |
Merge branch 'master' of /home/wd/git/u-boot/custodians
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/canyonlands.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index d814012..48c5198 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -132,9 +132,11 @@ */ #if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) #define CONFIG_ENV_IS_IN_FLASH 1 /* use FLASH for environment vars */ +#define CONFIG_SYS_NOR_CS 0 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 3 /* NAND chip connected to CSx */ #else #define CONFIG_ENV_IS_IN_NAND 1 /* use NAND for environment vars */ +#define CONFIG_SYS_NOR_CS 3 /* NOR chip connected to CSx */ #define CONFIG_SYS_NAND_CS 0 /* NAND chip connected to CSx */ #define CONFIG_ENV_IS_EMBEDDED 1 /* use embedded environment */ #endif |