summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Rini <trini@konsulko.com>2021-05-03 16:48:54 -0400
committerTom Rini <trini@konsulko.com>2021-07-07 10:17:54 -0400
commit8627db79cab3805a493f7454100dcb968ac67862 (patch)
tree4d2a84d6125b5c379b30289b5c25002342a17573
parent12e3547f5af9c3da3360c3d547e16a76291a8b59 (diff)
downloadu-boot-8627db79cab3805a493f7454100dcb968ac67862.tar.gz
u-boot-8627db79cab3805a493f7454100dcb968ac67862.tar.bz2
u-boot-8627db79cab3805a493f7454100dcb968ac67862.zip
freescale: Drop unnecessary cpld_data_t non-typedef
In some board cpld.h files the definition of the cpld_data struct not-quite makes a typedef for cpld_data_t. This problem is caught with gcc-11 as a multiple definition error. As there are no users of this non-typedef, fix this by not declaring it one to begin with. Cc: Priyanka Jain <priyanka.jain@nxp.com> Cc: Shengzhou Liu <Shengzhou.Liu@nxp.com> Signed-off-by: Tom Rini <trini@konsulko.com>
-rw-r--r--board/freescale/t102xrdb/cpld.h2
-rw-r--r--board/freescale/t104xrdb/cpld.h3
-rw-r--r--board/freescale/t208xrdb/cpld.h2
3 files changed, 3 insertions, 4 deletions
diff --git a/board/freescale/t102xrdb/cpld.h b/board/freescale/t102xrdb/cpld.h
index c05f536806..bd40cc319a 100644
--- a/board/freescale/t102xrdb/cpld.h
+++ b/board/freescale/t102xrdb/cpld.h
@@ -21,7 +21,7 @@ struct cpld_data {
u8 boot_override; /* 0x18 - Boot override register */
u8 boot_config1; /* 0x19 - Boot config override register*/
u8 boot_config2; /* 0x1A - Boot config override register*/
-} cpld_data_t;
+};
/* Pointer to the CPLD register set */
diff --git a/board/freescale/t104xrdb/cpld.h b/board/freescale/t104xrdb/cpld.h
index a816aef10a..769883f946 100644
--- a/board/freescale/t104xrdb/cpld.h
+++ b/board/freescale/t104xrdb/cpld.h
@@ -30,8 +30,7 @@ struct cpld_data {
u8 boot_override; /* 0x18 - Boot override register */
u8 boot_config1; /* 0x19 - Boot config override register*/
u8 boot_config2; /* 0x1A - Boot config override register*/
-} cpld_data_t;
-
+};
/* Pointer to the CPLD register set */
diff --git a/board/freescale/t208xrdb/cpld.h b/board/freescale/t208xrdb/cpld.h
index bd6c203742..a623b1811f 100644
--- a/board/freescale/t208xrdb/cpld.h
+++ b/board/freescale/t208xrdb/cpld.h
@@ -21,7 +21,7 @@ struct cpld_data {
u8 boot_or; /* 0x16 - Boot config override register */
u8 boot_cfg1; /* 0x17 - Boot configuration register 1 */
u8 boot_cfg2; /* 0x18 - Boot configuration register 2 */
-} cpld_data_t;
+};
u8 cpld_read(unsigned int reg);
void cpld_write(unsigned int reg, u8 value);