Linux v4.3-1107-g66ef349
This commit is contained in:
		
							parent
							
								
									8682d00a0e
								
							
						
					
					
						commit
						7c1bce7100
					
				| @ -1,4 +1,4 @@ | ||||
| From 34e3e23e08fdccbf4637deab0cf03070d4f2226d Mon Sep 17 00:00:00 2001 | ||||
| From 47f6b5c281137394d627e275cb80980492d00d84 Mon Sep 17 00:00:00 2001 | ||||
| From: Dave Howells <dhowells@redhat.com> | ||||
| Date: Tue, 23 Oct 2012 09:30:54 -0400 | ||||
| Subject: [PATCH 15/20] Add EFI signature data types | ||||
| @ -15,12 +15,12 @@ Signed-off-by: David Howells <dhowells@redhat.com> | ||||
|  1 file changed, 20 insertions(+) | ||||
| 
 | ||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||
| index de3e45088d4a..fac43c611614 100644
 | ||||
| index 4dc970e..82d6218 100644
 | ||||
| --- a/include/linux/efi.h
 | ||||
| +++ b/include/linux/efi.h
 | ||||
| @@ -595,6 +595,12 @@ void efi_native_runtime_setup(void);
 | ||||
|  #define DEVICE_TREE_GUID \ | ||||
|      EFI_GUID(  0xb1b621d5, 0xf19c, 0x41a5, 0x83, 0x0b, 0xd9, 0x15, 0x2c, 0x69, 0xaa, 0xe0 ) | ||||
| @@ -599,6 +599,12 @@ void efi_native_runtime_setup(void);
 | ||||
|  #define EFI_PROPERTIES_TABLE_GUID \ | ||||
|      EFI_GUID(  0x880aaca3, 0x4adc, 0x4a04, 0x90, 0x79, 0xb7, 0x47, 0x34, 0x08, 0x25, 0xe5 ) | ||||
|   | ||||
| +#define EFI_CERT_SHA256_GUID \
 | ||||
| +    EFI_GUID(  0xc1c41626, 0x504c, 0x4092, 0xac, 0xa9, 0x41, 0xf9, 0x36, 0x93, 0x43, 0x28 )
 | ||||
| @ -31,7 +31,7 @@ index de3e45088d4a..fac43c611614 100644 | ||||
|  typedef struct { | ||||
|  	efi_guid_t guid; | ||||
|  	u64 table; | ||||
| @@ -810,6 +816,20 @@ typedef struct _efi_file_io_interface {
 | ||||
| @@ -823,6 +829,20 @@ typedef struct {
 | ||||
|   | ||||
|  #define EFI_INVALID_TABLE_ADDR		(~0UL) | ||||
|   | ||||
| @ -53,5 +53,5 @@ index de3e45088d4a..fac43c611614 100644 | ||||
|   * All runtime access to EFI goes through this structure: | ||||
|   */ | ||||
| -- 
 | ||||
| 2.4.3 | ||||
| 2.5.0 | ||||
| 
 | ||||
|  | ||||
| @ -30,6 +30,8 @@ CONFIG_ARM64_ERRATUM_824069=y | ||||
| CONFIG_ARM64_ERRATUM_819472=y | ||||
| CONFIG_ARM64_ERRATUM_832075=y | ||||
| CONFIG_ARM64_ERRATUM_843419=y | ||||
| CONFIG_CAVIUM_ERRATUM_22375=y | ||||
| CONFIG_CAVIUM_ERRATUM_23154=y | ||||
| 
 | ||||
| # AMBA / VExpress | ||||
| # CONFIG_RTC_DRV_PL030 is not set | ||||
|  | ||||
| @ -50,6 +50,7 @@ CONFIG_EFI_PCDP=y | ||||
| CONFIG_FB_EFI=y | ||||
| CONFIG_EARLY_PRINTK_EFI=y | ||||
| CONFIG_EFI_RUNTIME_MAP=y | ||||
| # CONFIG_EFI_FAKE_MEMMAP is not set | ||||
| # needs FB_SIMPLE to work correctly | ||||
| # CONFIG_X86_SYSFB is not set | ||||
| 
 | ||||
| @ -72,6 +73,7 @@ CONFIG_MMIOTRACE=y | ||||
| # CONFIG_MMIOTRACE_TEST is not set | ||||
| # CONFIG_DEBUG_PER_CPU_MAPS is not set | ||||
| CONFIG_DEBUG_RODATA=y | ||||
| CONFIG_DEBUG_WX=y | ||||
| CONFIG_DEBUG_STACKOVERFLOW=y | ||||
| 
 | ||||
| CONFIG_ACPI=y | ||||
|  | ||||
| @ -1,4 +1,4 @@ | ||||
| From b4467813ec088c13bd8c9f1eafb7c29d889d7c8f Mon Sep 17 00:00:00 2001 | ||||
| From c01ff700ea4192ae04b306fef725d62189550236 Mon Sep 17 00:00:00 2001 | ||||
| From: Josh Boyer <jwboyer@fedoraproject.org> | ||||
| Date: Tue, 27 Aug 2013 13:33:03 -0400 | ||||
| Subject: [PATCH 13/20] efi: Add EFI_SECURE_BOOT bit | ||||
| @ -13,10 +13,10 @@ Signed-off-by: Josh Boyer <jwboyer@fedoraproject.org> | ||||
|  2 files changed, 3 insertions(+) | ||||
| 
 | ||||
| diff --git a/arch/x86/kernel/setup.c b/arch/x86/kernel/setup.c
 | ||||
| index 1ac118146e90..f93826b8522c 100644
 | ||||
| index f3b804f..a401ff8 100644
 | ||||
| --- a/arch/x86/kernel/setup.c
 | ||||
| +++ b/arch/x86/kernel/setup.c
 | ||||
| @@ -1137,7 +1137,9 @@ void __init setup_arch(char **cmdline_p)
 | ||||
| @@ -1145,7 +1145,9 @@ void __init setup_arch(char **cmdline_p)
 | ||||
|   | ||||
|  #ifdef CONFIG_EFI_SECURE_BOOT_SIG_ENFORCE | ||||
|  	if (boot_params.secure_boot) { | ||||
| @ -27,17 +27,17 @@ index 1ac118146e90..f93826b8522c 100644 | ||||
|  #endif | ||||
|   | ||||
| diff --git a/include/linux/efi.h b/include/linux/efi.h
 | ||||
| index 85ef051ac6fb..de3e45088d4a 100644
 | ||||
| index 569b5a8..4dc970e 100644
 | ||||
| --- a/include/linux/efi.h
 | ||||
| +++ b/include/linux/efi.h
 | ||||
| @@ -959,6 +959,7 @@ extern int __init efi_setup_pcdp_console(char *);
 | ||||
|  #define EFI_PARAVIRT		6	/* Access is via a paravirt interface */ | ||||
| @@ -980,6 +980,7 @@ extern int __init efi_setup_pcdp_console(char *);
 | ||||
|  #define EFI_ARCH_1		7	/* First arch-specific bit */ | ||||
|  #define EFI_DBG			8	/* Print additional debug info at runtime */ | ||||
| +#define EFI_SECURE_BOOT		9	/* Are we in Secure Boot mode? */
 | ||||
|  #define EFI_NX_PE_DATA		9	/* Can runtime data regions be mapped non-executable? */ | ||||
| +#define EFI_SECURE_BOOT		10	/* Are we in Secure Boot mode? */
 | ||||
|   | ||||
|  #ifdef CONFIG_EFI | ||||
|  /* | ||||
| -- 
 | ||||
| 2.4.3 | ||||
| 2.5.0 | ||||
| 
 | ||||
|  | ||||
							
								
								
									
										2
									
								
								gitrev
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								gitrev
									
									
									
									
									
								
							| @ -1 +1 @@ | ||||
| 5062ecdb662bf3aed6dc975019c53ffcd3b01d1c | ||||
| 66ef3493d4bb387f5a83915e33dc893102fd1b43 | ||||
|  | ||||
| @ -67,7 +67,7 @@ Summary: The Linux kernel | ||||
| # The rc snapshot level | ||||
| %define rcrev 0 | ||||
| # The git snapshot level | ||||
| %define gitrev 1 | ||||
| %define gitrev 2 | ||||
| # Set rpm version accordingly | ||||
| %define rpmversion 4.%{upstream_sublevel}.0 | ||||
| %endif | ||||
| @ -2042,6 +2042,9 @@ fi | ||||
| # | ||||
| #  | ||||
| %changelog | ||||
| * Wed Nov 04 2015 Laura Abbott <labbott@redhat.com> - 4.4.0-0.rc0.git2.1 | ||||
| - Linux v4.3-1107-g66ef349 | ||||
| 
 | ||||
| * Wed Nov  4 2015 Peter Robinson <pbrobinson@fedoraproject.org> | ||||
| - Minor ARMv7 config updates | ||||
| 
 | ||||
|  | ||||
		Loading…
	
		Reference in New Issue
	
	Block a user