common.h: Make AM65_BOARDCFG_RM_RESASG_ENTRIES generic

Make AM65_BOARDCFG_RM_RESASG_ENTRIES to be generic to allow for cross
SoC usage. While at it, add include guards to the header file.

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/common.h b/common.h
index 49ad580304fb2e39d987f5abaf57124d74471ed7..40203963f0e655e52071a7ad5224655ab8e2fa7a 100644 (file)
--- a/common.h
+++ b/common.h
@@ -1,7 +1,7 @@
 /*
  * K3 System Firmware Board Configuration Data Structures
  *
- * 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
@@ -33,6 +33,11 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#ifndef COMMON_H
+#define COMMON_H
+
+#include <sysfw_img_cfg.h>
+
 /**
  * Standard Linux Kernel integer types
  */
@@ -344,8 +349,6 @@ struct k3_boardcfg_rm {
        struct boardcfg_rm_resasg               resasg;
 } __attribute__((__packed__));
 
-#define AM65_BOARDCFG_RM_RESASG_ENTRIES                59
-
 /*
  * This is essentially 'struct k3_boardcfg_rm', but modified to pull
  * .resasg_entries which is a member of 'struct boardcfg_rm_resasg' into
@@ -354,7 +357,7 @@ struct k3_boardcfg_rm {
 struct am65_boardcfg_rm_local {
        struct k3_boardcfg_rm                   rm_boardcfg;
        struct boardcfg_rm_resasg_entry
-                               resasg_entries[AM65_BOARDCFG_RM_RESASG_ENTRIES];
+                               resasg_entries[BOARDCFG_RM_RESASG_ENTRIES];
 } __attribute__((__packed__));
 
 /**
@@ -408,3 +411,5 @@ 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/include/soc/am65x/sysfw_img_cfg.h b/include/soc/am65x/sysfw_img_cfg.h
new file mode 100644 (file)
index 0000000..de5f1ab
--- /dev/null
+++ b/include/soc/am65x/sysfw_img_cfg.h
@@ -0,0 +1,40 @@
+/*
+ * K3 System Firmware Configuration Data
+ *
+ * Copyright (C) 2019 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ *
+ *    Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ *
+ *    Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the
+ *    distribution.
+ *
+ *    Neither the name of Texas Instruments Incorporated nor the names of
+ *    its contributors may be used to endorse or promote products derived
+ *    from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef SYSFW_IMG_CFG_H
+#define SYSFW_IMG_CFG_H
+
+#define BOARDCFG_RM_RESASG_ENTRIES     59
+
+#endif /* SYSFW_IMG_CFG_H */

diff --git a/rm-cfg.c b/rm-cfg.c
index 9adaf311f3e694dde50a40f1e8af4c0dde64b393..e63ee34c4f26425eeb2f48c70b8e62371f30f29b 100644 (file)
--- a/rm-cfg.c
+++ b/rm-cfg.c
@@ -1,7 +1,7 @@
 /*
  * K3 System Firmware Resource 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
@@ -58,7 +58,7 @@ const struct am65_boardcfg_rm_local am65_boardcfg_rm_data = {
                                .magic = BOARDCFG_RM_RESASG_MAGIC_NUM,
                                .size = sizeof(struct boardcfg_rm_resasg),
                        },
-                       .resasg_entries_size = AM65_BOARDCFG_RM_RESASG_ENTRIES *
+                       .resasg_entries_size = BOARDCFG_RM_RESASG_ENTRIES *
                                        sizeof(struct boardcfg_rm_resasg_entry),
                        .reserved = 0,
                        /* .resasg_entries is set via k3_boardcfg_rm_local */