* [PATCH] rockchip: Restore support for boot scripts in legacy image format
@ 2023-06-26 19:43 Jonas Karlman
2023-06-29 10:51 ` Kever Yang
2023-07-03 18:27 ` Tom Rini
0 siblings, 2 replies; 5+ messages in thread
From: Jonas Karlman @ 2023-06-26 19:43 UTC (permalink / raw)
To: Simon Glass, Joseph Chen, Kever Yang, Jagan Teki, Akash Gajjar,
Eugen Hristev, Jonas Karlman
Cc: Tom Rini, u-boot
Use of CONFIG_SPL_FIT_SIGNATURE=y cause CONFIG_LEGACY_IMAGE_FORMAT=n as
default, this prevent boot scripts in legacy image format from working
and was an unintended change in the listed fixes commits:
Wrong image format for "source" command
Add CONFIG_LEGACY_IMAGE_FORMAT=y to defconfig for affected boards to
restore support for boot scripts in legacy image format.
Fixes: 3bf8e4080763 ("board: rockchip: add Radxa ROCK5B Rk3588 board")
Fixes: cf777572ca31 ("rockchip: rockpro64: Use SDMA to boost eMMC performance")
Fixes: 6e2b8344d60c ("rockchip: rock-pi-4: Use SDMA to boost eMMC performance")
Fixes: 1bf49d5a4a7c ("rockchip: rk3566-radxa-cm3-io: Update defconfig")
Fixes: 703c170b40f2 ("rockchip: rk3568-evb: Update defconfig")
Fixes: 68000f750acd ("rockchip: rk3568-rock-3a: Update defconfig")
Fixes: 6fb02589a608 ("rockchip: rk3588-evb: Update defconfig")
Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
---
configs/evb-rk3568_defconfig | 1 +
configs/evb-rk3588_defconfig | 1 +
configs/radxa-cm3-io-rk3566_defconfig | 1 +
configs/rock-3a-rk3568_defconfig | 1 +
configs/rock-pi-4-rk3399_defconfig | 1 +
configs/rock5b-rk3588_defconfig | 1 +
configs/rockpro64-rk3399_defconfig | 1 +
7 files changed, 7 insertions(+)
diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
index 07819d105441..5f3fab7304c2 100644
--- a/configs/evb-rk3568_defconfig
+++ b/configs/evb-rk3568_defconfig
@@ -22,6 +22,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
index d5f1c4b9ebc7..f49c2ca686a8 100644
--- a/configs/evb-rk3588_defconfig
+++ b/configs/evb-rk3588_defconfig
@@ -23,6 +23,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
index 56802d85cc25..488723dfaa30 100644
--- a/configs/radxa-cm3-io-rk3566_defconfig
+++ b/configs/radxa-cm3-io-rk3566_defconfig
@@ -22,6 +22,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-cm3-io.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
index 616499f2f82b..753d03914d90 100644
--- a/configs/rock-3a-rk3568_defconfig
+++ b/configs/rock-3a-rk3568_defconfig
@@ -27,6 +27,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
CONFIG_DISPLAY_BOARDINFO_LATE=y
diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
index 4b984adc6ef8..466868d80b03 100644
--- a/configs/rock-pi-4-rk3399_defconfig
+++ b/configs/rock-pi-4-rk3399_defconfig
@@ -20,6 +20,7 @@ CONFIG_PCI=y
CONFIG_DEBUG_UART=y
# CONFIG_ANDROID_BOOT_IMAGE is not set
CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
CONFIG_DISPLAY_BOARDINFO_LATE=y
CONFIG_MISC_INIT_R=y
diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
index c1155c20efa8..17205a56cd99 100644
--- a/configs/rock5b-rk3588_defconfig
+++ b/configs/rock5b-rk3588_defconfig
@@ -29,6 +29,7 @@ CONFIG_FIT=y
CONFIG_FIT_VERBOSE=y
CONFIG_SPL_FIT_SIGNATURE=y
CONFIG_SPL_LOAD_FIT=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_OF_BOARD_SETUP=y
CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
# CONFIG_DISPLAY_CPUINFO is not set
diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
index f41c03067903..dc4392c7451c 100644
--- a/configs/rockpro64-rk3399_defconfig
+++ b/configs/rockpro64-rk3399_defconfig
@@ -23,6 +23,7 @@ CONFIG_PCI=y
CONFIG_DEBUG_UART=y
CONFIG_LTO=y
CONFIG_SPL_FIT_SIGNATURE=y
+CONFIG_LEGACY_IMAGE_FORMAT=y
CONFIG_BOOTSTAGE=y
CONFIG_BOOTSTAGE_REPORT=y
CONFIG_USE_PREBOOT=y
--
2.41.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] rockchip: Restore support for boot scripts in legacy image format
2023-06-26 19:43 [PATCH] rockchip: Restore support for boot scripts in legacy image format Jonas Karlman
@ 2023-06-29 10:51 ` Kever Yang
2023-06-29 14:07 ` Jonas Karlman
2023-07-03 18:27 ` Tom Rini
1 sibling, 1 reply; 5+ messages in thread
From: Kever Yang @ 2023-06-29 10:51 UTC (permalink / raw)
To: Jonas Karlman, Simon Glass, Joseph Chen, Jagan Teki,
Akash Gajjar, Eugen Hristev
Cc: Tom Rini, u-boot
Hi Jonas,
What is the legacy image format, does these boards really use than?
I think most of the board using linux distro image.
Thanks,
- Kever
On 2023/6/27 03:43, Jonas Karlman wrote:
> Use of CONFIG_SPL_FIT_SIGNATURE=y cause CONFIG_LEGACY_IMAGE_FORMAT=n as
> default, this prevent boot scripts in legacy image format from working
> and was an unintended change in the listed fixes commits:
>
> Wrong image format for "source" command
>
> Add CONFIG_LEGACY_IMAGE_FORMAT=y to defconfig for affected boards to
> restore support for boot scripts in legacy image format.
>
> Fixes: 3bf8e4080763 ("board: rockchip: add Radxa ROCK5B Rk3588 board")
> Fixes: cf777572ca31 ("rockchip: rockpro64: Use SDMA to boost eMMC performance")
> Fixes: 6e2b8344d60c ("rockchip: rock-pi-4: Use SDMA to boost eMMC performance")
> Fixes: 1bf49d5a4a7c ("rockchip: rk3566-radxa-cm3-io: Update defconfig")
> Fixes: 703c170b40f2 ("rockchip: rk3568-evb: Update defconfig")
> Fixes: 68000f750acd ("rockchip: rk3568-rock-3a: Update defconfig")
> Fixes: 6fb02589a608 ("rockchip: rk3588-evb: Update defconfig")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
> ---
> configs/evb-rk3568_defconfig | 1 +
> configs/evb-rk3588_defconfig | 1 +
> configs/radxa-cm3-io-rk3566_defconfig | 1 +
> configs/rock-3a-rk3568_defconfig | 1 +
> configs/rock-pi-4-rk3399_defconfig | 1 +
> configs/rock5b-rk3588_defconfig | 1 +
> configs/rockpro64-rk3399_defconfig | 1 +
> 7 files changed, 7 insertions(+)
>
> diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
> index 07819d105441..5f3fab7304c2 100644
> --- a/configs/evb-rk3568_defconfig
> +++ b/configs/evb-rk3568_defconfig
> @@ -22,6 +22,7 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
> index d5f1c4b9ebc7..f49c2ca686a8 100644
> --- a/configs/evb-rk3588_defconfig
> +++ b/configs/evb-rk3588_defconfig
> @@ -23,6 +23,7 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
> index 56802d85cc25..488723dfaa30 100644
> --- a/configs/radxa-cm3-io-rk3566_defconfig
> +++ b/configs/radxa-cm3-io-rk3566_defconfig
> @@ -22,6 +22,7 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-cm3-io.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
> index 616499f2f82b..753d03914d90 100644
> --- a/configs/rock-3a-rk3568_defconfig
> +++ b/configs/rock-3a-rk3568_defconfig
> @@ -27,6 +27,7 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
> index 4b984adc6ef8..466868d80b03 100644
> --- a/configs/rock-pi-4-rk3399_defconfig
> +++ b/configs/rock-pi-4-rk3399_defconfig
> @@ -20,6 +20,7 @@ CONFIG_PCI=y
> CONFIG_DEBUG_UART=y
> # CONFIG_ANDROID_BOOT_IMAGE is not set
> CONFIG_SPL_FIT_SIGNATURE=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
> CONFIG_DISPLAY_BOARDINFO_LATE=y
> CONFIG_MISC_INIT_R=y
> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
> index c1155c20efa8..17205a56cd99 100644
> --- a/configs/rock5b-rk3588_defconfig
> +++ b/configs/rock5b-rk3588_defconfig
> @@ -29,6 +29,7 @@ CONFIG_FIT=y
> CONFIG_FIT_VERBOSE=y
> CONFIG_SPL_FIT_SIGNATURE=y
> CONFIG_SPL_LOAD_FIT=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_OF_BOARD_SETUP=y
> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
> # CONFIG_DISPLAY_CPUINFO is not set
> diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
> index f41c03067903..dc4392c7451c 100644
> --- a/configs/rockpro64-rk3399_defconfig
> +++ b/configs/rockpro64-rk3399_defconfig
> @@ -23,6 +23,7 @@ CONFIG_PCI=y
> CONFIG_DEBUG_UART=y
> CONFIG_LTO=y
> CONFIG_SPL_FIT_SIGNATURE=y
> +CONFIG_LEGACY_IMAGE_FORMAT=y
> CONFIG_BOOTSTAGE=y
> CONFIG_BOOTSTAGE_REPORT=y
> CONFIG_USE_PREBOOT=y
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rockchip: Restore support for boot scripts in legacy image format
2023-06-29 10:51 ` Kever Yang
@ 2023-06-29 14:07 ` Jonas Karlman
2023-06-30 1:46 ` Andy Yan
0 siblings, 1 reply; 5+ messages in thread
From: Jonas Karlman @ 2023-06-29 14:07 UTC (permalink / raw)
To: Kever Yang, Simon Glass, Joseph Chen, Jagan Teki, Akash Gajjar,
Eugen Hristev
Cc: Tom Rini, u-boot
Hi Kever,
On 2023-06-29 12:51, Kever Yang wrote:
> Hi Jonas,
>
> What is the legacy image format, does these boards really use than?
>
> I think most of the board using linux distro image.
The legacy image format it the normal boot script format,
in the documentation it is called Legacy U-Boot image, see [1].
i.e. boot scripts compiled with:
mkimage -T script -n 'Test script' -d boot.txt boot.scr
Such boot scripts are used by some linux distro, e.g. Armbian.
[1] https://u-boot.readthedocs.io/en/latest/usage/cmd/source.html#legacy-u-boot-image
Regards,
Jonas
>
>
> Thanks,
>
> - Kever
>
> On 2023/6/27 03:43, Jonas Karlman wrote:
>> Use of CONFIG_SPL_FIT_SIGNATURE=y cause CONFIG_LEGACY_IMAGE_FORMAT=n as
>> default, this prevent boot scripts in legacy image format from working
>> and was an unintended change in the listed fixes commits:
>>
>> Wrong image format for "source" command
>>
>> Add CONFIG_LEGACY_IMAGE_FORMAT=y to defconfig for affected boards to
>> restore support for boot scripts in legacy image format.
>>
>> Fixes: 3bf8e4080763 ("board: rockchip: add Radxa ROCK5B Rk3588 board")
>> Fixes: cf777572ca31 ("rockchip: rockpro64: Use SDMA to boost eMMC performance")
>> Fixes: 6e2b8344d60c ("rockchip: rock-pi-4: Use SDMA to boost eMMC performance")
>> Fixes: 1bf49d5a4a7c ("rockchip: rk3566-radxa-cm3-io: Update defconfig")
>> Fixes: 703c170b40f2 ("rockchip: rk3568-evb: Update defconfig")
>> Fixes: 68000f750acd ("rockchip: rk3568-rock-3a: Update defconfig")
>> Fixes: 6fb02589a608 ("rockchip: rk3588-evb: Update defconfig")
>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
>> ---
>> configs/evb-rk3568_defconfig | 1 +
>> configs/evb-rk3588_defconfig | 1 +
>> configs/radxa-cm3-io-rk3566_defconfig | 1 +
>> configs/rock-3a-rk3568_defconfig | 1 +
>> configs/rock-pi-4-rk3399_defconfig | 1 +
>> configs/rock5b-rk3588_defconfig | 1 +
>> configs/rockpro64-rk3399_defconfig | 1 +
>> 7 files changed, 7 insertions(+)
>>
>> diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
>> index 07819d105441..5f3fab7304c2 100644
>> --- a/configs/evb-rk3568_defconfig
>> +++ b/configs/evb-rk3568_defconfig
>> @@ -22,6 +22,7 @@ CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb.dtb"
>> # CONFIG_DISPLAY_CPUINFO is not set
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
>> index d5f1c4b9ebc7..f49c2ca686a8 100644
>> --- a/configs/evb-rk3588_defconfig
>> +++ b/configs/evb-rk3588_defconfig
>> @@ -23,6 +23,7 @@ CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_OF_BOARD_SETUP=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb"
>> # CONFIG_DISPLAY_CPUINFO is not set
>> diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
>> index 56802d85cc25..488723dfaa30 100644
>> --- a/configs/radxa-cm3-io-rk3566_defconfig
>> +++ b/configs/radxa-cm3-io-rk3566_defconfig
>> @@ -22,6 +22,7 @@ CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-cm3-io.dtb"
>> # CONFIG_DISPLAY_CPUINFO is not set
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
>> index 616499f2f82b..753d03914d90 100644
>> --- a/configs/rock-3a-rk3568_defconfig
>> +++ b/configs/rock-3a-rk3568_defconfig
>> @@ -27,6 +27,7 @@ CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
>> # CONFIG_DISPLAY_CPUINFO is not set
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
>> index 4b984adc6ef8..466868d80b03 100644
>> --- a/configs/rock-pi-4-rk3399_defconfig
>> +++ b/configs/rock-pi-4-rk3399_defconfig
>> @@ -20,6 +20,7 @@ CONFIG_PCI=y
>> CONFIG_DEBUG_UART=y
>> # CONFIG_ANDROID_BOOT_IMAGE is not set
>> CONFIG_SPL_FIT_SIGNATURE=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>> CONFIG_MISC_INIT_R=y
>> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
>> index c1155c20efa8..17205a56cd99 100644
>> --- a/configs/rock5b-rk3588_defconfig
>> +++ b/configs/rock5b-rk3588_defconfig
>> @@ -29,6 +29,7 @@ CONFIG_FIT=y
>> CONFIG_FIT_VERBOSE=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> CONFIG_SPL_LOAD_FIT=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_OF_BOARD_SETUP=y
>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
>> # CONFIG_DISPLAY_CPUINFO is not set
>> diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
>> index f41c03067903..dc4392c7451c 100644
>> --- a/configs/rockpro64-rk3399_defconfig
>> +++ b/configs/rockpro64-rk3399_defconfig
>> @@ -23,6 +23,7 @@ CONFIG_PCI=y
>> CONFIG_DEBUG_UART=y
>> CONFIG_LTO=y
>> CONFIG_SPL_FIT_SIGNATURE=y
>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>> CONFIG_BOOTSTAGE=y
>> CONFIG_BOOTSTAGE_REPORT=y
>> CONFIG_USE_PREBOOT=y
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re:Re: [PATCH] rockchip: Restore support for boot scripts in legacy image format
2023-06-29 14:07 ` Jonas Karlman
@ 2023-06-30 1:46 ` Andy Yan
0 siblings, 0 replies; 5+ messages in thread
From: Andy Yan @ 2023-06-30 1:46 UTC (permalink / raw)
To: Jonas Karlman
Cc: Kever Yang, Simon Glass, Joseph Chen, Jagan Teki, Akash Gajjar,
Eugen Hristev, Tom Rini, u-boot
Hi:
在 2023-06-29 22:07:05,"Jonas Karlman" <jonas@kwiboo.se> 写道:
>Hi Kever,
>
>On 2023-06-29 12:51, Kever Yang wrote:
>> Hi Jonas,
>>
>> What is the legacy image format, does these boards really use than?
>>
>> I think most of the board using linux distro image.
>
>The legacy image format it the normal boot script format,
>in the documentation it is called Legacy U-Boot image, see [1].
>
>i.e. boot scripts compiled with:
>
> mkimage -T script -n 'Test script' -d boot.txt boot.scr
>
>Such boot scripts are used by some linux distro, e.g. Armbian.
>
>[1] https://u-boot.readthedocs.io/en/latest/usage/cmd/source.html#legacy-u-boot-image
>
Yes, this is a common use case, I also run into this case a few weeks ago on armbian[2]:
The code handle this logic in u-boot is image_locate_script.
[2 ]https://github.com/armbian/build/blob/main/config/bootscripts/boot-rockchip.cmd
>Regards,
>Jonas
>
>>
>>
>> Thanks,
>>
>> - Kever
>>
>> On 2023/6/27 03:43, Jonas Karlman wrote:
>>> Use of CONFIG_SPL_FIT_SIGNATURE=y cause CONFIG_LEGACY_IMAGE_FORMAT=n as
>>> default, this prevent boot scripts in legacy image format from working
>>> and was an unintended change in the listed fixes commits:
>>>
>>> Wrong image format for "source" command
>>>
>>> Add CONFIG_LEGACY_IMAGE_FORMAT=y to defconfig for affected boards to
>>> restore support for boot scripts in legacy image format.
>>>
>>> Fixes: 3bf8e4080763 ("board: rockchip: add Radxa ROCK5B Rk3588 board")
>>> Fixes: cf777572ca31 ("rockchip: rockpro64: Use SDMA to boost eMMC performance")
>>> Fixes: 6e2b8344d60c ("rockchip: rock-pi-4: Use SDMA to boost eMMC performance")
>>> Fixes: 1bf49d5a4a7c ("rockchip: rk3566-radxa-cm3-io: Update defconfig")
>>> Fixes: 703c170b40f2 ("rockchip: rk3568-evb: Update defconfig")
>>> Fixes: 68000f750acd ("rockchip: rk3568-rock-3a: Update defconfig")
>>> Fixes: 6fb02589a608 ("rockchip: rk3588-evb: Update defconfig")
>>> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
>>> ---
>>> configs/evb-rk3568_defconfig | 1 +
>>> configs/evb-rk3588_defconfig | 1 +
>>> configs/radxa-cm3-io-rk3566_defconfig | 1 +
>>> configs/rock-3a-rk3568_defconfig | 1 +
>>> configs/rock-pi-4-rk3399_defconfig | 1 +
>>> configs/rock5b-rk3588_defconfig | 1 +
>>> configs/rockpro64-rk3399_defconfig | 1 +
>>> 7 files changed, 7 insertions(+)
>>>
>>> diff --git a/configs/evb-rk3568_defconfig b/configs/evb-rk3568_defconfig
>>> index 07819d105441..5f3fab7304c2 100644
>>> --- a/configs/evb-rk3568_defconfig
>>> +++ b/configs/evb-rk3568_defconfig
>>> @@ -22,6 +22,7 @@ CONFIG_FIT=y
>>> CONFIG_FIT_VERBOSE=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> CONFIG_SPL_LOAD_FIT=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-evb.dtb"
>>> # CONFIG_DISPLAY_CPUINFO is not set
>>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>>> diff --git a/configs/evb-rk3588_defconfig b/configs/evb-rk3588_defconfig
>>> index d5f1c4b9ebc7..f49c2ca686a8 100644
>>> --- a/configs/evb-rk3588_defconfig
>>> +++ b/configs/evb-rk3588_defconfig
>>> @@ -23,6 +23,7 @@ CONFIG_FIT=y
>>> CONFIG_FIT_VERBOSE=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> CONFIG_SPL_LOAD_FIT=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_OF_BOARD_SETUP=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-evb1-v10.dtb"
>>> # CONFIG_DISPLAY_CPUINFO is not set
>>> diff --git a/configs/radxa-cm3-io-rk3566_defconfig b/configs/radxa-cm3-io-rk3566_defconfig
>>> index 56802d85cc25..488723dfaa30 100644
>>> --- a/configs/radxa-cm3-io-rk3566_defconfig
>>> +++ b/configs/radxa-cm3-io-rk3566_defconfig
>>> @@ -22,6 +22,7 @@ CONFIG_FIT=y
>>> CONFIG_FIT_VERBOSE=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> CONFIG_SPL_LOAD_FIT=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3566-radxa-cm3-io.dtb"
>>> # CONFIG_DISPLAY_CPUINFO is not set
>>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>>> diff --git a/configs/rock-3a-rk3568_defconfig b/configs/rock-3a-rk3568_defconfig
>>> index 616499f2f82b..753d03914d90 100644
>>> --- a/configs/rock-3a-rk3568_defconfig
>>> +++ b/configs/rock-3a-rk3568_defconfig
>>> @@ -27,6 +27,7 @@ CONFIG_FIT=y
>>> CONFIG_FIT_VERBOSE=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> CONFIG_SPL_LOAD_FIT=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3568-rock-3a.dtb"
>>> # CONFIG_DISPLAY_CPUINFO is not set
>>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>>> diff --git a/configs/rock-pi-4-rk3399_defconfig b/configs/rock-pi-4-rk3399_defconfig
>>> index 4b984adc6ef8..466868d80b03 100644
>>> --- a/configs/rock-pi-4-rk3399_defconfig
>>> +++ b/configs/rock-pi-4-rk3399_defconfig
>>> @@ -20,6 +20,7 @@ CONFIG_PCI=y
>>> CONFIG_DEBUG_UART=y
>>> # CONFIG_ANDROID_BOOT_IMAGE is not set
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3399-rock-pi-4a.dtb"
>>> CONFIG_DISPLAY_BOARDINFO_LATE=y
>>> CONFIG_MISC_INIT_R=y
>>> diff --git a/configs/rock5b-rk3588_defconfig b/configs/rock5b-rk3588_defconfig
>>> index c1155c20efa8..17205a56cd99 100644
>>> --- a/configs/rock5b-rk3588_defconfig
>>> +++ b/configs/rock5b-rk3588_defconfig
>>> @@ -29,6 +29,7 @@ CONFIG_FIT=y
>>> CONFIG_FIT_VERBOSE=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> CONFIG_SPL_LOAD_FIT=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_OF_BOARD_SETUP=y
>>> CONFIG_DEFAULT_FDT_FILE="rockchip/rk3588-rock-5b.dtb"
>>> # CONFIG_DISPLAY_CPUINFO is not set
>>> diff --git a/configs/rockpro64-rk3399_defconfig b/configs/rockpro64-rk3399_defconfig
>>> index f41c03067903..dc4392c7451c 100644
>>> --- a/configs/rockpro64-rk3399_defconfig
>>> +++ b/configs/rockpro64-rk3399_defconfig
>>> @@ -23,6 +23,7 @@ CONFIG_PCI=y
>>> CONFIG_DEBUG_UART=y
>>> CONFIG_LTO=y
>>> CONFIG_SPL_FIT_SIGNATURE=y
>>> +CONFIG_LEGACY_IMAGE_FORMAT=y
>>> CONFIG_BOOTSTAGE=y
>>> CONFIG_BOOTSTAGE_REPORT=y
>>> CONFIG_USE_PREBOOT=y
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] rockchip: Restore support for boot scripts in legacy image format
2023-06-26 19:43 [PATCH] rockchip: Restore support for boot scripts in legacy image format Jonas Karlman
2023-06-29 10:51 ` Kever Yang
@ 2023-07-03 18:27 ` Tom Rini
1 sibling, 0 replies; 5+ messages in thread
From: Tom Rini @ 2023-07-03 18:27 UTC (permalink / raw)
To: Jonas Karlman
Cc: Simon Glass, Joseph Chen, Kever Yang, Jagan Teki, Akash Gajjar,
Eugen Hristev, u-boot
[-- Attachment #1: Type: text/plain, Size: 1081 bytes --]
On Mon, Jun 26, 2023 at 07:43:06PM +0000, Jonas Karlman wrote:
> Use of CONFIG_SPL_FIT_SIGNATURE=y cause CONFIG_LEGACY_IMAGE_FORMAT=n as
> default, this prevent boot scripts in legacy image format from working
> and was an unintended change in the listed fixes commits:
>
> Wrong image format for "source" command
>
> Add CONFIG_LEGACY_IMAGE_FORMAT=y to defconfig for affected boards to
> restore support for boot scripts in legacy image format.
>
> Fixes: 3bf8e4080763 ("board: rockchip: add Radxa ROCK5B Rk3588 board")
> Fixes: cf777572ca31 ("rockchip: rockpro64: Use SDMA to boost eMMC performance")
> Fixes: 6e2b8344d60c ("rockchip: rock-pi-4: Use SDMA to boost eMMC performance")
> Fixes: 1bf49d5a4a7c ("rockchip: rk3566-radxa-cm3-io: Update defconfig")
> Fixes: 703c170b40f2 ("rockchip: rk3568-evb: Update defconfig")
> Fixes: 68000f750acd ("rockchip: rk3568-rock-3a: Update defconfig")
> Fixes: 6fb02589a608 ("rockchip: rk3588-evb: Update defconfig")
> Signed-off-by: Jonas Karlman <jonas@kwiboo.se>
Applied to u-boot/master, thanks!
--
Tom
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 659 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-07-03 18:28 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-06-26 19:43 [PATCH] rockchip: Restore support for boot scripts in legacy image format Jonas Karlman
2023-06-29 10:51 ` Kever Yang
2023-06-29 14:07 ` Jonas Karlman
2023-06-30 1:46 ` Andy Yan
2023-07-03 18:27 ` Tom Rini
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.