common.h: Make board config data structure names generic

Rename board config data structures for better alignment as well as
to be SoC independent. While at it drop the exporting of those data
structures that was inherited from a previous project which is no
longer necessary.

Signed-off-by: Nishanth Menon <nm@ti.com>
Signed-off-by: Andreas Dannenberg <dannenberg@ti.com>
Reviewed-by: Suman Anna <s-anna@ti.com>

diff --git a/board-cfg.c b/board-cfg.c
index 877426809ec6ff425f9492508db39025f3a25e45..5cec0e4c7b656597d80abcd8c2438151a85e446b 100644 (file)
--- a/board-cfg.c
+++ b/board-cfg.c
@@ -1,7 +1,7 @@
 /*
  * K3 System Firmware Board Configuration Data
  *
- * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/
  *     Andreas Dannenberg <dannenberg@ti.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 #include "common.h"
 
-const struct k3_boardcfg am65_boardcfg_data = {
+const struct boardcfg am65_boardcfg_data = {
        /* boardcfg_abi_rev */
        .rev = {
                .boardcfg_abi_maj = 0x0,

diff --git a/common.h b/common.h
index 40203963f0e655e52071a7ad5224655ab8e2fa7a..912a524074c6f27e0d3daaeff628ce211fc79105 100644 (file)
--- a/common.h
+++ b/common.h
@@ -126,7 +126,7 @@ struct boardcfg_dbg_cfg {
        u16                                     trace_src_enables;
 } __attribute__((__packed__));
 
-struct k3_boardcfg {
+struct boardcfg {
        struct boardcfg_abi_rev                 rev;
        struct boardcfg_control                 control;
        struct boardcfg_secproxy                secproxy;
@@ -343,19 +343,19 @@ struct boardcfg_rm_resasg {
        struct boardcfg_rm_resasg_entry         resasg_entries[];
 } __attribute__((__packed__));
 
-struct k3_boardcfg_rm {
+struct boardcfg_rm {
        struct boardcfg_abi_rev                 rev;
        struct boardcfg_rm_host_cfg             host_cfg;
        struct boardcfg_rm_resasg               resasg;
 } __attribute__((__packed__));
 
 /*
- * This is essentially 'struct k3_boardcfg_rm', but modified to pull
+ * This is essentially 'struct boardcfg_rm', but modified to pull
  * .resasg_entries which is a member of 'struct boardcfg_rm_resasg' into
  * the outer structure for easier explicit initialization.
  */
-struct am65_boardcfg_rm_local {
-       struct k3_boardcfg_rm                   rm_boardcfg;
+struct boardcfg_rm_local {
+       struct boardcfg_rm                      rm_boardcfg;
        struct boardcfg_rm_resasg_entry
                                resasg_entries[BOARDCFG_RM_RESASG_ENTRIES];
 } __attribute__((__packed__));
@@ -391,7 +391,7 @@ struct boardcfg_host_hierarchy {
                                 host_hierarchy_entries[HOST_HIERARCHY_ENTRIES];
 } __attribute__((__packed__));
 
-struct k3_boardcfg_security {
+struct boardcfg_security {
        struct boardcfg_abi_rev                 rev;
        struct boardcfg_proc_acl                processor_acl_list;
        struct boardcfg_host_hierarchy          host_hierarchy;
@@ -400,16 +400,8 @@ struct k3_boardcfg_security {
 /**
  * Definitions, types, etc. as used for PM configuration
  */
-struct k3_boardcfg_pm {
+struct boardcfg_pm {
        struct boardcfg_abi_rev                 rev;
 } __attribute__((__packed__));
 
-/**
- * Export different board configuration structures
- */
-extern const struct k3_boardcfg am65_boardcfg_data;
-extern const struct am65_boardcfg_rm_local am65_boardcfg_rm_data;
-extern const struct k3_boardcfg_security am65_boardcfg_security_data;
-extern const struct k3_boardcfg_pm am65_boardcfg_pm_data;
-
 #endif /* COMMON_H */

diff --git a/pm-cfg.c b/pm-cfg.c
index ae8983f9065fe05c77677c0618bbd7495d7adf22..deaf6735764e53b6707299fe3de95ef556b80473 100644 (file)
--- a/pm-cfg.c
+++ b/pm-cfg.c
@@ -1,7 +1,7 @@
 /*
  * K3 System Firmware Power Management Configuration Data
  *
- * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/
  *     Andreas Dannenberg <dannenberg@ti.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 #include "common.h"
 
-const struct k3_boardcfg_pm am65_boardcfg_pm_data = {
+const struct boardcfg_pm am65_boardcfg_pm_data = {
        /* boardcfg_abi_rev */
        .rev = {
                .boardcfg_abi_maj = 0x0,

diff --git a/rm-cfg.c b/rm-cfg.c
index e63ee34c4f26425eeb2f48c70b8e62371f30f29b..ac72f87fa175acf7000a2ca84a4fb889dcd99dbb 100644 (file)
--- a/rm-cfg.c
+++ b/rm-cfg.c
@@ -35,7 +35,7 @@
 
 #include "common.h"
 
-const struct am65_boardcfg_rm_local am65_boardcfg_rm_data = {
+const struct boardcfg_rm_local am65_boardcfg_rm_data = {
        .rm_boardcfg = {
                /* boardcfg_abi_rev */
                .rev = {
@@ -61,7 +61,7 @@ const struct am65_boardcfg_rm_local am65_boardcfg_rm_data = {
                        .resasg_entries_size = BOARDCFG_RM_RESASG_ENTRIES *
                                        sizeof(struct boardcfg_rm_resasg_entry),
                        .reserved = 0,
-                       /* .resasg_entries is set via k3_boardcfg_rm_local */
+                       /* .resasg_entries is set via boardcfg_rm_local */
                },
        },
 

diff --git a/sec-cfg.c b/sec-cfg.c
index 8541e8fca85e6e2958a65031e4a915b507932b3f..055eb8eda9371df89dcd06a4cbfa06fa0f15e52f 100644 (file)
--- a/sec-cfg.c
+++ b/sec-cfg.c
@@ -1,7 +1,7 @@
 /*
  * K3 System Firmware Security Configuration Data
  *
- * Copyright (C) 2018 Texas Instruments Incorporated - http://www.ti.com/
+ * Copyright (C) 2018-2019 Texas Instruments Incorporated - http://www.ti.com/
  *     Andreas Dannenberg <dannenberg@ti.com>
  *
  * Redistribution and use in source and binary forms, with or without
@@ -35,7 +35,7 @@
 
 #include "common.h"
 
-const struct k3_boardcfg_security am65_boardcfg_security_data = {
+const struct boardcfg_security am65_boardcfg_security_data = {
        /* boardcfg_abi_rev */
        .rev = {
                .boardcfg_abi_maj = 0x0,