From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: multipart/mixed; boundary="===============7169640088395914941==" MIME-Version: 1.0 From: Ricardo Neri Subject: [PATCH 2/9] chipsec: update support for 32-bit Date: Fri, 10 Mar 2017 15:36:14 -0800 Message-ID: <1489188981-23886-3-git-send-email-ricardo.neri-calderon@linux.intel.com> In-Reply-To: <1489188981-23886-1-git-send-email-ricardo.neri-calderon@linux.intel.com> List-Id: To: chipsec@lists.01.org --===============7169640088395914941== Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Most of the fixes we carry have been taken upstream. Update our recipe accordingly to remove what has been updated in v1.2.5. Cc: Megha Dey Signed-off-by: Ricardo Neri --- .../0001-chipsec-building-for-32-bit-systems.patch | 49 ++++++------------= ---- 1 file changed, 13 insertions(+), 36 deletions(-) diff --git a/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-building-fo= r-32-bit-systems.patch b/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec= -building-for-32-bit-systems.patch index 93ddd5f..601d3f0 100644 --- a/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-building-for-32-bi= t-systems.patch +++ b/meta-luv/recipes-core/chipsec/chipsec/0001-chipsec-building-for-32-bi= t-systems.patch @@ -8,43 +8,20 @@ architectures. = Signed-off-by: Megha Dey --- - source/drivers/linux/Makefile | 2 +- - source/drivers/linux/chipsec_km.c | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + drivers/linux/chipsec_km.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) = -diff --git a/source/drivers/linux/Makefile b/source/drivers/linux/Makefile -index 4342977..bdc0acc 100644 ---- a/source/drivers/linux/Makefile -+++ b/source/drivers/linux/Makefile -@@ -10,7 +10,7 @@ VERSION=3D - #ifeq ($(shell uname -m),x86_64) - ifeq ($(ARCH),i386) - obj-m +=3D chipsec.o --chipsec-objs :=3D chipsec_ko.o i386/cpu.o -+chipsec-objs :=3D chipsec_km.o i386/cpu.o - all: clean chipsec32 - else - obj-m +=3D chipsec.o -diff --git a/source/drivers/linux/chipsec_km.c b/source/drivers/linux/chip= sec_km.c -index e76f6a9..a9080ec 100644 ---- a/source/drivers/linux/chipsec_km.c -+++ b/source/drivers/linux/chipsec_km.c -@@ -946,7 +946,7 @@ static long d_ioctl(struct file *file, unsigned int io= ctl_num, unsigned long ioc - #ifdef __x86_64__ - ptr[1] =3D (uint32_t)(dtr.base >> 32); - #else -- ptr[1] =3D 0 -+ ptr[1] =3D 0; - #endif - ptr[2] =3D (uint32_t)dtr.base; - = -@@ -1368,8 +1368,8 @@ static long d_ioctl(struct file *file, unsigned int = ioctl_num, unsigned long ioc - first =3D ioread32(ioaddr); - second =3D ioread32( ioaddr + 4 ); - ptr[0] =3D first | (second << 32); -- break; - #endif -+ break; +diff --git a/drivers/linux/chipsec_km.c b/drivers/linux/chipsec_km.c +index 60e1247..4f993f6 100644 +--- a/drivers/linux/chipsec_km.c ++++ b/drivers/linux/chipsec_km.c +@@ -1437,8 +1437,8 @@ static long d_ioctl(struct file *file, unsigned int = ioctl_num, unsigned long ioc + first =3D ioread32(ioaddr); + second =3D ioread32( ioaddr + 4 ); + ptr[0] =3D first | (second << 32); +- break; + #endif ++ break; } = my_unxlate_dev_mem_ptr(addr, ioaddr); -- = 2.7.4 --===============7169640088395914941==--