diff options
| author | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:50 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2009-07-08 22:01:50 +0200 |
| commit | d073aeea4f46c2d2842010edba8e8a6ed92dbe1b (patch) | |
| tree | 61ed8c222fb72e731ec0d630c04e7bddb64a4e16 /include | |
| parent | 2e8a6f551cba550e9220dca4d8504066203b1f74 (diff) | |
| parent | 0580e48f53f972783e56fcedadb9ce6e5b0b6f32 (diff) | |
| download | u-boot-imx-d073aeea4f46c2d2842010edba8e8a6ed92dbe1b.zip u-boot-imx-d073aeea4f46c2d2842010edba8e8a6ed92dbe1b.tar.gz u-boot-imx-d073aeea4f46c2d2842010edba8e8a6ed92dbe1b.tar.bz2 | |
Merge branch 'master' of git://git.denx.de/u-boot-ppc4xx
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 |