mika/Atmosphere
1
0
Fork 0
mirror of https://github.com/Atmosphere-NX/Atmosphere.git synced 2025-06-29 22:22:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

boot: use #embed for fusee

Browse Source
This commit is contained in:
Michael Scire 2025-05-04 13:23:38 -07:00 committed by SciresM
parent 66acab02db
commit b2dd3b7dce
2 changed files with 16 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stratosphere/boot/source/boot_power_utils.cpp
View File

@ -16,7 +16,6 @@
#include <stratosphere.hpp> #include <stratosphere.hpp>
#include "boot_power_utils.hpp" #include "boot_power_utils.hpp"
#include "boot_pmic_driver.hpp" #include "boot_pmic_driver.hpp"
#include "fusee_bin.h"
namespace ams::boot { namespace ams::boot {
@ -32,6 +31,10 @@ namespace ams::boot {
/* Globals. */ /* Globals. */
alignas(os::MemoryPageSize) u8 g_work_page[os::MemoryPageSize]; alignas(os::MemoryPageSize) u8 g_work_page[os::MemoryPageSize];
constexpr const u8 FuseeBin[] = {
#embed ATMOSPHERE_BOOT_FUSEE_PATH
};
/* Helpers. */ /* Helpers. */
void ClearIram() { void ClearIram() {
/* Make page FFs. */ /* Make page FFs. */
@ -48,8 +51,8 @@ namespace ams::boot {
ClearIram(); ClearIram();
/* Copy in payload. */ /* Copy in payload. */
for (size_t ofs = 0; ofs < fusee_bin_size; ofs += sizeof(g_work_page)) { for (size_t ofs = 0; ofs < sizeof(FuseeBin); ofs += sizeof(g_work_page)) {
std::memcpy(g_work_page, fusee_bin + ofs, std::min(static_cast<size_t>(fusee_bin_size - ofs), sizeof(g_work_page))); std::memcpy(g_work_page, FuseeBin + ofs, std::min(static_cast<size_t>(sizeof(FuseeBin) - ofs), sizeof(g_work_page)));
exosphere::CopyToIram(IramPayloadBase + ofs, g_work_page, sizeof(g_work_page)); exosphere::CopyToIram(IramPayloadBase + ofs, g_work_page, sizeof(g_work_page));
} }
@ -61,8 +64,8 @@ namespace ams::boot {
ClearIram(); ClearIram();
/* Copy in payload. */ /* Copy in payload. */
for (size_t ofs = 0; ofs < fusee_bin_size; ofs += sizeof(g_work_page)) { for (size_t ofs = 0; ofs < sizeof(FuseeBin); ofs += sizeof(g_work_page)) {
std::memcpy(g_work_page, fusee_bin + ofs, std::min(static_cast<size_t>(fusee_bin_size - ofs), sizeof(g_work_page))); std::memcpy(g_work_page, FuseeBin + ofs, std::min(static_cast<size_t>(sizeof(FuseeBin) - ofs), sizeof(g_work_page)));
exosphere::CopyToIram(IramPayloadBase + ofs, g_work_page, sizeof(g_work_page)); exosphere::CopyToIram(IramPayloadBase + ofs, g_work_page, sizeof(g_work_page));
} }
@ -93,7 +96,7 @@ namespace ams::boot {
} }
void SetInitialRebootPayload() { void SetInitialRebootPayload() {
::ams::SetInitialRebootPayload(fusee_bin, fusee_bin_size); ::ams::SetInitialRebootPayload(FuseeBin, sizeof(FuseeBin));
} }
void RebootForFatalError(ams::FatalErrorContext *ctx) { void RebootForFatalError(ams::FatalErrorContext *ctx) {

19
stratosphere/boot/system_module.mk
View File

@ -23,7 +23,7 @@ CFILES := $(call FIND_SOURCE_FILES,$(SOURCES),c)
CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp) CPPFILES := $(call FIND_SOURCE_FILES,$(SOURCES),cpp)
SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s) SFILES := $(call FIND_SOURCE_FILES,$(SOURCES),s)
BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*))) fusee.bin BINFILES := $(foreach dir,$(DATA),$(notdir $(wildcard $(dir)/*.*)))
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
# use CXX for linking C++ projects, CC for standard C # use CXX for linking C++ projects, CC for standard C
@ -67,15 +67,18 @@ endif
.PHONY: clean all check_lib check_fusee .PHONY: clean all check_lib check_fusee
#--------------------------------------------------------------------------------- #---------------------------------------------------------------------------------
all: $(ATMOSPHERE_OUT_DIR) $(ATMOSPHERE_BUILD_DIR) $(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/$(ATMOSPHERE_LIBRARY_DIR)/libstratosphere.a all: $(ATMOSPHERE_OUT_DIR) $(ATMOSPHERE_BUILD_DIR) $(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/$(ATMOSPHERE_LIBRARY_DIR)/libstratosphere.a $(ATMOSPHERE_LIBRARIES_DIR)/../fusee/$(ATMOSPHERE_BOOT_OUT_DIR)/fusee.bin
@$(MAKE) __RECURSIVE__=1 OUTPUT=$(CURDIR)/$(ATMOSPHERE_OUT_DIR)/$(TARGET) \ @$(MAKE) __RECURSIVE__=1 OUTPUT=$(CURDIR)/$(ATMOSPHERE_OUT_DIR)/$(TARGET) \
DEPSDIR=$(CURDIR)/$(ATMOSPHERE_BUILD_DIR) \ DEPSDIR=$(CURDIR)/$(ATMOSPHERE_BUILD_DIR) \
--no-print-directory -C $(ATMOSPHERE_BUILD_DIR) \ --no-print-directory -C $(ATMOSPHERE_BUILD_DIR) \
-f $(THIS_MAKEFILE) -f $(THIS_MAKEFILE)
$(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/$(ATMOSPHERE_LIBRARY_DIR)/libstratosphere.a: check_lib check_fusee $(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/$(ATMOSPHERE_LIBRARY_DIR)/libstratosphere.a: check_lib
@$(SILENTCMD)echo "Checked library." @$(SILENTCMD)echo "Checked library."
$(ATMOSPHERE_LIBRARIES_DIR)/../fusee/$(ATMOSPHERE_BOOT_OUT_DIR)/fusee.bin: check_fusee
@$(SILENTCMD)echo "Checked fusee."
ifeq ($(ATMOSPHERE_CHECKED_LIBSTRATOSPHERE),1) ifeq ($(ATMOSPHERE_CHECKED_LIBSTRATOSPHERE),1)
check_lib: check_lib:
else else
@ -124,15 +127,7 @@ $(OFILES) : $(ATMOSPHERE_LIBRARIES_DIR)/libstratosphere/$(ATMOSPHERE_LIBRARY_DIR
@npdmtool $< $@ @npdmtool $< $@
@echo built ... $(notdir $@) @echo built ... $(notdir $@)
boot_power_utils.o: fusee.bin.o boot_power_utils.o: CXXFLAGS += -DATMOSPHERE_BOOT_FUSEE_PATH=\"$(ATMOSPHERE_LIBRARIES_DIR)/../fusee/$(ATMOSPHERE_BOOT_OUT_DIR)/fusee.bin\"
#---------------------------------------------------------------------------------
# you need a rule like this for each extension you use as binary data
#---------------------------------------------------------------------------------
fusee.bin.o: fusee.bin
#---------------------------------------------------------------------------------
@echo $(notdir $<)
@$(bin2o)
-include $(DEPENDS) -include $(DEPENDS)