[ImageBuilder] Do not set #xen,static-mem-{address/size}-cells

Michal Orzel posted 1 patch 3 weeks, 1 day ago
Failed in applying to current master (apply log)
scripts/uboot-script-gen | 3 ---
1 file changed, 3 deletions(-)
[ImageBuilder] Do not set #xen,static-mem-{address/size}-cells
Posted by Michal Orzel 3 weeks, 1 day ago
Xen commit 942ac5fc15ec ("xen/arm, device-tree: Make static-mem
use #{address,size}-cells") dropped these custom properties in favor of
reusing regular #{address/size}-cells from the chosen node for the
xen,static-mem property. Reflect this change in ImageBuilder.

Signed-off-by: Michal Orzel <michal.orzel@amd.com>
---
The master branch of ImageBuilder should reflect the current status of Xen.
Apart from that, we might want to come up with some versioning system in
ImageBuilder, because commits like this one are breaking the backwards
compatibility.
---
 scripts/uboot-script-gen | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
index 0ef89b680348..7e5cc080407e 100755
--- a/scripts/uboot-script-gen
+++ b/scripts/uboot-script-gen
@@ -181,9 +181,6 @@ function add_device_tree_static_mem()
     local cells=()
     local val
 
-    dt_set "$path" "#xen,static-mem-address-cells" "hex" "0x2"
-    dt_set "$path" "#xen,static-mem-size-cells" "hex" "0x2"
-
     for val in ${regions[@]}
     do
         cells+=("$(printf "0x%x 0x%x" $(($val >> 32)) $(($val & ((1 << 32) - 1))))")
-- 
2.25.1
Re: [ImageBuilder] Do not set #xen,static-mem-{address/size}-cells
Posted by Stefano Stabellini 3 weeks ago
On Wed, 16 Nov 2022, Michal Orzel wrote:
> Xen commit 942ac5fc15ec ("xen/arm, device-tree: Make static-mem
> use #{address,size}-cells") dropped these custom properties in favor of
> reusing regular #{address/size}-cells from the chosen node for the
> xen,static-mem property. Reflect this change in ImageBuilder.
> 
> Signed-off-by: Michal Orzel <michal.orzel@amd.com>

Reviewed-by: Stefano Stabellini <sstabellini@kernel.org>

> ---
> The master branch of ImageBuilder should reflect the current status of Xen.
> Apart from that, we might want to come up with some versioning system in
> ImageBuilder, because commits like this one are breaking the backwards
> compatibility.

Agreed


> ---
>  scripts/uboot-script-gen | 3 ---
>  1 file changed, 3 deletions(-)
> 
> diff --git a/scripts/uboot-script-gen b/scripts/uboot-script-gen
> index 0ef89b680348..7e5cc080407e 100755
> --- a/scripts/uboot-script-gen
> +++ b/scripts/uboot-script-gen
> @@ -181,9 +181,6 @@ function add_device_tree_static_mem()
>      local cells=()
>      local val
>  
> -    dt_set "$path" "#xen,static-mem-address-cells" "hex" "0x2"
> -    dt_set "$path" "#xen,static-mem-size-cells" "hex" "0x2"
> -
>      for val in ${regions[@]}
>      do
>          cells+=("$(printf "0x%x 0x%x" $(($val >> 32)) $(($val & ((1 << 32) - 1))))")
> -- 
> 2.25.1
>