[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[Andy Shevchenko]

The commit

  f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file in C)")

in ACPICA project changed a template of the a of variable that is used
in the generated C-file. Now, instead of hard coded "AmlCode" the
"%s_aml_code" is in use, where the prefix is a lowered case base name of
the output file. In our case it will be "dsdt" producing a name as
"dsdt_aml_code".

The quick solution is to call sed which replaces new name by the old one
to keep compatibility with old version of iASL.

The long term solution would be to modify code to use the new name
because it more scalable.

Cc: Robert Moore <robert.moore@intel.com>
Cc: Sami Mujawar <sami.mujawar@arm.com>
Cc: Evan Lloyd <evan.lloyd@arm.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 scripts/Makefile.lib | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index f9809ce7ce..b5cf7e5427 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -416,6 +416,7 @@ cmd_acpi_c_asl=         \
 
 $(obj)/dsdt.c:    $(src)/dsdt.asl
 	$(call cmd,acpi_c_asl)
+	$(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@
 
 # Bzip2
 # ---------------------------------------------------------------------------
-- 
2.17.0

[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[Bin Meng]

Hi Andy,

On Wed, May 23, 2018 at 5:38 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> The commit
>
>   f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file in C)")
>
> in ACPICA project changed a template of the a of variable that is used

a template of the a of variable? Cannot understand this.

> in the generated C-file. Now, instead of hard coded "AmlCode" the
> "%s_aml_code" is in use, where the prefix is a lowered case base name of
> the output file. In our case it will be "dsdt" producing a name as
> "dsdt_aml_code".
>
> The quick solution is to call sed which replaces new name by the old one
> to keep compatibility with old version of iASL.
>
> The long term solution would be to modify code to use the new name
> because it more scalable.

it *is* more scalable.

>
> Cc: Robert Moore <robert.moore@intel.com>
> Cc: Sami Mujawar <sami.mujawar@arm.com>
> Cc: Evan Lloyd <evan.lloyd@arm.com>
> Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> ---
>  scripts/Makefile.lib | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> index f9809ce7ce..b5cf7e5427 100644
> --- a/scripts/Makefile.lib
> +++ b/scripts/Makefile.lib
> @@ -416,6 +416,7 @@ cmd_acpi_c_asl=         \
>
>  $(obj)/dsdt.c:    $(src)/dsdt.asl
>         $(call cmd,acpi_c_asl)
> +       $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@
>
>  # Bzip2
>  # ---------------------------------------------------------------------------
> --

Otherwise,
Reviewed-by: Bin Meng <bmeng.cn@gmail.com>

Regards,
Bin

[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[Andy Shevchenko]

On Wed, 2018-05-23 at 18:22 +0800, Bin Meng wrote:
> Hi Andy,
> 
> On Wed, May 23, 2018 at 5:38 PM, Andy Shevchenko
> <andriy.shevchenko@linux.intel.com> wrote:
> > The commit
> > 
> >   f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file
> > in C)")
> > 
> > in ACPICA project changed a template of the a of variable that is
> > used
> 
> a template of the a of variable? Cannot understand this.

"a template of the variable"

> 
> > in the generated C-file. Now, instead of hard coded "AmlCode" the
> > "%s_aml_code" is in use, where the prefix is a lowered case base
> > name of
> > the output file. In our case it will be "dsdt" producing a name as
> > "dsdt_aml_code".
> > 
> > The quick solution is to call sed which replaces new name by the old
> > one
> > to keep compatibility with old version of iASL.
> > 
> > The long term solution would be to modify code to use the new name
> > because it more scalable.
> 
> it *is* more scalable.

Yes, thanks.

> 
> > 
> > Cc: Robert Moore <robert.moore@intel.com>
> > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > Cc: Evan Lloyd <evan.lloyd@arm.com>
> > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > ---
> >  scripts/Makefile.lib | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
> > index f9809ce7ce..b5cf7e5427 100644
> > --- a/scripts/Makefile.lib
> > +++ b/scripts/Makefile.lib
> > @@ -416,6 +416,7 @@ cmd_acpi_c_asl=         \
> > 
> >  $(obj)/dsdt.c:    $(src)/dsdt.asl
> >         $(call cmd,acpi_c_asl)
> > +       $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@
> > 
> >  # Bzip2
> >  # ---------------------------------------------------------------
> > ------------
> > --
> 
> Otherwise,
> Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> 
> Regards,
> Bin

-- 
Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Intel Finland Oy

[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[Moore, Robert]

> -----Original Message-----
> From: Andy Shevchenko [mailto:andriy.shevchenko at linux.intel.com]
> Sent: Wednesday, May 23, 2018 3:30 AM
> To: Bin Meng <bmeng.cn@gmail.com>
> Cc: Simon Glass <sjg@chromium.org>; U-Boot Mailing List <u-
> boot at lists.denx.de>; Moore, Robert <robert.moore@intel.com>; Sami
> Mujawar <sami.mujawar@arm.com>; Evan Lloyd <evan.lloyd@arm.com>
> Subject: Re: [PATCH v1] x86: acpi: Adopt new version of iASL compiler
> 
> On Wed, 2018-05-23 at 18:22 +0800, Bin Meng wrote:
> > Hi Andy,
> >
> > On Wed, May 23, 2018 at 5:38 PM, Andy Shevchenko
> > <andriy.shevchenko@linux.intel.com> wrote:
> > > The commit
> > >
> > >   f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file
> > > in C)")
> > >
[Moore, Robert] 

This change was requested by a customer, and it seemed quite reasonable to us. Sorry for any inconvenience.

Bob





> > > in ACPICA project changed a template of the a of variable that is
> > > used
> >
> > a template of the a of variable? Cannot understand this.
> 
> "a template of the variable"
> 
> >
> > > in the generated C-file. Now, instead of hard coded "AmlCode" the
> > > "%s_aml_code" is in use, where the prefix is a lowered case base
> > > name of the output file. In our case it will be "dsdt" producing a
> > > name as "dsdt_aml_code".
> > >
> > > The quick solution is to call sed which replaces new name by the old
> > > one to keep compatibility with old version of iASL.
> > >
> > > The long term solution would be to modify code to use the new name
> > > because it more scalable.
> >
> > it *is* more scalable.
> 
> Yes, thanks.
> 
> >
> > >
> > > Cc: Robert Moore <robert.moore@intel.com>
> > > Cc: Sami Mujawar <sami.mujawar@arm.com>
> > > Cc: Evan Lloyd <evan.lloyd@arm.com>
> > > Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> > > ---
> > >  scripts/Makefile.lib | 1 +
> > >  1 file changed, 1 insertion(+)
> > >
> > > diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index
> > > f9809ce7ce..b5cf7e5427 100644
> > > --- a/scripts/Makefile.lib
> > > +++ b/scripts/Makefile.lib
> > > @@ -416,6 +416,7 @@ cmd_acpi_c_asl=         \
> > >
> > >  $(obj)/dsdt.c:    $(src)/dsdt.asl
> > >         $(call cmd,acpi_c_asl)
> > > +       $(Q)sed -i -e "s,dsdt_aml_code,AmlCode," $@
> > >
> > >  # Bzip2
> > >  # ---------------------------------------------------------------
> > > ------------
> > > --
> >
> > Otherwise,
> > Reviewed-by: Bin Meng <bmeng.cn@gmail.com>
> >
> > Regards,
> > Bin
> 
> --
> Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Intel Finland Oy

[U-Boot] [PATCH v1] x86: acpi: Adopt new version of iASL compiler

[Bin Meng]

On Wed, May 23, 2018 at 6:29 PM, Andy Shevchenko
<andriy.shevchenko@linux.intel.com> wrote:
> On Wed, 2018-05-23 at 18:22 +0800, Bin Meng wrote:
>> Hi Andy,
>>
>> On Wed, May 23, 2018 at 5:38 PM, Andy Shevchenko
>> <andriy.shevchenko@linux.intel.com> wrote:
>> > The commit
>> >
>> >   f9a88a4c1cd0 ("iASL: Enhance the -tc option (create AML hex file
>> > in C)")
>> >
>> > in ACPICA project changed a template of the a of variable that is
>> > used
>>
>> a template of the a of variable? Cannot understand this.
>
> "a template of the variable"
>

Fixed this in the commit message

>>
>> > in the generated C-file. Now, instead of hard coded "AmlCode" the
>> > "%s_aml_code" is in use, where the prefix is a lowered case base
>> > name of
>> > the output file. In our case it will be "dsdt" producing a name as
>> > "dsdt_aml_code".
>> >
>> > The quick solution is to call sed which replaces new name by the old
>> > one
>> > to keep compatibility with old version of iASL.
>> >
>> > The long term solution would be to modify code to use the new name
>> > because it more scalable.
>>
>> it *is* more scalable.
>
> Yes, thanks.
>

and here, and

applied to u-boot-x86, thanks!