diff --git a/arch/arm/include/asm/arch-sunxi/i2c.h b/arch/arm/include/asm/arch-sunxi/i2c.h
index 2c2d6b7d31d..e3dcfdf3708 100644
--- a/arch/arm/include/asm/arch-sunxi/i2c.h
+++ b/arch/arm/include/asm/arch-sunxi/i2c.h
@@ -11,7 +11,7 @@
 #define CFG_I2C_MVTWSI_BASE0	SUNXI_TWI0_BASE
 #endif
 #ifdef CONFIG_I2C1_ENABLE
-#define CONFIG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
+#define CFG_I2C_MVTWSI_BASE1	SUNXI_TWI1_BASE
 #endif
 #ifdef CONFIG_R_I2C_ENABLE
 #define CONFIG_I2C_MVTWSI_BASE2 SUNXI_R_TWI_BASE
diff --git a/drivers/i2c/mvtwsi.c b/drivers/i2c/mvtwsi.c
index 076525d6c4d..2822749971a 100644
--- a/drivers/i2c/mvtwsi.c
+++ b/drivers/i2c/mvtwsi.c
@@ -201,9 +201,9 @@ static struct mvtwsi_registers *twsi_get_base(struct i2c_adapter *adap)
 	case 0:
 		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE0;
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 	case 1:
-		return (struct mvtwsi_registers *)CONFIG_I2C_MVTWSI_BASE1;
+		return (struct mvtwsi_registers *)CFG_I2C_MVTWSI_BASE1;
 #endif
 #ifdef CONFIG_I2C_MVTWSI_BASE2
 	case 2:
@@ -743,7 +743,7 @@ U_BOOT_I2C_ADAP_COMPLETE(twsi0, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_set_bus_speed,
 			 CONFIG_SYS_I2C_SPEED, CONFIG_SYS_I2C_SLAVE, 0)
 #endif
-#ifdef CONFIG_I2C_MVTWSI_BASE1
+#ifdef CFG_I2C_MVTWSI_BASE1
 U_BOOT_I2C_ADAP_COMPLETE(twsi1, twsi_i2c_init, twsi_i2c_probe,
 			 twsi_i2c_read, twsi_i2c_write,
 			 twsi_i2c_set_bus_speed,
diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h
index 412698d3fe9..2ce92845f1c 100644
--- a/include/configs/theadorable.h
+++ b/include/configs/theadorable.h
@@ -26,7 +26,7 @@
 
 /* I2C */
 #define CFG_I2C_MVTWSI_BASE0		MVEBU_TWSI_BASE
-#define CONFIG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
+#define CFG_I2C_MVTWSI_BASE1		MVEBU_TWSI1_BASE
 
 /* USB/EHCI configuration */