diff options
| author | thead_admin <occ_thead@service.alibaba.com> | 2023-11-14 01:41:56 +0000 |
|---|---|---|
| committer | Han Gao/Revy/Rabenda <rabenda.cn@gmail.com> | 2024-01-22 15:55:16 +0800 |
| commit | 3e564f9f0c0db3eaef002815596b0bb35063ecc7 (patch) | |
| tree | 97d8b49306f9e0655e180d10d6a704f06cd21d47 /include | |
| parent | 34dd739d4c4e513e80f9e5afc088e2427090d106 (diff) | |
Linux_SDK_V1.3.3
Signed-off-by: thead_admin <occ_thead@service.alibaba.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/light-c910.h | 16 | ||||
| -rw-r--r-- | include/env_flags.h | 9 |
2 files changed, 19 insertions, 6 deletions
diff --git a/include/configs/light-c910.h b/include/configs/light-c910.h index 7f6bbc9d..eb4fff54 100644 --- a/include/configs/light-c910.h +++ b/include/configs/light-c910.h @@ -23,7 +23,7 @@ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE + SZ_1M) #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_TEXT_BASE + SZ_1M) #ifdef CONFIG_ANDROID_BOOT_IMAGE -#define CONFIG_SYS_MALLOC_LEN (128*SZ_1M) +#define CONFIG_SYS_MALLOC_LEN (64*SZ_1M) #else #define CONFIG_SYS_MALLOC_LEN SZ_1M #endif @@ -63,14 +63,14 @@ #define THEAD_LIGHT_FASTBOOT 1 #define LIGHT_FW_ADDR 0x0 #define LIGHT_KERNEL_ADDR 0x200000 -#define LIGHT_DTB_ADDR 0x2800000 +#define LIGHT_DTB_ADDR 0x3800000 #define LIGHT_ROOTFS_ADDR 0x2000000 #define LIGHT_AON_FW_ADDR 0xffffef8000 #define LIGHT_TEE_FW_ADDR 0x1c000000 #define LIGHT_TF_FW_ADDR LIGHT_FW_ADDR #define LIGHT_TF_FW_TMP_ADDR 0x100000 #define LIGHT_KERNEL_ADDR_CMD "0x200000" -#define LIGHT_DTB_ADDR_CMD "0x2800000" +#define LIGHT_DTB_ADDR_CMD "0x3800000" /* trust image name string */ @@ -115,6 +115,7 @@ #if defined (U_BUILD_DEBUG) #define ENV_KERNEL_LOGLEVEL "kernel_loglevel=7\0" #define ENV_STR_BOOT_DELAY +#define CONFIG_ENV_OVERWRITE #else #define ENV_KERNEL_LOGLEVEL "kernel_loglevel=4\0" #define ENV_STR_BOOT_DELAY "bootdelay=0\0" @@ -122,20 +123,25 @@ #define CONFIG_MISC_INIT_R +#define ENV_STR_BOARD "board#=LP\0" + #define CONFIG_EXTRA_ENV_SETTINGS \ "scriptaddr=0x00500000\0" \ "pxefile_addr_r=0x00600000\0" \ - "fdt_addr_r=0x02800000\0" \ + "dtb_addr=0x03800000\0" \ + "fdt_addr=0x03800000\0" \ "kernel_addr_r=0x00200000\0" \ "ramdisk_addr_r=0x06000000\0" \ "boot_conf_addr_r=0xc0000000\0" \ "aon_ram_addr=0xffffef8000\0" \ "audio_ram_addr=0x32000000\0" \ + "str_ram_addr=0xffe0000000\0" \ "opensbi_addr=0x0\0" \ "fwaddr=0x10000000\0" \ "splashimage=0x30000000\0" \ "splashpos=m,m\0" \ "fdt_high=0xffffffffffffffff\0" \ + ENV_STR_BOARD \ "kernel_addr_r=0x00200000\0" \ "kdump_buf=180M\0" \ "mmcdev=0\0" \ @@ -152,4 +158,4 @@ "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "\0" -#endif /* __CONFIG_H */ +#endif /* __CONFIG_H */
\ No newline at end of file diff --git a/include/env_flags.h b/include/env_flags.h index 725841a8..7b8bf7b7 100644 --- a/include/env_flags.h +++ b/include/env_flags.h @@ -70,11 +70,18 @@ enum env_flags_varaccess { #define SERIAL_FLAGS "" #endif +#ifndef CONFIG_ENV_OVERWRITE +#define BOARD_FLAGS "board#:so," +#else +#define BOARD_FLAGS "" +#endif + #define ENV_FLAGS_LIST_STATIC \ ETHADDR_FLAGS \ NET_FLAGS \ SERIAL_FLAGS \ - CONFIG_ENV_FLAGS_LIST_STATIC + CONFIG_ENV_FLAGS_LIST_STATIC \ + BOARD_FLAGS #ifdef CONFIG_CMD_ENV_FLAGS /* |