diff options
| author | Tom Rini <[email protected]> | 2022-04-21 10:56:58 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-04-21 10:56:58 -0400 |
| commit | feeacc7ec70560c535c0eb7a4d847ad17cacbeff (patch) | |
| tree | 404228235100b5ae6d40f9c307718aaee46ce308 /include | |
| parent | 22bfaa1f673ab5442dfb9778eea4c9a18dee42d0 (diff) | |
| parent | 1dd56db5e0bcb05e65fd646d3252f9b439461fb0 (diff) | |
Merge branch '2022-04-21-assorted-improvements'
- For the environment, add a arch_env_get_location hook and make use of
it on some NXP platforms (so that boards can override SoCs).
- Remove some unused squashfs code from SPL
- Resync am335x beaglebone related DTS files
- Enable SPL_SEPARATE_BSS if SPL_BSS_START_ADDR is used
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/am335x_evm.h | 4 | ||||
| -rw-r--r-- | include/env_internal.h | 16 |
2 files changed, 20 insertions, 0 deletions
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index cbb7b91139d..fd5b209a52d 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -134,6 +134,10 @@ "setenv fdtfile am335x-boneblue.dtb; fi; " \ "if test $board_name = BBEN; then " \ "setenv fdtfile am335x-sancloud-bbe.dtb; fi; " \ + "if test $board_name = BBELITE; then " \ + "setenv fdtfile am335x-sancloud-bbe-lite.dtb; fi; " \ + "if test $board_name = BBE_EX_WIFI; then " \ + "setenv fdtfile am335x-sancloud-bbe-extended-wifi.dtb; fi; " \ "if test $board_name = A33515BB; then " \ "setenv fdtfile am335x-evm.dtb; fi; " \ "if test $board_name = A335X_SK; then " \ diff --git a/include/env_internal.h b/include/env_internal.h index b704c033631..f30fd6159d8 100644 --- a/include/env_internal.h +++ b/include/env_internal.h @@ -235,9 +235,25 @@ const char *env_ext4_get_intf(void); const char *env_ext4_get_dev_part(void); /** + * arch_env_get_location()- Provide the best location for the U-Boot environment + * + * It is a weak function allowing board to overidde the environment location + * on architecture level. This has lower priority than env_get_location(), + * which can be defined on board level. + * + * @op: operations performed on the environment + * @prio: priority between the multiple environments, 0 being the + * highest priority + * Return: an enum env_location value on success, or -ve error code. + */ +enum env_location arch_env_get_location(enum env_operation op, int prio); + +/** * env_get_location()- Provide the best location for the U-Boot environment * * It is a weak function allowing board to overidde the environment location + * on board level. This has higher priority than arch_env_get_location(), + * which can be defined on architecture level. * * @op: operations performed on the environment * @prio: priority between the multiple environments, 0 being the |