Convert CONFIG_SYS_IMMR to Kconfig
This converts the following to Kconfig: CONFIG_SYS_IMMR We do this by consolidating the SYS_IMMR options we have and providing defaults. We also, in the few places where M68K was also sharing code with these platforms, define it within the file to CONFIG_SYS_MBAR to match usage. This should be cleaned up longer term. Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
@@ -38,7 +38,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
#define CONFIG_UDP_CHECKSUM
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
#define CONFIG_SYS_I2C_PINMUX_REG (gpio->par_qspi)
|
||||
#define CONFIG_SYS_I2C_PINMUX_CLR ~(GPIO_PAR_FECI2C_SCL_MASK | GPIO_PAR_FECI2C_SDA_MASK)
|
||||
#define CONFIG_SYS_I2C_PINMUX_SET (GPIO_PAR_FECI2C_SCL_I2CSCL | GPIO_PAR_FECI2C_SDA_I2CSDA)
|
||||
|
||||
@@ -67,7 +67,6 @@
|
||||
#define CONFIG_HOSTNAME "M5253DEMO"
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
#define CONFIG_SYS_I2C_PINMUX_REG (*(u32 *) (CONFIG_SYS_MBAR+0x19C))
|
||||
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFFFE7FF)
|
||||
#define CONFIG_SYS_I2C_PINMUX_SET (0)
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
#endif
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
#define CONFIG_SYS_I2C_PINMUX_REG (gpio_reg->par_feci2c)
|
||||
#define CONFIG_SYS_I2C_PINMUX_CLR (0xFFF0)
|
||||
#define CONFIG_SYS_I2C_PINMUX_SET (0x000F)
|
||||
|
||||
@@ -53,7 +53,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
#define CONFIG_UDP_CHECKSUM
|
||||
|
||||
|
||||
@@ -47,7 +47,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
#define CONFIG_UDP_CHECKSUM
|
||||
|
||||
|
||||
@@ -49,7 +49,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
#define CONFIG_UDP_CHECKSUM
|
||||
|
||||
|
||||
@@ -58,7 +58,6 @@
|
||||
#define CONFIG_MCFTMR
|
||||
|
||||
/* I2C */
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
/*
|
||||
* Defines processor clock - important for correct timings concerning serial
|
||||
|
||||
@@ -185,8 +185,6 @@
|
||||
* I2C
|
||||
*/
|
||||
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_MBAR
|
||||
|
||||
#ifdef CONFIG_CMD_DATE
|
||||
#define CONFIG_RTC_DS1338
|
||||
#define CONFIG_I2C_RTC_ADDR 0x68
|
||||
|
||||
@@ -60,8 +60,4 @@ CONFIG_SYS_CCSRBAR_PHYS_LOW and/or CONFIG_SYS_CCSRBAR_PHYS_HIGH instead."
|
||||
#define CONFIG_SYS_CCSRBAR_PHYS ((CONFIG_SYS_CCSRBAR_PHYS_HIGH * 1ull) << 32 | \
|
||||
CONFIG_SYS_CCSRBAR_PHYS_LOW)
|
||||
|
||||
#ifndef CONFIG_SYS_IMMR
|
||||
#define CONFIG_SYS_IMMR CONFIG_SYS_CCSRBAR
|
||||
#endif
|
||||
|
||||
#endif /* __MPC85xx_H__ */
|
||||
|
||||
Reference in New Issue
Block a user