diff options
| author | Tom Rini <[email protected]> | 2024-11-12 13:40:29 -0600 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2024-11-12 13:40:29 -0600 |
| commit | 9f538624fc799e31fae1f38dae959dca7ab97a12 (patch) | |
| tree | 5027c4eb7618a0a6f0822fb08d733052344a162c /include | |
| parent | cca05617a8f585f3a98a8fa82f75cc68a530d771 (diff) | |
| parent | f9cfc47a832e33ee35db613677a8e4e9b97a0b07 (diff) | |
Merge tag 'u-boot-stm32-20241112' of https://source.denx.de/u-boot/custodians/u-boot-stm
CI: https://source.denx.de/u-boot/custodians/u-boot-stm/-/pipelines/23296
- Deduplicate DH STM32MP1xx DHSOM and DHCOR defconfigs
- Fixes STM32MP1xx DHSOM and DHCOR device trees
- Add support of manufacturing environment to STM32MP15xx DHSOM
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/stm32mp15_dh_dhsom.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 2797fc61d17..c004a8cec82 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -18,6 +18,8 @@ #endif #define STM32MP_BOARD_EXTRA_ENV \ + "dh_preboot=" \ + "run dh_testbench_backward_compat\0" \ "dh_update_sd_to_emmc=" /* Install U-Boot from SD to eMMC */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} boot/u-boot-spl.stm32 && " \ @@ -61,7 +63,20 @@ "stdout=serial\0" \ "stderr=serial\0" \ "update_sf=run dh_update_sd_to_sf\0" \ - "usb_pgood_delay=1000\0" + "usb_pgood_delay=1000\0" \ + /* Old testbench-only backward compatibility environment */ \ + "dh_testbench_backward_compat=" \ + "test ${board_name} = \"dh,stm32mp15xx-dhcor-testbench\" && " \ + "run load_bootenv importbootenv\0" \ + "importbootenv=" \ + "echo Importing environment from DHupdate.ini...;" \ + "env import -t ${loadaddr} ${filesize}\0" \ + "load_bootenv=" \ + "usb reset && " \ + "load usb ${usbdev}:${usbpart} ${loadaddr} DHupdate.ini && " \ + "echo \"--> Update: found DHupdate.ini (${filesize} bytes)\"\0" \ + "usbdev=0\0" \ + "usbpart=1\0" #include <configs/stm32mp15_common.h> |