From e779e5340682b0a3389c75b994ef35e1b935e1e0 Mon Sep 17 00:00:00 2001 From: Kostas Missos Date: Mon, 17 Dec 2018 02:31:00 +0200 Subject: [PATCH] Some tiny fixes --- bootloader/frontend/fe_emmc_tools.c | 6 +++--- bootloader/main.c | 1 - bootloader/soc/hw_init.c | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/bootloader/frontend/fe_emmc_tools.c b/bootloader/frontend/fe_emmc_tools.c index 798b188..492aa74 100644 --- a/bootloader/frontend/fe_emmc_tools.c +++ b/bootloader/frontend/fe_emmc_tools.c @@ -48,7 +48,7 @@ extern void emmcsn_path_impl(char *path, char *sub_dir, char *filename, sdmmc_st #define WPRINTF(text) gfx_printf(&gfx_con, "%k"text"%k\n", 0xFFFFDD00, 0xFFCCCCCC) #define WPRINTFARGS(text, args...) gfx_printf(&gfx_con, "%k"text"%k\n", 0xFFFFDD00, args, 0xFFCCCCCC) -int _dump_emmc_verify(sdmmc_storage_t *storage, u32 lba_curr, char *outFilename, emmc_part_t *part) +static int _dump_emmc_verify(sdmmc_storage_t *storage, u32 lba_curr, char *outFilename, emmc_part_t *part) { FIL fp; u32 btn = 0; @@ -165,7 +165,7 @@ int _dump_emmc_verify(sdmmc_storage_t *storage, u32 lba_curr, char *outFilename, } } -int _dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) +static int _dump_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) { static const u32 FAT32_FILESIZE_LIMIT = 0xFFFFFFFF; static const u32 SECTORS_TO_MIB_COEFF = 11; @@ -635,7 +635,7 @@ void dump_emmc_user() { _dump_emmc_selected(PART_USER); } void dump_emmc_boot() { _dump_emmc_selected(PART_BOOT); } void dump_emmc_rawnand() { _dump_emmc_selected(PART_RAW); } -int _restore_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) +static int _restore_emmc_part(char *sd_path, sdmmc_storage_t *storage, emmc_part_t *part) { static const u32 SECTORS_TO_MIB_COEFF = 11; diff --git a/bootloader/main.c b/bootloader/main.c index f3828bb..c931689 100644 --- a/bootloader/main.c +++ b/bootloader/main.c @@ -1148,7 +1148,6 @@ extern void pivot_stack(u32 stack_top); void ipl_main() { - // Skip config if we just updated the bootloader. config_hw(); //Pivot the stack so we have enough space. diff --git a/bootloader/soc/hw_init.c b/bootloader/soc/hw_init.c index 21b82a9..b57ee42 100644 --- a/bootloader/soc/hw_init.c +++ b/bootloader/soc/hw_init.c @@ -207,7 +207,7 @@ void config_hw() i2c_init(I2C_5); i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_CNFGBBC, 0x40); - i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG1, 0x78); + i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_ONOFFCNFG1, 0x78); // PWR delay for forced shutdown off. i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_FPS_CFG0, 0x38); i2c_send_byte(I2C_5, MAX77620_I2C_ADDR, MAX77620_REG_FPS_CFG1, 0x3A);