diff --git a/.checkpackageignore b/.checkpackageignore index a6cc58c448..c18cc4d417 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -71,8 +71,6 @@ board/pine64/rock64/patches/uboot/0001-Makefile-rk3328-needs-itb-image-to-boot-p board/pine64/rock64/post-build.sh Shellcheck board/pine64/rockpro64/post-build.sh Shellcheck board/qemu/aarch64-sbsa/assemble-flash-images Shellcheck -board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream -board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch Upstream board/qemu/x86/post-build.sh Shellcheck board/qemu/x86_64/post-build.sh Shellcheck board/radxa/rockpi-n8/post-build.sh Shellcheck diff --git a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch b/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch deleted file mode 100644 index eb3859f858..0000000000 --- a/board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch +++ /dev/null @@ -1,34 +0,0 @@ -From e96b73478232aa42b773cd19371808af69fd4b95 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Sat, 25 Apr 2020 09:49:11 +0200 -Subject: [PATCH] net: xilinx: xemaclite: add 2.00.b revision - -Patch added for the kernel 3.14 -- fix networking in Qemu using a small patch -- disable DTS, because linux.bin does not include any DTB the - default Qemu included DTB is used and this is okay and works fine - -https://git.buildroot.net/buildroot/commit/board/qemu/microblazebe-mmu/xilinx-xemaclite.patch?id=fa2798548368d51998fad18d7f6d1ae0ed065b33 - -[Romain: convert to git format] -Signed-off-by: Romain Naour -Cc: Waldemar Brodkorb ---- - drivers/net/ethernet/xilinx/xilinx_emaclite.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/drivers/net/ethernet/xilinx/xilinx_emaclite.c b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -index 0de52e70abcc..d8c13140ca77 100644 ---- a/drivers/net/ethernet/xilinx/xilinx_emaclite.c -+++ b/drivers/net/ethernet/xilinx/xilinx_emaclite.c -@@ -1278,6 +1278,7 @@ static const struct of_device_id xemaclite_of_match[] = { - { .compatible = "xlnx,opb-ethernetlite-1.01.b", }, - { .compatible = "xlnx,xps-ethernetlite-1.00.a", }, - { .compatible = "xlnx,xps-ethernetlite-2.00.a", }, -+ { .compatible = "xlnx,xps-ethernetlite-2.00.b", }, - { .compatible = "xlnx,xps-ethernetlite-2.01.a", }, - { .compatible = "xlnx,xps-ethernetlite-3.00.a", }, - { /* end of list */ }, --- -2.25.3 - diff --git a/configs/qemu_microblazebe_mmu_defconfig b/configs/qemu_microblazebe_mmu_defconfig index e02b8dae2f..a93ef3564d 100644 --- a/configs/qemu_microblazebe_mmu_defconfig +++ b/configs/qemu_microblazebe_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazebe-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazebe-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y diff --git a/configs/qemu_microblazeel_mmu_defconfig b/configs/qemu_microblazeel_mmu_defconfig index 146bbb67de..0b00b58b4e 100644 --- a/configs/qemu_microblazeel_mmu_defconfig +++ b/configs/qemu_microblazeel_mmu_defconfig @@ -24,7 +24,6 @@ BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="6.1.44" BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/qemu/microblazeel-mmu/linux.config" BR2_LINUX_KERNEL_LINUX_BIN=y -BR2_LINUX_KERNEL_PATCH="board/qemu/microblazeel-mmu/0001-net-xilinx-xemaclite-add-2.00.b-revision.patch" # host-qemu for gitlab testing BR2_PACKAGE_HOST_QEMU=y