diff options
| author | Tom Rini <[email protected]> | 2021-11-18 13:46:00 -0500 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-11-18 13:46:00 -0500 |
| commit | 7a9b76814716df6685bcb5e4752ea732e2fe8885 (patch) | |
| tree | c467f074cd5a60b081f6db66ee9df3b6981620c0 /include/configs | |
| parent | f299171c1dd8fb77b56b317adf80f7c60627d64f (diff) | |
| parent | b5b97ae07368d1b453d08d602b7c790b325366a9 (diff) | |
Merge branch '2021-11-17-assorted-driver-platform-updates' into next
- NVMe updates
- TI AM64x related USB updates
- Update PCIe CAM support macros, add PCI CAM support as well
- AST2600, Apple (ARM64) pinctrl drivers
- ARM-specific DEBUG uart inconsistencies fixed
- MediaTek MMC improvement
- aspeed: Support secure boot chain with FIT image verification
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/aspeed-common.h | 9 | ||||
| -rw-r--r-- | include/configs/evb_ast2500.h | 7 | ||||
| -rw-r--r-- | include/configs/evb_ast2600.h | 14 |
3 files changed, 21 insertions, 9 deletions
diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 5177bf20fad..96526e1a75c 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -38,13 +38,4 @@ */ #define CONFIG_BOOTP_BOOTFILESIZE -/* - * Miscellaneous configurable options - */ - -#define CONFIG_EXTRA_ENV_SETTINGS \ - "verify=yes\0" \ - "spi_dma=yes\0" \ - "" - #endif /* __AST_COMMON_CONFIG_H */ diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h index dc032c1a419..558d6f9452c 100644 --- a/include/configs/evb_ast2500.h +++ b/include/configs/evb_ast2500.h @@ -13,4 +13,11 @@ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +/* Memory Info */ +#define CONFIG_SYS_LOAD_ADDR 0x83000000 + +/* Misc */ +#define CONFIG_EXTRA_ENV_SETTINGS \ + "" + #endif /* __CONFIG_H */ diff --git a/include/configs/evb_ast2600.h b/include/configs/evb_ast2600.h index 177a52eb916..9049a9fc105 100644 --- a/include/configs/evb_ast2600.h +++ b/include/configs/evb_ast2600.h @@ -10,4 +10,18 @@ #define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE +/* Memory Info */ +#define CONFIG_SYS_LOAD_ADDR 0x83000000 + +/* Misc */ +#define STR_HELPER(s) #s +#define STR(s) STR_HELPER(s) + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=" STR(CONFIG_SYS_LOAD_ADDR) "\0" \ + "bootspi=fdt addr 20100000 && fdt header get fitsize totalsize && " \ + "cp.b 20100000 ${loadaddr} ${fitsize} && bootm; " \ + "echo Error loading kernel FIT image\0" \ + "" + #endif /* __CONFIG_H */ |