[PATCH 1/2] ARM: stm32: Rename update_sf to dh_update_sd_to_sf on STM32MP15xx DHCOR
Align the script name with DH i.MX8MP DHCOM script name. Add backward compatibility script to avoid breaking user scripts.
Signed-off-by: Marek Vasut marex@denx.de --- Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com --- include/configs/stm32mp15_dh_dhsom.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 91921690624..c7ebf5cd180 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,7 +20,7 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\0" \ - "update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ + "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \ "env set filesize1 ${filesize} && " \ @@ -29,7 +29,9 @@ "sf update ${loadaddr1} 0 ${filesize1} && " \ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \ - "env set filesize1 && env set loadaddr1\0" + "env set filesize1 && env set loadaddr1\0" \ + "update_sf=run dh_update_sd_to_sf\0" +
#include <configs/stm32mp15_common.h>
Add script which installs U-Boot binaries from SD card to eMMC and makes the eMMC bootable.
Signed-off-by: Marek Vasut marex@denx.de --- Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com --- include/configs/stm32mp15_dh_dhsom.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index c7ebf5cd180..8ff882264f4 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,6 +20,25 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\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 && " \ + "setexpr sblkcnt ${filesize} + 0x1ff && " \ + "setexpr sblkcnt ${sblkcnt} / 0x200 && " \ + "load mmc 0:4 ${loadaddr} boot/u-boot.itb && " \ + "setexpr ublkcnt ${filesize} + 0x1ff && " \ + "setexpr ublkcnt ${ublkcnt} / 0x200 && " \ + "mmc partconf 1 1 1 1 && mmc dev 1 1 && " \ + "mmc write ${loadaddr1} 0 ${sblkcnt} && " \ + "mmc dev 1 2 && " \ + "mmc write ${loadaddr1} 0 ${sblkcnt} && " \ + "mmc dev 1 && " \ + "gpt write mmc 1 'name=ssbl,size=2MiB' && " \ + "mmc write ${loadaddr} 0x22 ${ublkcnt} && " \ + "mmc partconf 1 1 1 0 && " \ + "setenv loadaddr1 && " \ + "setenv sblkcnt && " \ + "setenv ublkcnt\0" \ "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \
On 10/2/23 17:52, Marek Vasut wrote:
Add script which installs U-Boot binaries from SD card to eMMC and makes the eMMC bootable.
Signed-off-by: Marek Vasut marex@denx.de
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
include/configs/stm32mp15_dh_dhsom.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index c7ebf5cd180..8ff882264f4 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,6 +20,25 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\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 && " \"setexpr sblkcnt ${filesize} + 0x1ff && " \"setexpr sblkcnt ${sblkcnt} / 0x200 && " \"load mmc 0:4 ${loadaddr} boot/u-boot.itb && " \"setexpr ublkcnt ${filesize} + 0x1ff && " \"setexpr ublkcnt ${ublkcnt} / 0x200 && " \"mmc partconf 1 1 1 1 && mmc dev 1 1 && " \"mmc write ${loadaddr1} 0 ${sblkcnt} && " \"mmc dev 1 2 && " \"mmc write ${loadaddr1} 0 ${sblkcnt} && " \"mmc dev 1 && " \"gpt write mmc 1 'name=ssbl,size=2MiB' && " \"mmc write ${loadaddr} 0x22 ${ublkcnt} && " \"mmc partconf 1 1 1 0 && " \"setenv loadaddr1 && " \"setenv sblkcnt && " \"setenv ublkcnt\0" \
Hi Marek
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Thanks Patrice
On 10/4/23 11:36, Patrice CHOTARD wrote:
On 10/2/23 17:52, Marek Vasut wrote:
Add script which installs U-Boot binaries from SD card to eMMC and makes the eMMC bootable.
Signed-off-by: Marek Vasut marex@denx.de
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
include/configs/stm32mp15_dh_dhsom.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index c7ebf5cd180..8ff882264f4 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,6 +20,25 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\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 && " \"setexpr sblkcnt ${filesize} + 0x1ff && " \"setexpr sblkcnt ${sblkcnt} / 0x200 && " \"load mmc 0:4 ${loadaddr} boot/u-boot.itb && " \"setexpr ublkcnt ${filesize} + 0x1ff && " \"setexpr ublkcnt ${ublkcnt} / 0x200 && " \"mmc partconf 1 1 1 1 && mmc dev 1 1 && " \"mmc write ${loadaddr1} 0 ${sblkcnt} && " \"mmc dev 1 2 && " \"mmc write ${loadaddr1} 0 ${sblkcnt} && " \"mmc dev 1 && " \"gpt write mmc 1 'name=ssbl,size=2MiB' && " \"mmc write ${loadaddr} 0x22 ${ublkcnt} && " \"mmc partconf 1 1 1 0 && " \"setenv loadaddr1 && " \"setenv sblkcnt && " \"setenv ublkcnt\0" \Hi Marek
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Thanks Patrice
Apply on stm32/next
Thanks Patrice
On 10/2/23 17:52, Marek Vasut wrote:
Align the script name with DH i.MX8MP DHCOM script name. Add backward compatibility script to avoid breaking user scripts.
Signed-off-by: Marek Vasut marex@denx.de
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
include/configs/stm32mp15_dh_dhsom.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 91921690624..c7ebf5cd180 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,7 +20,7 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\0" \
- "update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \
- "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \ "env set filesize1 ${filesize} && " \
@@ -29,7 +29,9 @@ "sf update ${loadaddr1} 0 ${filesize1} && " \ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \
"env set filesize1 && env set loadaddr1\0"
"env set filesize1 && env set loadaddr1\0" \- "update_sf=run dh_update_sd_to_sf\0"
#include <configs/stm32mp15_common.h>
Hi Marek
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Thanks Patrice
On 10/4/23 11:35, Patrice CHOTARD wrote:
On 10/2/23 17:52, Marek Vasut wrote:
Align the script name with DH i.MX8MP DHCOM script name. Add backward compatibility script to avoid breaking user scripts.
Signed-off-by: Marek Vasut marex@denx.de
Cc: Patrice Chotard patrice.chotard@foss.st.com Cc: Patrick Delaunay patrick.delaunay@foss.st.com Cc: u-boot@dh-electronics.com Cc: u-boot@lists.denx.de Cc: uboot-stm32@st-md-mailman.stormreply.com
include/configs/stm32mp15_dh_dhsom.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/include/configs/stm32mp15_dh_dhsom.h b/include/configs/stm32mp15_dh_dhsom.h index 91921690624..c7ebf5cd180 100644 --- a/include/configs/stm32mp15_dh_dhsom.h +++ b/include/configs/stm32mp15_dh_dhsom.h @@ -20,7 +20,7 @@
#define STM32MP_BOARD_EXTRA_ENV \ "usb_pgood_delay=1000\0" \
- "update_sf=" /* Erase SPI NOR and install U-Boot from SD */ \
- "dh_update_sd_to_sf=" /* Erase SPI NOR and install U-Boot from SD */ \ "setexpr loadaddr1 ${loadaddr} + 0x1000000 && " \ "load mmc 0:4 ${loadaddr1} /boot/u-boot-spl.stm32 && " \ "env set filesize1 ${filesize} && " \
@@ -29,7 +29,9 @@ "sf update ${loadaddr1} 0 ${filesize1} && " \ "sf update ${loadaddr1} 0x40000 ${filesize1} && " \ "sf update ${loadaddr} 0x80000 ${filesize} && " \
"env set filesize1 && env set loadaddr1\0"
"env set filesize1 && env set loadaddr1\0" \- "update_sf=run dh_update_sd_to_sf\0"
#include <configs/stm32mp15_common.h>
Hi Marek
Reviewed-by: Patrice Chotard patrice.chotard@foss.st.com
Thanks Patrice
Apply on stm32/next
Thanks Patrice
participants (2)
-
Marek Vasut -
Patrice CHOTARD