From e55cdb58f3a9d5eac092586cc297b309cc0a372b Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sun, 16 Jun 2024 16:10:41 +0200 Subject: [PATCH] board/chromebook: use global-patch-dir for kernel patch We're going to add hashes soon, so we'll need to have that directory populated with hash files, and it would then be a bit confusing to not have the patch file in the patches directory... Signed-off-by: Yann E. MORIN Cc: Alex Suykov Signed-off-by: Arnout Vandecappelle (cherry picked from commit 552a8cec8cb1a9a66591d075992957ad32547528) Signed-off-by: Peter Korsgaard --- .checkpackageignore | 1 - .../linux/0001-linux-4.15-dts-tpm.patch} | 3 +++ configs/chromebook_snow_defconfig | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) rename board/chromebook/snow/{linux-4.15-dts-tpm.patch => patches/linux/0001-linux-4.15-dts-tpm.patch} (85%) diff --git a/.checkpackageignore b/.checkpackageignore index 41698e1cde..3533b1df33 100644 --- a/.checkpackageignore +++ b/.checkpackageignore @@ -26,7 +26,6 @@ board/canaan/k210-soc/post-build.sh Shellcheck board/canaan/k210-soc/rootfs_overlay/sbin/init Shellcheck board/chromebook/elm/sign.sh Shellcheck board/chromebook/mksd.sh Shellcheck -board/chromebook/snow/linux-4.15-dts-tpm.patch ApplyOrder Upstream board/chromebook/snow/sign.sh Shellcheck board/ci20/patches/uboot/0001-mips-Remove-default-endiannes.patch Upstream board/cubietech/cubieboard2/post-image.sh Shellcheck diff --git a/board/chromebook/snow/linux-4.15-dts-tpm.patch b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch similarity index 85% rename from board/chromebook/snow/linux-4.15-dts-tpm.patch rename to board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch index c71ff1b584..01f452b563 100644 --- a/board/chromebook/snow/linux-4.15-dts-tpm.patch +++ b/board/chromebook/snow/patches/linux/0001-linux-4.15-dts-tpm.patch @@ -9,6 +9,9 @@ See https://code.google.com/p/chromium/issues/detail?id=220169 and https://lkml.org/lkml/2013/3/4/242 Signed-off-by: Alex Suykov +Upstream: Not Applicable +[yann.morin.1998@free.fr: add Upstream tag] +Signed-off-by: Yann E. MORIN --- a/arch/arm/boot/dts/exynos5250-snow-common.dtsi +++ b/arch/arm/boot/dts/exynos5250-snow-common.dtsi diff --git a/configs/chromebook_snow_defconfig b/configs/chromebook_snow_defconfig index bcb94b716b..50e355647c 100644 --- a/configs/chromebook_snow_defconfig +++ b/configs/chromebook_snow_defconfig @@ -1,6 +1,7 @@ BR2_arm=y BR2_cortex_a15=y BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_4_15=y +BR2_GLOBAL_PATCH_DIR="board/chromebook/snow/patches" BR2_TARGET_GENERIC_GETTY_PORT="tty1" BR2_TARGET_GENERIC_GETTY_TERM="linux" BR2_ROOTFS_POST_BUILD_SCRIPT="board/chromebook/snow/sign.sh" @@ -8,7 +9,6 @@ BR2_ROOTFS_POST_IMAGE_SCRIPT="board/chromebook/mksd.sh" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_VERSION=y BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="4.15" -BR2_LINUX_KERNEL_PATCH="board/chromebook/snow/linux-4.15-dts-tpm.patch" BR2_LINUX_KERNEL_DEFCONFIG="exynos" BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/chromebook/snow/linux-4.15.fragment" BR2_LINUX_KERNEL_DTS_SUPPORT=y