From 93845467533288bc01c76c37bac2da9c3b93e4ec Mon Sep 17 00:00:00 2001
From: TuxSH <tuxsh@sfr.fr>
Date: Mon, 26 Feb 2018 22:30:51 +0100
Subject: [PATCH] Adapt code to match last commit, link in bpmpfw_bin(_size)

---
 exosphere/Makefile   |  3 ++-
 exosphere/src/bpmp.h |  9 ++++++---
 exosphere/src/flow.h |  8 ++++++--
 exosphere/src/lp0.c  | 13 ++++++++-----
 4 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/exosphere/Makefile b/exosphere/Makefile
index 11ea38860..86bffb5a8 100644
--- a/exosphere/Makefile
+++ b/exosphere/Makefile
@@ -62,7 +62,8 @@ $(dir_build)/bpmpfw.bin: $(dir_bpmpfw)/out/bpmpfw.bin
 $(dir_build)/%.bin.o: $(dir_build)/%.bin
 	@$(bin2o)
 
-$(dir_build)/%.o: $(dir_source)/%.c $(dir_build)/bpmpfw.bin.o
+$(dir_build)/lpo.o: $(dir_build)/bpmpfw.bin.o
+$(dir_build)/%.o: $(dir_source)/%.c
 	@mkdir -p "$(@D)"
 	$(COMPILE.c) $(OUTPUT_OPTION) $<
 
diff --git a/exosphere/src/bpmp.h b/exosphere/src/bpmp.h
index b71384ce3..e60995f1b 100644
--- a/exosphere/src/bpmp.h
+++ b/exosphere/src/bpmp.h
@@ -6,7 +6,11 @@
 
 /* Exosphere register definitions for the Tegra X1 BPMP vectors. */
 
-#define BPMP_VECTOR_BASE (mmio_get_device_address(MMIO_DEVID_EXCEPTION_VECTORS))
+static inline uintptr_t get_bpmp_vector_base(void) {
+    return MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_EXCEPTION_VECTORS);
+}
+
+#define BPMP_VECTOR_BASE (get_bpmp_vector_base())
 
 
 #define BPMP_VECTOR_RESET          (*((volatile uint32_t *)(BPMP_VECTOR_BASE + 0x200)))
@@ -18,5 +22,4 @@
 #define BPMP_VECTOR_IRQ            (*((volatile uint32_t *)(BPMP_VECTOR_BASE + 0x218)))
 #define BPMP_VECTOR_FIQ            (*((volatile uint32_t *)(BPMP_VECTOR_BASE + 0x21C)))
 
-
-#endif
\ No newline at end of file
+#endif
diff --git a/exosphere/src/flow.h b/exosphere/src/flow.h
index 2ab161be5..9716aa546 100644
--- a/exosphere/src/flow.h
+++ b/exosphere/src/flow.h
@@ -7,7 +7,11 @@
 
 /* Exosphere register definitions for the Tegra X1 Flow Controller. */
 
-#define FLOW_BASE (mmio_get_device_address(MMIO_DEVID_FLOWCTRL))
+static inline uintptr_t get_flow_base(void) {
+    return MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_FLOWCTRL);
+}
+
+#define FLOW_BASE (get_flow_base())
 
 #define MAKE_FLOW_REG(ofs) (*((volatile uint32_t *)(FLOW_BASE + ofs)))
 
@@ -43,4 +47,4 @@ static inline void flow_clear_csr0_and_events(uint32_t core) {
     MAKE_FLOW_REG(g_flow_core_offsets[core].HALT_CPUN_EVENTS_OFS) = 0;
 }
 
-#endif
\ No newline at end of file
+#endif
diff --git a/exosphere/src/lp0.c b/exosphere/src/lp0.c
index f4d10e1bd..ae3238773 100644
--- a/exosphere/src/lp0.c
+++ b/exosphere/src/lp0.c
@@ -15,6 +15,9 @@
 #include "smc_api.h"
 #include "timers.h"
 
+extern const uint8_t bpmpfw_bin[];
+extern const uint32_t bpmpfw_bin_size;
+
 /* Save security engine, and go to sleep. */
 void save_se_and_power_down_cpu(void) {
     clear_priv_smc_in_progress();
@@ -36,7 +39,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
         uint32_t start_time = get_time();
         bool should_wait = true;
         /* TODO: This is GPIO-6 GPIO_IN_1 */
-        while ((*((volatile uint32_t *)(mmio_get_device_address(MMIO_DEVID_GPIO) + 0x634))) & 1) {
+        while ((*((volatile uint32_t *)(MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_GPIO) + 0x634))) & 1) {
             if (get_time() - start_time > 50000) {
                 should_wait = false;
                 break;
@@ -89,7 +92,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     /* Prepare to boot the BPMP running our deep sleep firmware. */
     
     /* Mark PMC registers as not secure-world only, so BPMP can access them. */
-    (*((volatile uint32_t *)(mmio_get_device_address(MMIO_DEVID_MISC) + 0xC00))) &= 0xFFFFDFFF; /* TODO: macro */
+    (*((volatile uint32_t *)(MMIO_GET_DEVICE_ADDRESS(MMIO_DEVID_MISC) + 0xC00))) &= 0xFFFFDFFF; /* TODO: macro */
     
     /* Setup BPMP vectors. */
     BPMP_VECTOR_RESET = 0x40003000; /* lp0_entry_firmware_crt0 */
@@ -102,7 +105,7 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     BPMP_VECTOR_FIQ = 0x40003004; /* Reboot. */
     
     /* TODO: Hold the BPMP in reset. */
-    uint8_t *lp0_entry_code = (uint8_t *)(lp0_get_plaintext_ram_segment_address(LP0_ENTRY_RAM_SEGMENT_ID_LP0_ENTRY_CODE));
+    uint8_t *lp0_entry_code = (uint8_t *)(LP0_ENTRY_GET_RAM_SEGMENT_ADDRESS(LP0_ENTRY_RAM_SEGMENT_ID_LP0_ENTRY_CODE));
     (void)(lp0_entry_code);
     /* TODO: memcpy(lp0_entry_code, BPMP_FIRMWARE_ADDRESS, sizeof(BPMP_FIRMWARE)); */
     /* TODO: flush_dcache_range(lp0_entry_code, lp0_entry_code + sizeof(BPMP_FIRMWARE)); */
@@ -121,8 +124,8 @@ uint32_t cpu_suspend(uint64_t power_state, uint64_t entrypoint, uint64_t argumen
     /* TODO: save_current_core_context(); */
     /* TODO: set_current_core_inacctive(); */
     /* TODO: set_current_core_saved(true); */
-    /* TODO: call_with_stack_pointer(tzram_get_segment_address(TZRAM_SEGMENT_ID_CORE012_STACK) + 0x1000ULL, save_se_and_power_down_cpu); */
+    /* TODO: call_with_stack_pointer(TZRAM_GET_SEGMENT_ADDR(TZRAM_SEGMENT_ID_CORE012_STACK) + 0x1000ULL, save_se_and_power_down_cpu); */
     
     /* NOTE: This return never actually occurs. */
     return 0;
-}
\ No newline at end of file
+}