diff mbox

lib: fwts_arch: i686 arch name is also an X86 arch (LP: #1547554)

Message ID 1455898219-15356-1-git-send-email-colin.king@canonical.com
State Accepted
Headers show

Commit Message

Colin Ian King Feb. 19, 2016, 4:10 p.m. UTC
From: Colin Ian King <colin.king@canonical.com>

i386 platforms fail the rsdp test because the i686 arch is not
recognised in the arch lookup table. Add it.

Signed-off-by: Colin Ian King <colin.king@canonical.com>
---
 src/lib/src/fwts_arch.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Al Stone Feb. 19, 2016, 7:10 p.m. UTC | #1
On 02/19/2016 09:10 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
> 
> i386 platforms fail the rsdp test because the i686 arch is not
> recognised in the arch lookup table. Add it.
> 
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>  src/lib/src/fwts_arch.c | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c
> index f5e8b78..1fe3843 100644
> --- a/src/lib/src/fwts_arch.c
> +++ b/src/lib/src/fwts_arch.c
> @@ -27,6 +27,7 @@ static const struct fwts_arch_info arch_info[] = {
>  	{ FWTS_ARCH_X86, "x86" },
>  	{ FWTS_ARCH_X86, "x86_32" },
>  	{ FWTS_ARCH_X86, "x86_64" },
> +	{ FWTS_ARCH_X86, "i686" },
>  	{ FWTS_ARCH_IA64, "ia64" },
>  	{ FWTS_ARCH_ARM64, "arm64" },
>  	{ FWTS_ARCH_ARM64, "aarch64" },
> 

D'oh.  Nice catch.

Reviewed-by: Al Stone <al.stone@linaro.org>
Alex Hung Feb. 22, 2016, 2:44 a.m. UTC | #2
On 2016-02-20 12:10 AM, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> i386 platforms fail the rsdp test because the i686 arch is not
> recognised in the arch lookup table. Add it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/lib/src/fwts_arch.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c
> index f5e8b78..1fe3843 100644
> --- a/src/lib/src/fwts_arch.c
> +++ b/src/lib/src/fwts_arch.c
> @@ -27,6 +27,7 @@ static const struct fwts_arch_info arch_info[] = {
>   	{ FWTS_ARCH_X86, "x86" },
>   	{ FWTS_ARCH_X86, "x86_32" },
>   	{ FWTS_ARCH_X86, "x86_64" },
> +	{ FWTS_ARCH_X86, "i686" },
>   	{ FWTS_ARCH_IA64, "ia64" },
>   	{ FWTS_ARCH_ARM64, "arm64" },
>   	{ FWTS_ARCH_ARM64, "aarch64" },
>

Acked-by: Alex Hung <alex.hung@canonical.com>
Ivan Hu Feb. 22, 2016, 8:15 a.m. UTC | #3
On 2016年02月20日 00:10, Colin King wrote:
> From: Colin Ian King <colin.king@canonical.com>
>
> i386 platforms fail the rsdp test because the i686 arch is not
> recognised in the arch lookup table. Add it.
>
> Signed-off-by: Colin Ian King <colin.king@canonical.com>
> ---
>   src/lib/src/fwts_arch.c | 1 +
>   1 file changed, 1 insertion(+)
>
> diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c
> index f5e8b78..1fe3843 100644
> --- a/src/lib/src/fwts_arch.c
> +++ b/src/lib/src/fwts_arch.c
> @@ -27,6 +27,7 @@ static const struct fwts_arch_info arch_info[] = {
>   	{ FWTS_ARCH_X86, "x86" },
>   	{ FWTS_ARCH_X86, "x86_32" },
>   	{ FWTS_ARCH_X86, "x86_64" },
> +	{ FWTS_ARCH_X86, "i686" },
>   	{ FWTS_ARCH_IA64, "ia64" },
>   	{ FWTS_ARCH_ARM64, "arm64" },
>   	{ FWTS_ARCH_ARM64, "aarch64" },

Acked-by: Ivan Hu <ivan.hu@canonical.com>
diff mbox

Patch

diff --git a/src/lib/src/fwts_arch.c b/src/lib/src/fwts_arch.c
index f5e8b78..1fe3843 100644
--- a/src/lib/src/fwts_arch.c
+++ b/src/lib/src/fwts_arch.c
@@ -27,6 +27,7 @@  static const struct fwts_arch_info arch_info[] = {
 	{ FWTS_ARCH_X86, "x86" },
 	{ FWTS_ARCH_X86, "x86_32" },
 	{ FWTS_ARCH_X86, "x86_64" },
+	{ FWTS_ARCH_X86, "i686" },
 	{ FWTS_ARCH_IA64, "ia64" },
 	{ FWTS_ARCH_ARM64, "arm64" },
 	{ FWTS_ARCH_ARM64, "aarch64" },