Update to Hekate bdk 5.5.0, prelim Mariko support

bdk/utils/btn.h

@@ -20,10 +20,10 @@
 
 #include <utils/types.h>
 
-#define BTN_POWER    (1 << 0)
-#define BTN_VOL_DOWN (1 << 1)
-#define BTN_VOL_UP   (1 << 2)
-#define BTN_SINGLE   (1 << 7)
+#define BTN_POWER    BIT(0)
+#define BTN_VOL_DOWN BIT(1)
+#define BTN_VOL_UP   BIT(2)
+#define BTN_SINGLE   BIT(7)
 
 u8 btn_read();
 u8 btn_read_vol();

bdk/utils/types.h

@@ -23,10 +23,12 @@
 
 #define ALIGN(x, a) (((x) + (a) - 1) & ~((a) - 1))
 #define ALIGN_DOWN(x, a) (((x) - ((a) - 1)) & ~((a) - 1))
+#define BIT(n) (1U << (n))
 #define MAX(a, b) ((a) > (b) ? (a) : (b))
 #define MIN(a, b) ((a) < (b) ? (a) : (b))
 #define DIV_ROUND_UP(a, b) ((a + b - 1) / b)
 
+#define ARRAY_SIZE(x) (sizeof(x) / sizeof(*(x)))
 #define LOG2(n) (32 - __builtin_clz(n) - 1)
 
 #define OFFSET_OF(t, m) ((u32)&((t *)NULL)->m)
@@ -60,17 +62,25 @@ typedef volatile unsigned char vu8;
 typedef volatile unsigned short vu16;
 typedef volatile unsigned int vu32;
 
+#ifdef __aarch64__
+typedef u64 uptr;
+#else /* __arm__ or __thumb__ */
+typedef u32 uptr;
+#endif
+
 static const u32 colors[6] = {COLOR_RED, COLOR_ORANGE, COLOR_YELLOW, COLOR_GREEN, COLOR_BLUE, COLOR_VIOLET};
 
 typedef int bool;
 #define true  1
 #define false 0
 
-#define BOOT_CFG_AUTOBOOT_EN (1 << 0)
-#define BOOT_CFG_FROM_LAUNCH (1 << 1)
-#define BOOT_CFG_SEPT_RUN    (1 << 7)
+#define BOOT_CFG_AUTOBOOT_EN BIT(0)
+#define BOOT_CFG_FROM_LAUNCH BIT(1)
+#define BOOT_CFG_FROM_ID     BIT(2)
+#define BOOT_CFG_TO_EMUMMC   BIT(3)
+#define BOOT_CFG_SEPT_RUN    BIT(7)
 
-#define EXTRA_CFG_DUMP_EMUMMC (1 << 0)
+#define EXTRA_CFG_DUMP_EMUMMC BIT(0)
 
 typedef struct __attribute__((__packed__)) _boot_cfg_t
 {
@@ -82,8 +92,10 @@ typedef struct __attribute__((__packed__)) _boot_cfg_t
 	{
 		struct
 		{
-			char id[8];
+			char id[8]; // 7 char ASCII null teminated.
+			char emummc_path[0x78]; // emuMMC/XXX, ASCII null teminated.
 		};
+		u8 ums; // nyx_ums_type.
 		u8 xt_str[0x80];
 	};
 } boot_cfg_t;

bdk/utils/util.c

@@ -135,7 +135,7 @@ void panic(u32 val)
 void reboot_normal()
 {
 	sd_end();
-	reconfig_hw_workaround(false, 0);
+	hw_reinit_workaround(false, 0);
 
 	panic(0x21); // Bypass fuse programming in package1.
 }
@@ -143,7 +143,7 @@ void reboot_normal()
 void reboot_rcm()
 {
 	sd_end();
-	reconfig_hw_workaround(false, 0);
+	hw_reinit_workaround(false, 0);
 
 	PMC(APBDEV_PMC_SCRATCH0) = PMC_SCRATCH0_MODE_RCM;
 	PMC(APBDEV_PMC_CNTRL) |= PMC_CNTRL_MAIN_RST;
@@ -152,10 +152,27 @@ void reboot_rcm()
 		bpmp_halt();
 }
 
+void reboot_full()
+{
+	sd_end();
+	hw_reinit_workaround(false, 0);
+
+	// Enable soft reset wake event.
+	u8 reg = i2c_recv_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG2);
+	reg |= MAX77620_ONOFFCNFG2_SFT_RST_WK;
+	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG2, reg);
+
+	// Do a soft reset.
+	i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG1, MAX77620_ONOFFCNFG1_SFT_RST);
+
+	while (true)
+		bpmp_halt();
+}
+
 void power_off()
 {
 	sd_end();
-	reconfig_hw_workaround(false, 0);
+	hw_reinit_workaround(false, 0);
 
 	// Stop the alarm, in case we injected and powered off too fast.
 	max77620_rtc_stop_alarm();

bdk/utils/util.h

@@ -23,21 +23,23 @@
 
 typedef enum
 {
-	NYX_CFG_BIS  = (1 << 5),
-	NYX_CFG_UMS  = (1 << 6),
-	NYX_CFG_DUMP = (1 << 7),
+	NYX_CFG_BIS  = BIT(5),
+	NYX_CFG_UMS  = BIT(6),
+	NYX_CFG_DUMP = BIT(7),
 } nyx_cfg_t;
 
 typedef enum
 {
-	ERR_LIBSYS_LP0 = (1 << 0),
-	ERR_SYSOLD_NYX = (1 << 1),
-	ERR_SYSOLD_MTC = (1 << 2),
-	ERR_EXCEPT_ENB = (1 << 31),
+	ERR_LIBSYS_LP0 = BIT(0),
+	ERR_SYSOLD_NYX = BIT(1),
+	ERR_LIBSYS_MTC = BIT(2),
+	ERR_SD_BOOT_EN = BIT(3),
+	ERR_L4T_KERNEL = BIT(24),
+	ERR_EXCEPTION  = BIT(31),
 } hekate_errors_t;
 
-#define byte_swap_32(num) (((num >> 24) & 0xff) | ((num << 8) & 0xff0000) | \
-						((num >> 8 )& 0xff00) | ((num << 24) & 0xff000000))
+#define byte_swap_32(num) ((((num) >> 24) & 0xff) | (((num) << 8) & 0xff0000) | \
+						(((num) >> 8 )& 0xff00) | (((num) << 24) & 0xff000000))
 
 typedef struct _cfg_op_t
 {
@@ -71,6 +73,7 @@ void msleep(u32 ms);
 void panic(u32 val);
 void reboot_normal();
 void reboot_rcm();
+void reboot_full();
 void power_off();
 void exec_cfg(u32 *base, const cfg_op_t *ops, u32 num_ops);
 u32  crc32_calc(u32 crc, const u8 *buf, u32 len);