diff options
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
---|---|---|
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2015-10-14 10:46:36 +0200 |
commit | 13a3972585af60ec367d209cedbd3601e0c77467 (patch) | |
tree | 4b3312669b3e501f6bc10b39d8c7bbf516f07aac /include/configs/xpedite517x.h | |
parent | 208bd51396fb606dbdcf45b064e6b372d7dd3e81 (diff) | |
parent | 297faccca2235e359012118495b9b73451d54bb9 (diff) | |
download | talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.tar.gz talos-obmc-uboot-13a3972585af60ec367d209cedbd3601e0c77467.zip |
Merge remote-tracking branch 'u-boot/master'
Diffstat (limited to 'include/configs/xpedite517x.h')
-rw-r--r-- | include/configs/xpedite517x.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/configs/xpedite517x.h b/include/configs/xpedite517x.h index 669aa53c91..b5d1126d59 100644 --- a/include/configs/xpedite517x.h +++ b/include/configs/xpedite517x.h @@ -138,7 +138,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_SYS_NAND_ACTL_CLE (1 << 15) /* C_LA15 */ #define CONFIG_SYS_NAND_ACTL_NCE 0 /* NCE not controlled by ADDR */ #define CONFIG_SYS_NAND_ACTL_DELAY 25 -#define CONFIG_SYS_NAND_QUIET_TEST #define CONFIG_JFFS2_NAND /* |