From 037d5038f9045d0dd44a76297209dd1a5c1bb565 Mon Sep 17 00:00:00 2001 From: Xiang Xiao Date: Sun, 20 Feb 2022 07:41:53 +0800 Subject: [PATCH] boards/kinetis: Fix multiple definition of `i2c_dev' when -fno-common is enabled Signed-off-by: Xiang Xiao --- boards/arm/kinetis/teensy-3.x/src/k20_i2c.c | 2 +- boards/arm/kinetis/teensy-3.x/src/teensy-3x.h | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c index db1e2e579e0..543f4679c92 100644 --- a/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c +++ b/boards/arm/kinetis/teensy-3.x/src/k20_i2c.c @@ -53,7 +53,7 @@ void kinetis_i2cdev_initialize(void) { - i2c_dev = NULL; + FAR struct i2c_master_s *i2c_dev = NULL; #if defined(CONFIG_KINETIS_I2C0) i2c_dev = kinetis_i2cbus_initialize(0); diff --git a/boards/arm/kinetis/teensy-3.x/src/teensy-3x.h b/boards/arm/kinetis/teensy-3.x/src/teensy-3x.h index 3f9f8b3e8e7..de73cc9ff95 100644 --- a/boards/arm/kinetis/teensy-3.x/src/teensy-3x.h +++ b/boards/arm/kinetis/teensy-3.x/src/teensy-3x.h @@ -55,16 +55,6 @@ #define GPIO_LED (GPIO_HIGHDRIVE | GPIO_OUTPUT_ZERO | PIN_PORTC | PIN5) -/**************************************************************************** - * Public Types - ****************************************************************************/ - -/**************************************************************************** - * Public Data - ****************************************************************************/ - -FAR struct i2c_master_s *i2c_dev; - #ifndef __ASSEMBLY__ /****************************************************************************