aboutsummaryrefslogtreecommitdiffstats
path: root/common/recipes-bsp
diff options
context:
space:
mode:
authorWade Farnsworth <wfarnsworth@users.noreply.github.com>2019-10-22 08:08:07 -0700
committerGitHub <noreply@github.com>2019-10-22 08:08:07 -0700
commit8e0cf9ee43840bd7ee004412129ba4aa055f5fc8 (patch)
treeb13804093e413307097cd6788ccdc8b062084013 /common/recipes-bsp
parent9e1e1da00d8ef569d83a7a742a734dbbf5e0bd13 (diff)
parent3f8062a03dc1d1d5fa386e1f1ca59d56b86a85d1 (diff)
downloadmeta-amd-master.tar.gz
meta-amd-master.tar.bz2
meta-amd-master.zip
Merge pull request #661 from ArsalanHAwan/master-merge-warriorHEADmaster
master: merge warrior
Diffstat (limited to 'common/recipes-bsp')
-rw-r--r--common/recipes-bsp/alsa-state/alsa-state.bbappend3
-rw-r--r--common/recipes-bsp/alsa-state/alsa-state/asound.conf2
-rw-r--r--common/recipes-bsp/formfactor/formfactor/baldeagle/machconfig3
-rw-r--r--common/recipes-bsp/formfactor/formfactor_0.0.bbappend2
-rw-r--r--common/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch76
-rw-r--r--common/recipes-bsp/grub/grub-efi_2.02.bbappend3
-rw-r--r--common/recipes-bsp/grub/grub_2.02.bbappend2
7 files changed, 0 insertions, 91 deletions
diff --git a/common/recipes-bsp/alsa-state/alsa-state.bbappend b/common/recipes-bsp/alsa-state/alsa-state.bbappend
deleted file mode 100644
index 1f4326b3..00000000
--- a/common/recipes-bsp/alsa-state/alsa-state.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-# Append path to include custom asound.conf
-FILESEXTRAPATHS_prepend_amd := "${THISDIR}/${PN}:"
-
diff --git a/common/recipes-bsp/alsa-state/alsa-state/asound.conf b/common/recipes-bsp/alsa-state/alsa-state/asound.conf
deleted file mode 100644
index f19dbe3c..00000000
--- a/common/recipes-bsp/alsa-state/alsa-state/asound.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-pcm.!default { type pulse }
-ctl.!default { type pulse }
diff --git a/common/recipes-bsp/formfactor/formfactor/baldeagle/machconfig b/common/recipes-bsp/formfactor/formfactor/baldeagle/machconfig
deleted file mode 100644
index 28ca080e..00000000
--- a/common/recipes-bsp/formfactor/formfactor/baldeagle/machconfig
+++ /dev/null
@@ -1,3 +0,0 @@
-# Assume a USB mouse and keyboard are connected
-HAVE_TOUCHSCREEN=n
-HAVE_KEYBOARD=y
diff --git a/common/recipes-bsp/formfactor/formfactor_0.0.bbappend b/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
deleted file mode 100644
index 6d4804d1..00000000
--- a/common/recipes-bsp/formfactor/formfactor_0.0.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/${PN}:"
-
diff --git a/common/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch b/common/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
deleted file mode 100644
index 61d58c40..00000000
--- a/common/recipes-bsp/grub/files/0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch
+++ /dev/null
@@ -1,76 +0,0 @@
-Upstream-Status: Backport
-Signed-off-by: Ross Burton <ross.burton@intel.com>
-
-From 842c390469e2c2e10b5aa36700324cd3bde25875 Mon Sep 17 00:00:00 2001
-From: "H.J. Lu" <hjl.tools@gmail.com>
-Date: Sat, 17 Feb 2018 06:47:28 -0800
-Subject: [PATCH] x86-64: Treat R_X86_64_PLT32 as R_X86_64_PC32
-
-Starting from binutils commit bd7ab16b4537788ad53521c45469a1bdae84ad4a:
-
-https://sourceware.org/git/?p=binutils-gdb.git;a=commit;h=bd7ab16b4537788ad53521c45469a1bdae84ad4a
-
-x86-64 assembler generates R_X86_64_PLT32, instead of R_X86_64_PC32, for
-32-bit PC-relative branches. Grub2 should treat R_X86_64_PLT32 as
-R_X86_64_PC32.
-
-Signed-off-by: H.J. Lu <hjl.tools@gmail.com>
-Reviewed-by: Daniel Kiper <daniel.kiper@oracle.com>
----
- grub-core/efiemu/i386/loadcore64.c | 1 +
- grub-core/kern/x86_64/dl.c | 1 +
- util/grub-mkimagexx.c | 1 +
- util/grub-module-verifier.c | 1 +
- 4 files changed, 4 insertions(+)
-
-diff --git a/grub-core/efiemu/i386/loadcore64.c b/grub-core/efiemu/i386/loadcore64.c
-index e49d0b6ff..18facf47f 100644
---- a/grub-core/efiemu/i386/loadcore64.c
-+++ b/grub-core/efiemu/i386/loadcore64.c
-@@ -98,6 +98,7 @@ grub_arch_efiemu_relocate_symbols64 (grub_efiemu_segment_t segs,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- err = grub_efiemu_write_value (addr,
- *addr32 + rel->r_addend
- + sym.off
-diff --git a/grub-core/kern/x86_64/dl.c b/grub-core/kern/x86_64/dl.c
-index 440690673..3a73e6e6c 100644
---- a/grub-core/kern/x86_64/dl.c
-+++ b/grub-core/kern/x86_64/dl.c
-@@ -70,6 +70,7 @@ grub_arch_dl_relocate_symbols (grub_dl_t mod, void *ehdr,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- {
- grub_int64_t value;
- value = ((grub_int32_t) *addr32) + rel->r_addend + sym->st_value -
-diff --git a/util/grub-mkimagexx.c b/util/grub-mkimagexx.c
-index a2bb05439..39d7efb91 100644
---- a/util/grub-mkimagexx.c
-+++ b/util/grub-mkimagexx.c
-@@ -841,6 +841,7 @@ SUFFIX (relocate_addresses) (Elf_Ehdr *e, Elf_Shdr *sections,
- break;
-
- case R_X86_64_PC32:
-+ case R_X86_64_PLT32:
- {
- grub_uint32_t *t32 = (grub_uint32_t *) target;
- *t32 = grub_host_to_target64 (grub_target_to_host32 (*t32)
-diff --git a/util/grub-module-verifier.c b/util/grub-module-verifier.c
-index 9179285a5..a79271f66 100644
---- a/util/grub-module-verifier.c
-+++ b/util/grub-module-verifier.c
-@@ -19,6 +19,7 @@ struct grub_module_verifier_arch archs[] = {
- -1
- }, (int[]){
- R_X86_64_PC32,
-+ R_X86_64_PLT32,
- -1
- }
- },
---
-2.11.0
-
diff --git a/common/recipes-bsp/grub/grub-efi_2.02.bbappend b/common/recipes-bsp/grub/grub-efi_2.02.bbappend
deleted file mode 100644
index 7be89aa0..00000000
--- a/common/recipes-bsp/grub/grub-efi_2.02.bbappend
+++ /dev/null
@@ -1,3 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append_mel-lite = " file://0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch"
-RDEPENDS_${PN}_class-target_append = " efibootmgr"
diff --git a/common/recipes-bsp/grub/grub_2.02.bbappend b/common/recipes-bsp/grub/grub_2.02.bbappend
deleted file mode 100644
index 9e16ca2e..00000000
--- a/common/recipes-bsp/grub/grub_2.02.bbappend
+++ /dev/null
@@ -1,2 +0,0 @@
-FILESEXTRAPATHS_prepend := "${THISDIR}/files:"
-SRC_URI_append_mel-lite = " file://0001-x86-64-Treat-R_X86_64_PLT32-as-R_X86_64_PC32.patch"