diff options
author | Wolfgang Denk <wd@denx.de> | 2008-12-09 01:06:14 +0100 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2008-12-09 01:06:14 +0100 |
commit | 13d36ec849785453953d00220b2c7dc66644a3c2 (patch) | |
tree | 9057fe54b6680522e3af0234ba2eb15035d97992 /include/configs/at91sam9rlek.h | |
parent | c645b181a9a848996d54a5e358bedabae1da566a (diff) | |
parent | 83ad179e2f0f625b88adb8ef5696709e46fb9077 (diff) | |
download | u-boot-imx-13d36ec849785453953d00220b2c7dc66644a3c2.zip u-boot-imx-13d36ec849785453953d00220b2c7dc66644a3c2.tar.gz u-boot-imx-13d36ec849785453953d00220b2c7dc66644a3c2.tar.bz2 |
Merge branch 'master' of git://git.denx.de/u-boot-at91
Diffstat (limited to 'include/configs/at91sam9rlek.h')
-rw-r--r-- | include/configs/at91sam9rlek.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 35dac47..35fefc4 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -118,9 +118,6 @@ #define CONFIG_SYS_MEMTEST_START PHYS_SDRAM #define CONFIG_SYS_MEMTEST_END 0x23e00000 -#define CONFIG_SYS_USE_DATAFLASH 1 -#undef CONFIG_SYS_USE_NANDFLASH - #ifdef CONFIG_SYS_USE_DATAFLASH /* bootstrap + u-boot + env + linux in dataflash on CS0 */ |