[edk2] EmbeddedPkg: remove nonexistent FLASH_DEFINITION from package .dsc

Message ID 20171130102135.2343-1-leif.lindholm@linaro.org
State New
Headers show
Series
  • [edk2] EmbeddedPkg: remove nonexistent FLASH_DEFINITION from package .dsc
Related show

Commit Message

Leif Lindholm Nov. 30, 2017, 10:21 a.m.
For whatever reason, EmbeddedPkg.dsc included a FLASH_DEFINITION entry
pointing to a nonexistent EmbeddedPkg.fdf.

This used to be silently ignored, but recent BaseTools changes
5e9256cd7f54 ("BaseTools: Guid.xref contain information from FILE statements in FDF")
now caused builds against EmbeddedPkg.dsc to fail.
So delete the redundant entry.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

---
 EmbeddedPkg/EmbeddedPkg.dsc | 1 -
 1 file changed, 1 deletion(-)

-- 
2.11.0

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Comments

Ard Biesheuvel Nov. 30, 2017, 10:22 a.m. | #1
On 30 November 2017 at 10:21, Leif Lindholm <leif.lindholm@linaro.org> wrote:
> For whatever reason, EmbeddedPkg.dsc included a FLASH_DEFINITION entry

> pointing to a nonexistent EmbeddedPkg.fdf.

>

> This used to be silently ignored, but recent BaseTools changes

> 5e9256cd7f54 ("BaseTools: Guid.xref contain information from FILE statements in FDF")

> now caused builds against EmbeddedPkg.dsc to fail.

> So delete the redundant entry.

>

> Contributed-under: TianoCore Contribution Agreement 1.1

> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>


Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


> ---

>  EmbeddedPkg/EmbeddedPkg.dsc | 1 -

>  1 file changed, 1 deletion(-)

>

> diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc

> index 9ec24f7fa8..073a156884 100644

> --- a/EmbeddedPkg/EmbeddedPkg.dsc

> +++ b/EmbeddedPkg/EmbeddedPkg.dsc

> @@ -30,7 +30,6 @@ [Defines]

>    SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64

>    BUILD_TARGETS                  = DEBUG|RELEASE

>    SKUID_IDENTIFIER               = DEFAULT

> -  FLASH_DEFINITION               = EmbeddedPkg/EmbeddedPkg.fdf

>

>

>  ################################################################################

> --

> 2.11.0

>

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Leif Lindholm Nov. 30, 2017, 10:28 a.m. | #2
On Thu, Nov 30, 2017 at 10:22:42AM +0000, Ard Biesheuvel wrote:
> On 30 November 2017 at 10:21, Leif Lindholm <leif.lindholm@linaro.org> wrote:

> > For whatever reason, EmbeddedPkg.dsc included a FLASH_DEFINITION entry

> > pointing to a nonexistent EmbeddedPkg.fdf.

> >

> > This used to be silently ignored, but recent BaseTools changes

> > 5e9256cd7f54 ("BaseTools: Guid.xref contain information from FILE statements in FDF")

> > now caused builds against EmbeddedPkg.dsc to fail.

> > So delete the redundant entry.

> >

> > Contributed-under: TianoCore Contribution Agreement 1.1

> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>

> 

> Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>


Thanks!
Pushed as 97eaeaa199.

> > ---

> >  EmbeddedPkg/EmbeddedPkg.dsc | 1 -

> >  1 file changed, 1 deletion(-)

> >

> > diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc

> > index 9ec24f7fa8..073a156884 100644

> > --- a/EmbeddedPkg/EmbeddedPkg.dsc

> > +++ b/EmbeddedPkg/EmbeddedPkg.dsc

> > @@ -30,7 +30,6 @@ [Defines]

> >    SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64

> >    BUILD_TARGETS                  = DEBUG|RELEASE

> >    SKUID_IDENTIFIER               = DEFAULT

> > -  FLASH_DEFINITION               = EmbeddedPkg/EmbeddedPkg.fdf

> >

> >

> >  ################################################################################

> > --

> > 2.11.0

> >

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patch

diff --git a/EmbeddedPkg/EmbeddedPkg.dsc b/EmbeddedPkg/EmbeddedPkg.dsc
index 9ec24f7fa8..073a156884 100644
--- a/EmbeddedPkg/EmbeddedPkg.dsc
+++ b/EmbeddedPkg/EmbeddedPkg.dsc
@@ -30,7 +30,6 @@  [Defines]
   SUPPORTED_ARCHITECTURES        = IA32|X64|IPF|ARM|AARCH64
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
-  FLASH_DEFINITION               = EmbeddedPkg/EmbeddedPkg.fdf
 
 
 ################################################################################