projects
/
oweals
/
u-boot.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
mpc83xx: don't disable autoboot
[oweals/u-boot.git]
/
include
/
configs
/
M5235EVB.h
diff --git
a/include/configs/M5235EVB.h
b/include/configs/M5235EVB.h
index 8af1c52abf9aa4e6d52079b376f3b04f1b0a0032..f352db123d2b689e3da5cd30419a4a13fc0de282 100644
(file)
--- a/
include/configs/M5235EVB.h
+++ b/
include/configs/M5235EVB.h
@@
-102,12
+102,15
@@
/* I2C */
#define CONFIG_FSL_I2C
/* I2C */
#define CONFIG_FSL_I2C
-#define CONFIG_HARD_I2C
/* I2C with hw support */
-#undef CONFIG_SOFT_I2C
/* I2C bit-banged */
+#define CONFIG_HARD_I2C /* I2C with hw support */
+#undef CONFIG_SOFT_I2C /* I2C bit-banged */
#define CFG_I2C_SPEED 80000
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_OFFSET 0x00000300
#define CFG_IMMR CFG_MBAR
#define CFG_I2C_SPEED 80000
#define CFG_I2C_SLAVE 0x7F
#define CFG_I2C_OFFSET 0x00000300
#define CFG_IMMR CFG_MBAR
+#define CFG_I2C_PINMUX_REG (gpio->par_qspi)
+#define CFG_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
+#define CFG_I2C_PINMUX_SET (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
/* this must be included AFTER the definition of CONFIG_COMMANDS (if any) */
#define CONFIG_BOOTDELAY 1 /* autoboot after 5 seconds */
@@
-200,7
+203,7
@@
*/
#define CFG_FLASH_CFI
#ifdef CFG_FLASH_CFI
*/
#define CFG_FLASH_CFI
#ifdef CFG_FLASH_CFI
-# define C
FG_FLASH_CFI_DRIVER
1
+# define C
ONFIG_FLASH_CFI_DRIVER
1
# define CFG_FLASH_SIZE 0x800000 /* Max size that the board might have */
#ifdef NORFLASH_PS32BIT
# define CFG_FLASH_CFI_WIDTH FLASH_CFI_32BIT
# define CFG_FLASH_SIZE 0x800000 /* Max size that the board might have */
#ifdef NORFLASH_PS32BIT
# define CFG_FLASH_CFI_WIDTH FLASH_CFI_32BIT
@@
-217,16
+220,16
@@
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
/* Configuration for environment
* Environment is embedded in u-boot in the second sector of the flash
*/
-#define C
FG_ENV_IS_IN_FLASH
1
-#define C
FG_ENV_IS_EMBEDDED
1
+#define C
ONFIG_ENV_IS_IN_FLASH
1
+#define C
ONFIG_ENV_IS_EMBEDDED
1
#ifdef NORFLASH_PS32BIT
#ifdef NORFLASH_PS32BIT
-# define C
FG_ENV_OFFSET
(0x8000)
-# define C
FG_ENV_SIZE
0x4000
-# define C
FG_ENV_SECT_SIZE
0x4000
+# define C
ONFIG_ENV_OFFSET
(0x8000)
+# define C
ONFIG_ENV_SIZE
0x4000
+# define C
ONFIG_ENV_SECT_SIZE
0x4000
#else
#else
-# define C
FG_ENV_OFFSET
(0x4000)
-# define C
FG_ENV_SIZE
0x2000
-# define C
FG_ENV_SECT_SIZE
0x2000
+# define C
ONFIG_ENV_OFFSET
(0x4000)
+# define C
ONFIG_ENV_SIZE
0x2000
+# define C
ONFIG_ENV_SECT_SIZE
0x2000
#endif
/*-----------------------------------------------------------------------
#endif
/*-----------------------------------------------------------------------