Refactor arm/xen.lds.S by replacing the inline definitions for
device info sections with the newly introduced {DT,ACPI}_DEV_INFO
macros from xen/xen.lds.h.

Signed-off-by: Oleksii Kurochko <oleksii.kurochko@gmail.com>
---
Changes in V2:
 - use refactored ADEV_INFO and DT_DEV_INFO macros.
---

 xen/arch/arm/xen.lds.S | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/xen/arch/arm/xen.lds.S b/xen/arch/arm/xen.lds.S
index bd884664ad..7317851871 100644
--- a/xen/arch/arm/xen.lds.S
+++ b/xen/arch/arm/xen.lds.S
@@ -126,19 +126,13 @@ SECTIONS
 
   . = ALIGN(8);
   .dev.info : {
-      _sdevice = .;
-      *(.dev.info)
-      _edevice = .;
+     DT_DEV_INFO
   } :text
 
-#ifdef CONFIG_ACPI
   . = ALIGN(8);
   .adev.info : {
-      _asdevice = .;
-      *(.adev.info)
-      _aedevice = .;
+     ADEV_INFO
   } :text
-#endif
 
   . = ALIGN(8);
   .teemediator.info : {
-- 
2.46.1

On 24.09.2024 18:42, Oleksii Kurochko wrote:
> --- a/xen/arch/arm/xen.lds.S
> +++ b/xen/arch/arm/xen.lds.S
> @@ -126,19 +126,13 @@ SECTIONS
>  
>    . = ALIGN(8);
>    .dev.info : {
> -      _sdevice = .;
> -      *(.dev.info)
> -      _edevice = .;
> +     DT_DEV_INFO
>    } :text
>  
> -#ifdef CONFIG_ACPI
>    . = ALIGN(8);
>    .adev.info : {
> -      _asdevice = .;
> -      *(.adev.info)
> -      _aedevice = .;
> +     ADEV_INFO
>    } :text
> -#endif

Why's the #ifdef going away here?

Jan

On Wed, 2024-09-25 at 10:37 +0200, Jan Beulich wrote:
> On 24.09.2024 18:42, Oleksii Kurochko wrote:
> > --- a/xen/arch/arm/xen.lds.S
> > +++ b/xen/arch/arm/xen.lds.S
> > @@ -126,19 +126,13 @@ SECTIONS
> >  
> >    . = ALIGN(8);
> >    .dev.info : {
> > -      _sdevice = .;
> > -      *(.dev.info)
> > -      _edevice = .;
> > +     DT_DEV_INFO
> >    } :text
> >  
> > -#ifdef CONFIG_ACPI
> >    . = ALIGN(8);
> >    .adev.info : {
> > -      _asdevice = .;
> > -      *(.adev.info)
> > -      _aedevice = .;
> > +     ADEV_INFO
> >    } :text
> > -#endif
> 
> Why's the #ifdef going away here?
It is incorrect as ADEV_INFO isn't covered by #ifdef anymore. Some
rebasing issue happens... I will fix that in the next patch version.
Thanks.

~ Oleksii