Remove upstreamed patches
Signed-off-by: David Abdurachmanov <david.abdurachmanov@gmail.com>
This commit is contained in:
parent
2fc7774edf
commit
f8612e71c8
File diff suppressed because it is too large
Load Diff
|
@ -21,13 +21,10 @@ Patch1: uefi-use-Fedora-specific-path-name.patch
|
|||
# general fixes
|
||||
Patch2: usb-kbd-fixes.patch
|
||||
Patch3: uefi-distro-load-FDT-from-any-partition-on-boot-device.patch
|
||||
Patch4: uefi-fix-memory-calculation-overflow-on-32-bit-systems.patch
|
||||
Patch5: uefi-Change-FDT-memory-type-from-runtime-data-to-boot-services-data.patch
|
||||
|
||||
# Board fixes and enablement
|
||||
Patch10: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch11: dragonboard-fixes.patch
|
||||
Patch12: ARM-tegra-Add-support-for-framebuffer-carveouts.patch
|
||||
Patch13: ARM-tegra-Miscellaneous-improvements.patch
|
||||
Patch15: net-eth-uclass-Write-MAC-address-to-hardware-after-probe.patch
|
||||
Patch16: net-rtl8169-Implement---hwaddr_write-callback.patch
|
||||
|
|
|
@ -1,54 +0,0 @@
|
|||
From patchwork Fri Apr 12 18:26:28 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot,
|
||||
U-boot] : Change FDT memory type from runtime data to boot services
|
||||
data
|
||||
X-Patchwork-Submitter: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
X-Patchwork-Id: 1084888
|
||||
X-Patchwork-Delegate: xypron.glpk@gmx.de
|
||||
Message-Id: <1555093588-21916-1-git-send-email-ilias.apalodimas@linaro.org>
|
||||
To: u-boot@lists.denx.de,
|
||||
xypron.glpk@gmx.de
|
||||
Cc: Ilias Apalodimas <ilias.apalodimas@linaro.org>, agraf@csgraf.de,
|
||||
ard.biesheuvel@linaro.org
|
||||
Date: Fri, 12 Apr 2019 21:26:28 +0300
|
||||
From: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Following Ard's suggestion:
|
||||
Runtime data sections are intended for data that is used by the runtime
|
||||
services implementation.
|
||||
Let's change the type to EFI_BOOT_SERVICES_DATA
|
||||
|
||||
This also fixes booting of armv7 using efi and fdtcontroladdr
|
||||
|
||||
Suggested-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
---
|
||||
cmd/bootefi.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/cmd/bootefi.c b/cmd/bootefi.c
|
||||
index 3619a20e6433..15ee4af45667 100644
|
||||
--- a/cmd/bootefi.c
|
||||
+++ b/cmd/bootefi.c
|
||||
@@ -111,13 +111,13 @@ static efi_status_t copy_fdt(void **fdtp)
|
||||
new_fdt_addr = (uintptr_t)map_sysmem(fdt_ram_start + 0x7f00000 +
|
||||
fdt_size, 0);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
- EFI_RUNTIME_SERVICES_DATA, fdt_pages,
|
||||
+ EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
/* If we can't put it there, put it somewhere */
|
||||
new_fdt_addr = (ulong)memalign(EFI_PAGE_SIZE, fdt_size);
|
||||
ret = efi_allocate_pages(EFI_ALLOCATE_MAX_ADDRESS,
|
||||
- EFI_RUNTIME_SERVICES_DATA, fdt_pages,
|
||||
+ EFI_BOOT_SERVICES_DATA, fdt_pages,
|
||||
&new_fdt_addr);
|
||||
if (ret != EFI_SUCCESS) {
|
||||
printf("ERROR: Failed to reserve space for FDT\n");
|
|
@ -1,46 +0,0 @@
|
|||
From patchwork Tue Apr 9 20:58:30 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
Subject: [U-Boot] efi: fix memory calculation overflow on 32-bit systems
|
||||
X-Patchwork-Submitter: Patrick Wildt <patrick@blueri.se>
|
||||
X-Patchwork-Id: 1082739
|
||||
X-Patchwork-Delegate: xypron.glpk@gmx.de
|
||||
Message-Id: <20190409205830.GA5818@nyx.fritz.box>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Tue, 9 Apr 2019 22:58:30 +0200
|
||||
From: Patrick Wildt <patrick@blueri.se>
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
|
||||
Hi,
|
||||
|
||||
There are Cubox-i machines out there with nearly 4 GiB of RAM. The
|
||||
RAM starts at 0x10000000 with a size of 0xf0000000. Thus the end
|
||||
of RAM is at 0x100000000. This overflows a 32-bit integer, which
|
||||
should be fine since in the EFI memory code the variables used are
|
||||
all 64-bit with a fixed size. Unfortunately EFI_PAGE_MASK, which is
|
||||
used in the EFI memory code to remove the lower bits, is based on
|
||||
the EFI_PAGE_SIZE macro which, uses 1UL with a shift. This means
|
||||
the resulting mask is UL, which is only 32-bit on ARMv7. Use ULL to
|
||||
make sure that even on 32-bit platforms we use a 64-bit long mask.
|
||||
Without this there will be no memory available in the EFI memory map
|
||||
and bootefi will fail allocating pages.
|
||||
|
||||
Best regards,
|
||||
Patrick
|
||||
Reviewed-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
|
||||
Reviewed-by: Patrick Delaunay <patrick.delaunay@st.com>
|
||||
|
||||
diff --git a/include/efi.h b/include/efi.h
|
||||
index d98441ab19d..3c9d20f8c0b 100644
|
||||
--- a/include/efi.h
|
||||
+++ b/include/efi.h
|
||||
@@ -190,7 +190,7 @@ enum efi_mem_type {
|
||||
#define EFI_MEM_DESC_VERSION 1
|
||||
|
||||
#define EFI_PAGE_SHIFT 12
|
||||
-#define EFI_PAGE_SIZE (1UL << EFI_PAGE_SHIFT)
|
||||
+#define EFI_PAGE_SIZE (1ULL << EFI_PAGE_SHIFT)
|
||||
#define EFI_PAGE_MASK (EFI_PAGE_SIZE - 1)
|
||||
|
||||
struct efi_mem_desc {
|
Loading…
Reference in New Issue