projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge git://www.denx.de/git/u-boot-cfi-flash
[oweals/u-boot.git]
/
arch
/
powerpc
/
cpu
/
ppc4xx
/
4xx_ibm_ddr2_autocalib.c
diff --git
a/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
b/arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
index 82823147fe9d4aab07eaaf0605ca739a5341f874..67f149deef6a1cef9e6fdbd14814174739345473 100644
(file)
--- a/
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
+++ b/
arch/powerpc/cpu/ppc4xx/4xx_ibm_ddr2_autocalib.c
@@
-27,12
+27,6
@@
#include "ecc.h"
#include "ecc.h"
-/*
- * Only compile the DDR auto-calibration code for NOR boot and
- * not for NAND boot (NAND SPL and NAND U-Boot - NUB)
- */
-#if !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL)
-
#define MAXBXCF 4
#define SDRAM_RXBAS_SHIFT_1M 20
#define MAXBXCF 4
#define SDRAM_RXBAS_SHIFT_1M 20
@@
-1231,9
+1225,3
@@
u32 DQS_autocalibration(void)
return 0;
}
return 0;
}
-#else /* defined(CONFIG_NAND_U_BOOT) || defined(CONFIG_NAND_SPL) */
-u32 DQS_autocalibration(void)
-{
- return 0;
-}
-#endif /* !defined(CONFIG_NAND_U_BOOT) && !defined(CONFIG_NAND_SPL) */