* [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
@ 2018-11-02 10:50 Leif Lindholm
2019-02-04 12:04 ` Leif Lindholm
2019-02-04 12:06 ` Philippe Mathieu-Daudé
0 siblings, 2 replies; 4+ messages in thread
From: Leif Lindholm @ 2018-11-02 10:50 UTC (permalink / raw)
To: edk2-devel; +Cc: Kinney, Michael D, Daryl McDaniel, Jaben Carsey
The WebServer application is not meant to be Ia32/X64 specific, and would
build for other architectures, if it wasn't for the
#include <Register/Msr.h>
in WebServer.h. Move that statement to Mtrr.c instead, which is the only
consumer, and is already being filtered out for other architectures.
Cc: Daryl McDaniel <edk2-lists@mc2research.org>
Cc: Jaben Carsey <jaben.carsey@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
---
Resending only 1/6, since the others got R-b already.
Looking at PageList.c, the app was clearly intended to be portable,
so updated commit message to reflect this.
AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 -
AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 +
2 files changed, 1 insertion(+), 1 deletion(-)
diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
index 21b07b63df..16c30c8d6d 100644
--- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
+++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
@@ -20,7 +20,6 @@
#include <Guid/EventGroup.h>
-#include <Register/Msr.h>
#include <Library/BaseMemoryLib.h>
#include <Library/DebugLib.h>
#include <Library/MemoryAllocationLib.h>
diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
index 54356bde64..4b8482d4e2 100644
--- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
+++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
@@ -15,6 +15,7 @@
#include <WebServer.h>
#include <Library/MtrrLib.h>
+#include <Register/Msr.h>
#define VARIABLE_MTRR_VALID 0x800
--
2.11.0
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
2018-11-02 10:50 [PATCH v2] AppPkg: fix webserver build for !Ia32/X64 Leif Lindholm
@ 2019-02-04 12:04 ` Leif Lindholm
2019-02-04 15:27 ` Carsey, Jaben
2019-02-04 12:06 ` Philippe Mathieu-Daudé
1 sibling, 1 reply; 4+ messages in thread
From: Leif Lindholm @ 2019-02-04 12:04 UTC (permalink / raw)
To: edk2-devel; +Cc: Kinney, Michael D, Daryl McDaniel, Jaben Carsey
Mike, Daryl, Jaben - any comments on v2?
On Fri, Nov 02, 2018 at 10:50:15AM +0000, Leif Lindholm wrote:
> The WebServer application is not meant to be Ia32/X64 specific, and would
> build for other architectures, if it wasn't for the
> #include <Register/Msr.h>
> in WebServer.h. Move that statement to Mtrr.c instead, which is the only
> consumer, and is already being filtered out for other architectures.
>
> Cc: Daryl McDaniel <edk2-lists@mc2research.org>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
>
> Resending only 1/6, since the others got R-b already.
> Looking at PageList.c, the app was clearly intended to be portable,
> so updated commit message to reflect this.
>
> AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 -
> AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> index 21b07b63df..16c30c8d6d 100644
> --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> @@ -20,7 +20,6 @@
>
> #include <Guid/EventGroup.h>
>
> -#include <Register/Msr.h>
> #include <Library/BaseMemoryLib.h>
> #include <Library/DebugLib.h>
> #include <Library/MemoryAllocationLib.h>
> diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> index 54356bde64..4b8482d4e2 100644
> --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> @@ -15,6 +15,7 @@
>
> #include <WebServer.h>
> #include <Library/MtrrLib.h>
> +#include <Register/Msr.h>
>
> #define VARIABLE_MTRR_VALID 0x800
>
> --
> 2.11.0
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
2019-02-04 12:04 ` Leif Lindholm
@ 2019-02-04 15:27 ` Carsey, Jaben
0 siblings, 0 replies; 4+ messages in thread
From: Carsey, Jaben @ 2019-02-04 15:27 UTC (permalink / raw)
To: Leif Lindholm, edk2-devel@lists.01.org; +Cc: Kinney, Michael D, Daryl McDaniel
Leif,
Sorry, I missed this one. Code change here looks good.
Reviewed-by: Jaben Carsey <jaben.carsey@intel.com>
> -----Original Message-----
> From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
> Leif Lindholm
> Sent: Monday, February 04, 2019 4:04 AM
> To: edk2-devel@lists.01.org
> Cc: Kinney, Michael D <michael.d.kinney@intel.com>; Carsey, Jaben
> <jaben.carsey@intel.com>; Daryl McDaniel <edk2-lists@mc2research.org>
> Subject: Re: [edk2] [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
> Importance: High
>
> Mike, Daryl, Jaben - any comments on v2?
>
> On Fri, Nov 02, 2018 at 10:50:15AM +0000, Leif Lindholm wrote:
> > The WebServer application is not meant to be Ia32/X64 specific, and would
> > build for other architectures, if it wasn't for the
> > #include <Register/Msr.h>
> > in WebServer.h. Move that statement to Mtrr.c instead, which is the only
> > consumer, and is already being filtered out for other architectures.
> >
> > Cc: Daryl McDaniel <edk2-lists@mc2research.org>
> > Cc: Jaben Carsey <jaben.carsey@intel.com>
> > Contributed-under: TianoCore Contribution Agreement 1.1
> > Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
> > ---
> >
> > Resending only 1/6, since the others got R-b already.
> > Looking at PageList.c, the app was clearly intended to be portable,
> > so updated commit message to reflect this.
> >
> > AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 -
> > AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 +
> > 2 files changed, 1 insertion(+), 1 deletion(-)
> >
> > diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> > index 21b07b63df..16c30c8d6d 100644
> > --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> > +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> > @@ -20,7 +20,6 @@
> >
> > #include <Guid/EventGroup.h>
> >
> > -#include <Register/Msr.h>
> > #include <Library/BaseMemoryLib.h>
> > #include <Library/DebugLib.h>
> > #include <Library/MemoryAllocationLib.h>
> > diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> > index 54356bde64..4b8482d4e2 100644
> > --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> > +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> > @@ -15,6 +15,7 @@
> >
> > #include <WebServer.h>
> > #include <Library/MtrrLib.h>
> > +#include <Register/Msr.h>
> >
> > #define VARIABLE_MTRR_VALID 0x800
> >
> > --
> > 2.11.0
> >
> _______________________________________________
> edk2-devel mailing list
> edk2-devel@lists.01.org
> https://lists.01.org/mailman/listinfo/edk2-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] AppPkg: fix webserver build for !Ia32/X64
2018-11-02 10:50 [PATCH v2] AppPkg: fix webserver build for !Ia32/X64 Leif Lindholm
2019-02-04 12:04 ` Leif Lindholm
@ 2019-02-04 12:06 ` Philippe Mathieu-Daudé
1 sibling, 0 replies; 4+ messages in thread
From: Philippe Mathieu-Daudé @ 2019-02-04 12:06 UTC (permalink / raw)
To: Leif Lindholm, edk2-devel; +Cc: Kinney, Michael D, Jaben Carsey, Daryl McDaniel
On 11/2/18 11:50 AM, Leif Lindholm wrote:
> The WebServer application is not meant to be Ia32/X64 specific, and would
> build for other architectures, if it wasn't for the
> #include <Register/Msr.h>
> in WebServer.h. Move that statement to Mtrr.c instead, which is the only
> consumer, and is already being filtered out for other architectures.
>
> Cc: Daryl McDaniel <edk2-lists@mc2research.org>
> Cc: Jaben Carsey <jaben.carsey@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
> ---
>
> Resending only 1/6, since the others got R-b already.
> Looking at PageList.c, the app was clearly intended to be portable,
> so updated commit message to reflect this.
>
> AppPkg/Applications/Sockets/WebServer/WebServer.h | 1 -
> AppPkg/Applications/Sockets/WebServer/Mtrr.c | 1 +
> 2 files changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/AppPkg/Applications/Sockets/WebServer/WebServer.h b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> index 21b07b63df..16c30c8d6d 100644
> --- a/AppPkg/Applications/Sockets/WebServer/WebServer.h
> +++ b/AppPkg/Applications/Sockets/WebServer/WebServer.h
> @@ -20,7 +20,6 @@
>
> #include <Guid/EventGroup.h>
>
> -#include <Register/Msr.h>
> #include <Library/BaseMemoryLib.h>
> #include <Library/DebugLib.h>
> #include <Library/MemoryAllocationLib.h>
> diff --git a/AppPkg/Applications/Sockets/WebServer/Mtrr.c b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> index 54356bde64..4b8482d4e2 100644
> --- a/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> +++ b/AppPkg/Applications/Sockets/WebServer/Mtrr.c
> @@ -15,6 +15,7 @@
>
> #include <WebServer.h>
> #include <Library/MtrrLib.h>
> +#include <Register/Msr.h>
>
> #define VARIABLE_MTRR_VALID 0x800
>
>
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-04 15:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-11-02 10:50 [PATCH v2] AppPkg: fix webserver build for !Ia32/X64 Leif Lindholm
2019-02-04 12:04 ` Leif Lindholm
2019-02-04 15:27 ` Carsey, Jaben
2019-02-04 12:06 ` Philippe Mathieu-Daudé
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox