Skip to content
This repository was archived by the owner on Jun 2, 2025. It is now read-only.

Commit e047a87

Browse files
committed
Merge sgx2 into master
Signed-off-by: Huang, Haitao <[email protected]>
2 parents 5d6abcc + 4f5bb63 commit e047a87

File tree

13 files changed

+1801
-32
lines changed

13 files changed

+1801
-32
lines changed

Makefile

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,15 @@ ifneq ($(KERNELRELEASE),)
55
sgx_ioctl.o \
66
sgx_vma.o \
77
sgx_util.o\
8-
sgx_encl.o
8+
sgx_encl.o \
9+
sgx_encl2.o
910
obj-m += isgx.o
1011
else
1112
KDIR := /lib/modules/$(shell uname -r)/build
1213
PWD := $(shell pwd)
1314

1415
default:
15-
$(MAKE) -C $(KDIR) SUBDIRS=$(PWD) modules
16+
$(MAKE) -C $(KDIR) M=$(PWD) modules
1617

1718
install: default
1819
$(MAKE) INSTALL_MOD_DIR=kernel/drivers/intel/sgx -C $(KDIR) M=$(PWD) modules_install

README.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,10 @@ Build and Install the Intel(R) SGX Driver
4444
- Ensure that you have the following required operating systems:
4545
* Ubuntu* 16.04.3 LTS Desktop 64bits
4646
* Ubuntu* 16.04.3 LTS Server 64bits
47+
* Ubuntu* 18.04 LTS Desktop 64bits
48+
* Ubuntu* 18.04 LTS Server 64bits
4749
* Red Hat Enterprise Linux Server release 7.4 64bits
50+
* Red Hat Enterprise Linux Server release 8.0 64bits
4851
* CentOS 7.4.1708 64bits
4952
* SUSE Linux Enterprise Server 12 64bits
5053
- Ensure that you have the following required hardware:
@@ -74,6 +77,10 @@ Build and Install the Intel(R) SGX Driver
7477
$ sudo yum install kernel
7578
$ sudo reboot
7679
```
80+
* On RHEL 8.0 elfutils-libelf-devel package is required:
81+
```
82+
$ sudo yum install elfutils-libelf-devel
83+
```
7784
7885
7986
**Note:** Refer to the *"Intel® SGX Resource Enumeration Leaves"* section in the [Intel SGX Programming reference guide](https://software.intel.com/en-us/articles/intel-sdm) to make sure your cpu has the SGX feature.

0 commit comments

Comments
 (0)