diff --git a/bootloader/hos/hos.c b/bootloader/hos/hos.c
index c822a2e..c9e8d62 100644
--- a/bootloader/hos/hos.c
+++ b/bootloader/hos/hos.c
@@ -33,7 +33,7 @@
#include "../sec/se_t210.h"
#include "../sec/tsec.h"
#include "../soc/bpmp.h"
-#include "../soc/cluster.h"
+#include "../soc/ccplex.h"
#include "../soc/fuse.h"
#include "../soc/pmc.h"
#include "../soc/smmu.h"
@@ -989,7 +989,7 @@ int hos_launch(ini_sec_t *cfg)
if (smmu_is_used())
smmu_exit();
else
- cluster_boot_cpu0(ctxt.pkg1_id->secmon_base);
+ ccplex_boot_cpu0(ctxt.pkg1_id->secmon_base);
while (!secmon_mb->out)
; // A usleep(1) only works when in IRAM or with a trained DRAM.
diff --git a/bootloader/soc/cluster.c b/bootloader/soc/ccplex.c
similarity index 93%
rename from bootloader/soc/cluster.c
rename to bootloader/soc/ccplex.c
index 79538ed..f718e0e 100644
--- a/bootloader/soc/cluster.c
+++ b/bootloader/soc/ccplex.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "../soc/cluster.h"
+#include "../soc/ccplex.h"
#include "../soc/i2c.h"
#include "../soc/clock.h"
#include "../utils/util.h"
@@ -23,7 +23,7 @@
#include "../power/max77620.h"
#include "../power/max7762x.h"
-void _cluster_enable_power()
+void _ccplex_enable_power()
{
u8 tmp = i2c_recv_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_AME_GPIO); // Get current pinmuxing
i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_AME_GPIO, tmp & ~(1 << 5)); // Disable GPIO5 pinmuxing.
@@ -40,7 +40,7 @@ void _cluster_enable_power()
i2c_send_byte(I2C_5, MAX77621_CPU_I2C_ADDR, MAX77621_VOUT_DVC_REG, MAX77621_VOUT_ENABLE | MAX77621_VOUT_0_95V);
}
-int _cluster_pmc_enable_partition(u32 part, int enable)
+int _ccplex_pmc_enable_partition(u32 part, int enable)
{
u32 part_mask = 1 << part;
u32 desired_state = enable << part;
@@ -73,12 +73,12 @@ int _cluster_pmc_enable_partition(u32 part, int enable)
return 1;
}
-void cluster_boot_cpu0(u32 entry)
+void ccplex_boot_cpu0(u32 entry)
{
// Set ACTIVE_CLUSER to FAST.
FLOW_CTLR(FLOW_CTLR_BPMP_CLUSTER_CONTROL) &= 0xFFFFFFFE;
- _cluster_enable_power();
+ _ccplex_enable_power();
if (!(CLOCK(CLK_RST_CONTROLLER_PLLX_BASE) & 0x40000000)) // PLLX_ENABLE.
{
@@ -107,11 +107,11 @@ void cluster_boot_cpu0(u32 entry)
CLOCK(CLK_RST_CONTROLLER_CPU_SOFTRST_CTRL2) &= 0xFFFFF000;
// Enable CPU rail.
- _cluster_pmc_enable_partition(0, 1);
+ _ccplex_pmc_enable_partition(0, 1);
// Enable cluster 0 non-CPU.
- _cluster_pmc_enable_partition(15, 1);
+ _ccplex_pmc_enable_partition(15, 1);
// Enable CE0.
- _cluster_pmc_enable_partition(14, 1);
+ _ccplex_pmc_enable_partition(14, 1);
// Request and wait for RAM repair.
FLOW_CTLR(FLOW_CTLR_RAM_REPAIR) = 1;
diff --git a/bootloader/soc/cluster.h b/bootloader/soc/ccplex.h
similarity index 89%
rename from bootloader/soc/cluster.h
rename to bootloader/soc/ccplex.h
index 428c046..91430c7 100644
--- a/bootloader/soc/cluster.h
+++ b/bootloader/soc/ccplex.h
@@ -14,11 +14,11 @@
* along with this program. If not, see .
*/
-#ifndef _CLUSTER_H_
-#define _CLUSTER_H_
+#ifndef _CCPLEX_H_
+#define _CCPLEX_H_
#include "../utils/types.h"
-void cluster_boot_cpu0(u32 entry);
+void ccplex_boot_cpu0(u32 entry);
#endif
diff --git a/bootloader/soc/smmu.c b/bootloader/soc/smmu.c
index fb096d4..ef4f9bb 100644
--- a/bootloader/soc/smmu.c
+++ b/bootloader/soc/smmu.c
@@ -18,7 +18,7 @@
#include
#include "smmu.h"
-#include "../soc/cluster.h"
+#include "../soc/ccplex.h"
#include "../soc/t210.h"
#include "../mem/mc_t210.h"
#include "../utils/util.h"
@@ -92,7 +92,7 @@ void smmu_enable()
if (smmu_used)
return;
- cluster_boot_cpu0((u32)smmu_payload);
+ ccplex_boot_cpu0((u32)smmu_payload);
smmu_used = true;
msleep(150);
diff --git a/nyx/nyx_gui/soc/cluster.c b/nyx/nyx_gui/soc/ccplex.c
similarity index 93%
rename from nyx/nyx_gui/soc/cluster.c
rename to nyx/nyx_gui/soc/ccplex.c
index 79538ed..f718e0e 100644
--- a/nyx/nyx_gui/soc/cluster.c
+++ b/nyx/nyx_gui/soc/ccplex.c
@@ -14,7 +14,7 @@
* along with this program. If not, see .
*/
-#include "../soc/cluster.h"
+#include "../soc/ccplex.h"
#include "../soc/i2c.h"
#include "../soc/clock.h"
#include "../utils/util.h"
@@ -23,7 +23,7 @@
#include "../power/max77620.h"
#include "../power/max7762x.h"
-void _cluster_enable_power()
+void _ccplex_enable_power()
{
u8 tmp = i2c_recv_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_AME_GPIO); // Get current pinmuxing
i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_AME_GPIO, tmp & ~(1 << 5)); // Disable GPIO5 pinmuxing.
@@ -40,7 +40,7 @@ void _cluster_enable_power()
i2c_send_byte(I2C_5, MAX77621_CPU_I2C_ADDR, MAX77621_VOUT_DVC_REG, MAX77621_VOUT_ENABLE | MAX77621_VOUT_0_95V);
}
-int _cluster_pmc_enable_partition(u32 part, int enable)
+int _ccplex_pmc_enable_partition(u32 part, int enable)
{
u32 part_mask = 1 << part;
u32 desired_state = enable << part;
@@ -73,12 +73,12 @@ int _cluster_pmc_enable_partition(u32 part, int enable)
return 1;
}
-void cluster_boot_cpu0(u32 entry)
+void ccplex_boot_cpu0(u32 entry)
{
// Set ACTIVE_CLUSER to FAST.
FLOW_CTLR(FLOW_CTLR_BPMP_CLUSTER_CONTROL) &= 0xFFFFFFFE;
- _cluster_enable_power();
+ _ccplex_enable_power();
if (!(CLOCK(CLK_RST_CONTROLLER_PLLX_BASE) & 0x40000000)) // PLLX_ENABLE.
{
@@ -107,11 +107,11 @@ void cluster_boot_cpu0(u32 entry)
CLOCK(CLK_RST_CONTROLLER_CPU_SOFTRST_CTRL2) &= 0xFFFFF000;
// Enable CPU rail.
- _cluster_pmc_enable_partition(0, 1);
+ _ccplex_pmc_enable_partition(0, 1);
// Enable cluster 0 non-CPU.
- _cluster_pmc_enable_partition(15, 1);
+ _ccplex_pmc_enable_partition(15, 1);
// Enable CE0.
- _cluster_pmc_enable_partition(14, 1);
+ _ccplex_pmc_enable_partition(14, 1);
// Request and wait for RAM repair.
FLOW_CTLR(FLOW_CTLR_RAM_REPAIR) = 1;
diff --git a/nyx/nyx_gui/soc/cluster.h b/nyx/nyx_gui/soc/ccplex.h
similarity index 89%
rename from nyx/nyx_gui/soc/cluster.h
rename to nyx/nyx_gui/soc/ccplex.h
index 428c046..91430c7 100644
--- a/nyx/nyx_gui/soc/cluster.h
+++ b/nyx/nyx_gui/soc/ccplex.h
@@ -14,11 +14,11 @@
* along with this program. If not, see .
*/
-#ifndef _CLUSTER_H_
-#define _CLUSTER_H_
+#ifndef _CCPLEX_H_
+#define _CCPLEX_H_
#include "../utils/types.h"
-void cluster_boot_cpu0(u32 entry);
+void ccplex_boot_cpu0(u32 entry);
#endif
diff --git a/nyx/nyx_gui/soc/smmu.c b/nyx/nyx_gui/soc/smmu.c
index fb096d4..ef4f9bb 100644
--- a/nyx/nyx_gui/soc/smmu.c
+++ b/nyx/nyx_gui/soc/smmu.c
@@ -18,7 +18,7 @@
#include
#include "smmu.h"
-#include "../soc/cluster.h"
+#include "../soc/ccplex.h"
#include "../soc/t210.h"
#include "../mem/mc_t210.h"
#include "../utils/util.h"
@@ -92,7 +92,7 @@ void smmu_enable()
if (smmu_used)
return;
- cluster_boot_cpu0((u32)smmu_payload);
+ ccplex_boot_cpu0((u32)smmu_payload);
smmu_used = true;
msleep(150);