projects
/
platform
/
kernel
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of git://git.denx.de/u-boot-coldfire
[platform/kernel/u-boot.git]
/
include
/
configs
/
phycore_am335x_r2.h
diff --git
a/include/configs/phycore_am335x_r2.h
b/include/configs/phycore_am335x_r2.h
index
e398a01
..
4e6dc79
100644
(file)
--- a/
include/configs/phycore_am335x_r2.h
+++ b/
include/configs/phycore_am335x_r2.h
@@
-16,8
+16,6
@@
#ifdef CONFIG_MTD_RAW_NAND
#define NANDARGS \
#ifdef CONFIG_MTD_RAW_NAND
#define NANDARGS \
- "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
- "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
"nandargs=setenv bootargs console=${console} " \
"${optargs} " \
"root=${nandroot} " \
@@
-64,7
+62,7
@@
#include <environment/ti/dfu.h>
#include <environment/ti/mmc.h>
#include <environment/ti/dfu.h>
#include <environment/ti/mmc.h>
-#define C
ONFI
G_EXTRA_ENV_SETTINGS \
+#define C
F
G_EXTRA_ENV_SETTINGS \
DEFAULT_MMC_TI_ARGS \
DEFAULT_LINUX_BOOT_ENV \
"bootfile=zImage\0" \
DEFAULT_MMC_TI_ARGS \
DEFAULT_LINUX_BOOT_ENV \
"bootfile=zImage\0" \
@@
-81,12
+79,10
@@
#define V_OSCK 25000000 /* Clock output from T2 */
#define V_SCLK V_OSCK
#define V_OSCK 25000000 /* Clock output from T2 */
#define V_SCLK V_OSCK
-#define CONFIG_POWER_TPS65910
-
#ifdef CONFIG_MTD_RAW_NAND
/* NAND: device related configs */
/* NAND: driver related configs */
#ifdef CONFIG_MTD_RAW_NAND
/* NAND: device related configs */
/* NAND: driver related configs */
-#define C
ONFIG_SYS_NAND_ECCPOS
{ 2, 3, 4, 5, 6, 7, 8, 9, \
+#define C
FG_SYS_NAND_ECCPOS
{ 2, 3, 4, 5, 6, 7, 8, 9, \
10, 11, 12, 13, 14, 15, 16, 17, \
18, 19, 20, 21, 22, 23, 24, 25, \
26, 27, 28, 29, 30, 31, 32, 33, \
10, 11, 12, 13, 14, 15, 16, 17, \
18, 19, 20, 21, 22, 23, 24, 25, \
26, 27, 28, 29, 30, 31, 32, 33, \
@@
-94,21
+90,9
@@
42, 43, 44, 45, 46, 47, 48, 49, \
50, 51, 52, 53, 54, 55, 56, 57, }
42, 43, 44, 45, 46, 47, 48, 49, \
50, 51, 52, 53, 54, 55, 56, 57, }
-#define CONFIG_SYS_NAND_ECCSIZE 512
-#define CONFIG_SYS_NAND_ECCBYTES 14
-#define CONFIG_SYS_NAND_ONFI_DETECTION
-#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW
+#define CFG_SYS_NAND_ECCSIZE 512
+#define CFG_SYS_NAND_ECCBYTES 14
-/* NAND: SPL related configs */
-#ifdef CONFIG_SPL_OS_BOOT
-#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x00200000 /* kernel offset */
-#endif
#endif /* !CONFIG_MTD_RAW_NAND */
#endif /* !CONFIG_MTD_RAW_NAND */
-/* CPU */
-
-#ifdef CONFIG_SPI_BOOT
-#define CONFIG_SYS_SPI_U_BOOT_SIZE 0x40000
-#endif
-
#endif /* ! __CONFIG_PHYCORE_AM335x_R2_H */
#endif /* ! __CONFIG_PHYCORE_AM335x_R2_H */