From 3fe3531f4762be74fd0b1ca7b39eeef8ccf8a17a Mon Sep 17 00:00:00 2001 From: Anton Bambura Date: Tue, 1 Aug 2023 00:17:55 +0300 Subject: [PATCH] u-boot-nyan-2gb: drop in favor of depthcharge (MR 4294) --- device/testing/u-boot-nyan-2gb/APKBUILD | 59 ------------------- .../u-boot-nyan-2gb/chromebook_nyan.its | 42 ------------- .../testing/u-boot-nyan-2gb/fix-stdin.patch | 15 ----- .../u-boot-nyan-2gb/spectre-mitigation.patch | 11 ---- 4 files changed, 127 deletions(-) delete mode 100644 device/testing/u-boot-nyan-2gb/APKBUILD delete mode 100644 device/testing/u-boot-nyan-2gb/chromebook_nyan.its delete mode 100644 device/testing/u-boot-nyan-2gb/fix-stdin.patch delete mode 100644 device/testing/u-boot-nyan-2gb/spectre-mitigation.patch diff --git a/device/testing/u-boot-nyan-2gb/APKBUILD b/device/testing/u-boot-nyan-2gb/APKBUILD deleted file mode 100644 index 09a0889a8..000000000 --- a/device/testing/u-boot-nyan-2gb/APKBUILD +++ /dev/null @@ -1,59 +0,0 @@ -# Maintainer: Jenneron -# Co-Maintainer: Segfault -pkgname=u-boot-nyan-2gb -pkgver=2022.04 -pkgrel=0 -pkgdesc="U-Boot for Nyan Chromebooks" -url="https://www.denx.de/wiki/U-Boot/" -arch="armv7" -license="GPL-2.0-or-later OFL-1.1 BSD-2-Clause BSD-3-Clause eCos-2.0 IBM-pibs - ISC LGPL-2.0-only LGPL-2.1-only X11" -options="!check" # no tests in upstream -makedepends="$depends_dev bc dtc python3-dev swig bison flex openssl-dev - py3-setuptools linux-headers u-boot-tools vboot-utils" -source=" - https://ftp.denx.de/pub/u-boot/u-boot-${pkgver//_/-}.tar.bz2 - fix-stdin.patch - spectre-mitigation.patch - chromebook_nyan.its -" - -builddir="$srcdir"/u-boot-${pkgver//_/-} - -prepare() { - default_prepare -} - -build() { - make nyan-big_defconfig - make - - cp "$srcdir"/chromebook_nyan.its ./ - mkimage -f chromebook_nyan.its u-boot-dtb.img - - echo -e "\n" > dummy_config - echo -e "\n" > dummy_bootloader - - vbutil_kernel \ - --pack u-boot-dtb.img.kpart \ - --keyblock /usr/share/vboot/devkeys/kernel.keyblock \ - --signprivate /usr/share/vboot/devkeys/kernel_data_key.vbprivk \ - --version 1 \ - --arch arm \ - --config dummy_config \ - --bootloader dummy_bootloader \ - --vmlinuz u-boot-dtb.img -} - -package() { - install -D -m644 "$builddir"/u-boot-dtb.img.kpart \ - "$pkgdir"/usr/share/u-boot/google-nyan-big/u-boot-dtb.img.kpart - ln -s google-nyan-big "$pkgdir"/usr/share/u-boot/google-nyan-blaze -} - -sha512sums=" -113056e542db049eea3b1d1ccbbe52c79539a2f9bb6129d284ec9200dcffec7bd5969821913a9899631575b80991c84ad01bc845b4bba614e42e54466d9f0d64 u-boot-2022.04.tar.bz2 -188f0ac86e2b180c006e31860e1518fde61f393152d94923e9d9d96eeb826c0af0c95ebe9b3a832161181dc0f8d998e203e82317f938e205bfe006012221bfe4 fix-stdin.patch -4e9d167400b3821e9a5cbf189e96cbcb87a960ce8fe7e3f4ee66d764bcd863a626819ebdd4d368247b44d9d0360f8cf3facb194e31634ca3be188ab696e37229 spectre-mitigation.patch -814153b0a0d6c63bff52d5f8e632f7a6083e0aa486dbcbb0c15e4edd570381a7ab2b7ef501bc35c74fee738e60534a501c8e06047cf1ef52af1ad1f3cf2e2b46 chromebook_nyan.its -" diff --git a/device/testing/u-boot-nyan-2gb/chromebook_nyan.its b/device/testing/u-boot-nyan-2gb/chromebook_nyan.its deleted file mode 100644 index 511347c03..000000000 --- a/device/testing/u-boot-nyan-2gb/chromebook_nyan.its +++ /dev/null @@ -1,42 +0,0 @@ -/dts-v1/; - -/ { - description = "U-Boot mainline"; - #address-cells = <1>; - - images { - kernel { - description = "U-Boot mainline "; - type = "kernel_noload"; - arch = "arm"; - os = "linux"; - data = /incbin/("./u-boot.bin"); - compression = "none"; - load = <0>; - entry = <0>; - hash-2 { - algo = "sha1"; - }; - }; - - fdt-1{ - description = "tegra124-nyan-big.dtb"; - data = /incbin/("./u-boot.dtb"); - type = "flat_dt"; - arch = "arm"; - compression = "none"; - hash-1{ - algo = "sha1"; - }; - }; - }; - - configurations { - default = "config-1"; - config-1 { - description = "Boot U-Boot"; - kernel = "kernel"; - fdt = "fdt-1"; - }; - }; -}; diff --git a/device/testing/u-boot-nyan-2gb/fix-stdin.patch b/device/testing/u-boot-nyan-2gb/fix-stdin.patch deleted file mode 100644 index 80bc00a3a..000000000 --- a/device/testing/u-boot-nyan-2gb/fix-stdin.patch +++ /dev/null @@ -1,15 +0,0 @@ -From: hexdump - -diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h -index e54428ba43..ea9d5feb51 100644 ---- a/include/configs/tegra-common-post.h -+++ b/include/configs/tegra-common-post.h -@@ -64,7 +64,7 @@ - #endif - - #define TEGRA_DEVICE_SETTINGS \ -- "stdin=serial" STDIN_KBD_KBC STDIN_KBD_USB STDOUT_CROS_EC "\0" \ -+ "stdin=cros-ec-keyb" "\0" \ - "stdout=serial" STDOUT_LCD STDOUT_VIDEO "\0" \ - "stderr=serial" STDOUT_LCD STDOUT_VIDEO "\0" \ - "" diff --git a/device/testing/u-boot-nyan-2gb/spectre-mitigation.patch b/device/testing/u-boot-nyan-2gb/spectre-mitigation.patch deleted file mode 100644 index 03bc095bd..000000000 --- a/device/testing/u-boot-nyan-2gb/spectre-mitigation.patch +++ /dev/null @@ -1,11 +0,0 @@ -From: hexdump - -diff --git a/configs/nyan-big_defconfig b/configs/nyan-big_defconfig -index 34a48af5ba..32175858cd 100644 ---- a/configs/nyan-big_defconfig -+++ b/configs/nyan-big_defconfig -@@ -91,3 +91,4 @@ CONFIG_VIDEO_BRIDGE=y - CONFIG_CMD_DHRYSTONE=y - CONFIG_TPM=y - CONFIG_ERRNO_STR=y -+CONFIG_ARM_CORTEX_A15_CVE_2017_5715=y