-
Notifications
You must be signed in to change notification settings - Fork 33
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #41 from Woomeeme/develop
- Loading branch information
Showing
3 changed files
with
50 additions
and
59 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,25 +1,31 @@ | ||
| From f3d19c2b583c3f6b4f8fe5c3d367a68275242d9d Mon Sep 17 00:00:00 2001 | ||
| From: Justin Hammond <[email protected]> | ||
| Date: Sat, 6 Apr 2024 10:49:01 +0000 | ||
| Subject: [PATCH] fix compile error | ||
|
|
||
| --- | ||
| plat/sg200x/bl2/bl2_main.c | 3 ++- | ||
| 1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
|
||
| diff --git a/plat/sg200x/bl2/bl2_main.c b/plat/sg200x/bl2/bl2_main.c | ||
| index d1f830b..6f2d788 100644 | ||
| --- a/plat/sg200x/bl2/bl2_main.c | ||
| +++ b/plat/sg200x/bl2/bl2_main.c | ||
| @@ -15,6 +15,7 @@ | ||
| diff --git a/plat/cv180x/bl2/bl2_main.c b/plat/cv180x/bl2/bl2_main.c | ||
| index e1eee38..f989e09 100644 | ||
| --- a/plat/cv180x/bl2/bl2_main.c | ||
| +++ b/plat/cv180x/bl2/bl2_main.c | ||
| @@ -25,8 +25,8 @@ int init_comm_info(int ret) | ||
| transfer_config_s.encode_buf_size = CVIMMAP_H26X_ENC_BUFF_SIZE; | ||
| transfer_config_s.dump_print_enable = RTOS_DUMP_PRINT_ENABLE; | ||
| transfer_config_s.dump_print_size_idx = RTOS_DUMP_PRINT_SZ_IDX; | ||
| - transfer_config_s.image_type = RTOS_FAST_IMAGE_TYPE; | ||
| - transfer_config_s.mcu_status = MCU_STATUS_NONOS_DONE; | ||
| +// transfer_config_s.image_type = RTOS_FAST_IMAGE_TYPE; | ||
| +// transfer_config_s.mcu_status = MCU_STATUS_NONOS_DONE; | ||
| for (int i = 0; i < transfer_config_s.conf_size; i++) { | ||
| checksum += ptr[i]; | ||
| } | ||
| diff --git a/plat/cv181x/bl2/bl2_main.c b/plat/cv181x/bl2/bl2_main.c | ||
| index 09b117b..b0185d9 100644 | ||
| --- a/plat/cv181x/bl2/bl2_main.c | ||
| +++ b/plat/cv181x/bl2/bl2_main.c | ||
| @@ -10,6 +10,7 @@ enum CHIP_CLK_MODE chip_clk_mode = CLK_ND; | ||
| #ifdef RTOS_ENABLE_FREERTOS | ||
| int init_comm_info(int ret) | ||
| { | ||
| +#if 0 | ||
| struct transfer_config_t *transfer_config = (struct transfer_config_t *)MAILBOX_FIELD; | ||
| struct transfer_config_t transfer_config_s; | ||
| unsigned char *ptr = (unsigned char *)&transfer_config_s; | ||
| @@ -40,7 +41,7 @@ int init_comm_info(int ret) | ||
| @@ -35,7 +36,7 @@ int init_comm_info(int ret) | ||
|
|
||
| transfer_config_s.checksum = checksum; | ||
| memcpy(transfer_config, &transfer_config_s, sizeof(struct transfer_config_t)); | ||
|
|
@@ -28,6 +34,3 @@ index d1f830b..6f2d788 100644 | |
| return ret; | ||
| } | ||
| #endif | ||
| -- | ||
| 2.43.0 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,20 +1,11 @@ | ||
| From 9d123e5baddd3415e1282d166740f2c578b7771a Mon Sep 17 00:00:00 2001 | ||
| From: Justin Hammond <[email protected]> | ||
| Date: Sat, 13 Apr 2024 13:22:32 +0800 | ||
| Subject: [PATCH] Update for distroboot | ||
|
|
||
| --- | ||
| include/configs/mars-asic.h | 25 +++++++++++++++++++++---- | ||
| 1 file changed, 21 insertions(+), 4 deletions(-) | ||
|
|
||
| diff --git a/include/configs/mars-asic.h b/include/configs/mars-asic.h | ||
| index 12cdefac84..de5219eb49 100644 | ||
| --- a/include/configs/mars-asic.h | ||
| +++ b/include/configs/mars-asic.h | ||
| diff --git a/include/configs/cv181x-asic.h b/include/configs/cv181x-asic.h | ||
| index 1c276f1c..0e80d8b3 100644 | ||
| --- a/include/configs/cv181x-asic.h | ||
| +++ b/include/configs/cv181x-asic.h | ||
| @@ -9,13 +9,14 @@ | ||
| #define __CV181X_ASIC_H__ | ||
|
|
||
| #include <../../../board/cvitek/mars/mars_reg.h> | ||
| #include <../../../board/cvitek/cv181x/cv181x_reg.h> | ||
| +#include <config_distro_bootcmd.h> | ||
|
|
||
| /* defined in cvipart.h */ | ||
|
|
@@ -27,22 +18,21 @@ index 12cdefac84..de5219eb49 100644 | |
| #undef CONFIG_ENV_IS_IN_NAND | ||
| #undef CONFIG_ENV_SECT_SIZE | ||
|
|
||
| @@ -181,6 +182,12 @@ | ||
| @@ -181,6 +182,11 @@ | ||
| #define CONFIG_GATEWAYIP 192.168.0.11 | ||
| #define CONFIG_SERVERIP 192.168.56.101 | ||
|
|
||
| +#define BOOT_TARGET_DEVICES(func) \ | ||
| + func(MMC, mmc, 0) \ | ||
| + func(DHCP, dhcp, 0) \ | ||
| + func(PXE, pxe, na) | ||
| + | ||
| + | ||
| #ifdef CONFIG_USE_DEFAULT_ENV | ||
| /* The following Settings are chip dependent */ | ||
| /******************************************************************************/ | ||
| @@ -256,7 +263,17 @@ | ||
| @@ -254,7 +260,17 @@ | ||
| "root=" ROOTARGS "\0" \ | ||
| "sdboot=" SD_BOOTM_COMMAND "\0" \ | ||
| "sdbootauto=" SD_BOOTM_COMMAND_AUTO "\0" \ | ||
| "othbootargs=" OTHERBOOTARGS "\0" \ | ||
| - PARTS_OFFSET | ||
| + "kernel_addr_r=" __stringify(CONFIG_SYS_TEXT_BASE) "\0" \ | ||
|
|
@@ -59,18 +49,16 @@ index 12cdefac84..de5219eb49 100644 | |
|
|
||
| /********************************************************************************/ | ||
| /* UBOOT_VBOOT commands */ | ||
| @@ -311,9 +328,9 @@ | ||
| #ifdef CONFIG_ENABLE_ALIOS_UPDATE | ||
| #define CONFIG_BOOTCOMMAND "cvi_update_rtos" | ||
| #elif CONFIG_SD_BOOT | ||
| - #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run sdboot || run sdbootauto" | ||
| + #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || run sdboot || run sdbootauto" | ||
| @@ -301,10 +317,10 @@ | ||
| #ifdef CONFIG_ENABLE_ALIOS_UPDATE | ||
| #define CONFIG_BOOTCOMMAND "cvi_update_rtos" | ||
| #else | ||
| - #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run norboot || run nandboot ||run emmcboot" | ||
| + #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run distro_bootcmd || run norboot || run nandboot ||run emmcboot" | ||
| #endif | ||
| #else | ||
| - #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run norboot || run nandboot ||run emmcboot" | ||
| + #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "cvi_update || run distro_bootcmd || run norboot || run nandboot ||run emmcboot" | ||
| - #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run sdboot" | ||
| + #define CONFIG_BOOTCOMMAND SHOWLOGOCMD "run distro_bootcmd || run sdboot || run sdbootauto" | ||
| #endif | ||
|
|
||
| #if defined(CONFIG_NAND_SUPPORT) | ||
| -- | ||
| 2.44.0 | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters