From 43ce7512ea9aae7727a906272baf2adbb7d220c2 Mon Sep 17 00:00:00 2001 From: YuzukiTsuru Date: Fri, 15 Dec 2023 10:29:52 +0800 Subject: [PATCH] rename clean_syterboot_data to clean_syterkit_data --- app/spi_lcd/main.c | 10 +++++++++- app/syter_boot/main.c | 4 ++-- include/common.h | 2 +- src/cli/commands.c | 4 ++-- src/common.c | 2 +- 5 files changed, 15 insertions(+), 7 deletions(-) diff --git a/app/spi_lcd/main.c b/app/spi_lcd/main.c index 2afbb486..a7551604 100644 --- a/app/spi_lcd/main.c +++ b/app/spi_lcd/main.c @@ -234,7 +234,15 @@ int main(void) { LCD_ShowString(0, 240, "1.0.2", BLACK, WHITE, 32, 0); - abort(); + sunxi_spi_disable(&sunxi_spi0); + + arm32_mmu_disable(); + + clean_syterkit_data(); + + sunxi_clk_reset(); + + jmp_to_fel(); return 0; } \ No newline at end of file diff --git a/app/syter_boot/main.c b/app/syter_boot/main.c index f699e9b6..3553fd65 100644 --- a/app/syter_boot/main.c +++ b/app/syter_boot/main.c @@ -584,7 +584,7 @@ int cmd_boot(int argc, const char **argv) { } /* Disable MMU, data cache, instruction cache, interrupts */ - clean_syterboot_data(); + clean_syterkit_data(); enable_kernel_smp(); printk(LOG_LEVEL_INFO, "enable kernel smp ok...\n"); @@ -626,7 +626,7 @@ int main(void) { /* Check rtc fel flag. if set flag, goto fel */ if (rtc_probe_fel_flag()) { printk(LOG_LEVEL_INFO, "RTC: get fel flag, jump to fel mode.\n"); - clean_syterboot_data(); + clean_syterkit_data(); rtc_clear_fel_flag(); sunxi_clk_reset(); mdelay(100); diff --git a/include/common.h b/include/common.h index 205d2583..d05ce581 100644 --- a/include/common.h +++ b/include/common.h @@ -40,7 +40,7 @@ int raise(int signum); void show_banner(void); -void clean_syterboot_data(void); +void clean_syterkit_data(void); void rtc_set_vccio_det_spare(void); diff --git a/src/cli/commands.c b/src/cli/commands.c index 1d4ebf16..6d610ecd 100644 --- a/src/cli/commands.c +++ b/src/cli/commands.c @@ -50,14 +50,14 @@ static int cmd_history(int argc, const char **argv) { } static int cmd_reset(int argc, const char **argv) { - clean_syterboot_data(); + clean_syterkit_data(); uart_puts("Now Reset System...\n\n"); sys_reset(); return 0; } static int cmd_efex(int argc, const char **argv) { - clean_syterboot_data(); + clean_syterkit_data(); rtc_set_fel_flag(); uart_puts("Now Reset System to efex...\n\n"); sys_reset(); diff --git a/src/common.c b/src/common.c index 8968d1ff..5d12be7d 100644 --- a/src/common.c +++ b/src/common.c @@ -10,7 +10,7 @@ #include #include -void clean_syterboot_data(void) { +void clean_syterkit_data(void) { /* Disable MMU, data cache, instruction cache, interrupts */ arm32_mmu_disable(); printk(LOG_LEVEL_INFO, "disable mmu ok...\n");