From b4191b23a8411e508796fe6c110fdc3b05d94e69 Mon Sep 17 00:00:00 2001
From: Alexey Neyman <stilor@att.net>
Date: Wed, 2 Feb 2022 14:26:22 -0800
Subject: Update tic6x sample

Restrict kernel to 5.11 and below (support for this arch has been
dropped in 5.12); rename the sample to match its name as printed by
`ct-ng show-tuple` (otherwise, `make saveconfig` does not update the
sample's configuration).

Signed-off-by: Alexey Neyman <stilor@att.net>

diff --git a/config/arch/c6x.in b/config/arch/c6x.in
index 93a8993..98589cc 100644
--- a/config/arch/c6x.in
+++ b/config/arch/c6x.in
@@ -7,9 +7,12 @@
 ## select ARCH_DEFAULT_LE
 ## select ARCH_SUPPORTS_FLAT_FORMAT
 ## select ARCH_SUPPORTS_WITH_CPU
+## select LINUX_REQUIRE_older_than_5_12
+## select LINUX_REQUIRE_3_7_or_later
 ## depends on EXPERIMENTAL
 ##
 ## help The TI C6x (TMS320C6000) architecture
 ## help   https://www.ti.com/processors/digital-signal-processors
-## help   For linux, kernel must be 3.7 or later (or custom)
+## help   For linux, kernel must be 3.7 or later (or custom) but not newer
+## help   than 5.11.x (support for C6x was removed in 5.12).
 
diff --git a/packages/linux/package.desc b/packages/linux/package.desc
index f5fa080..2896725 100644
--- a/packages/linux/package.desc
+++ b/packages/linux/package.desc
@@ -2,6 +2,6 @@ origin='www.kernel.org'
 repository='git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git'
 mirrors='$(CT_Mirrors kernel.org linux ${CT_LINUX_VERSION})'
 relevantpattern='2.*.*|. *.*|.'
-milestones='3.2 3.7 4.8 5.3'
+milestones='3.2 3.7 4.8 5.3 5.12'
 archive_formats='.tar.xz .tar.gz'
 signature_format='unpacked/.sign'
diff --git a/samples/tic6x-uclinux-uclibc/crosstool.config b/samples/tic6x-uclinux-uclibc/crosstool.config
deleted file mode 100644
index cd4af2c..0000000
--- a/samples/tic6x-uclinux-uclibc/crosstool.config
+++ /dev/null
@@ -1,14 +0,0 @@
-CT_CONFIG_VERSION="3"
-CT_EXPERIMENTAL=y
-CT_ARCH_C6X=y
-CT_OMIT_TARGET_VENDOR=y
-CT_KERNEL_LINUX=y
-CT_MULTILIB=y
-CT_LIBC_UCLIBC=y
-CT_THREADS="linuxthreads"
-CT_UCLIBC_NG_DEVEL_VCS_git=y
-CT_UCLIBC_NG_DEVEL_URL="https://github.com/DspHack/uclibc-ng.git"
-CT_ARCH_BINFMT_FDPIC=y
-CT_CC_LANG_CXX=y
-CT_ARCH_ENDIAN="little"
-
diff --git a/samples/tic6x-uclinux-uclibc/reported.by b/samples/tic6x-uclinux-uclibc/reported.by
deleted file mode 100644
index e51f694..0000000
--- a/samples/tic6x-uclinux-uclibc/reported.by
+++ /dev/null
@@ -1,3 +0,0 @@
-reporter_name="Dan Tejada <dan.tejada@cantada.com>"
-reporter_url="https://www.cantada.com/"
-reporter_comment="Tested with uclibc and linux kernel from http://linux-c6x.org"
diff --git a/samples/tic6x-uclinux/crosstool.config b/samples/tic6x-uclinux/crosstool.config
new file mode 100644
index 0000000..614c39a
--- /dev/null
+++ b/samples/tic6x-uclinux/crosstool.config
@@ -0,0 +1,12 @@
+CT_CONFIG_VERSION="4"
+CT_EXPERIMENTAL=y
+CT_ARCH_C6X=y
+CT_OMIT_TARGET_VENDOR=y
+CT_MULTILIB=y
+CT_KERNEL_LINUX=y
+CT_ARCH_BINFMT_FDPIC=y
+CT_LIBC_UCLIBC_NG=y
+CT_UCLIBC_NG_SRC_DEVEL=y
+CT_UCLIBC_NG_DEVEL_URL="https://github.com/DspHack/uclibc-ng.git"
+CT_THREADS_LT=y
+CT_CC_LANG_CXX=y
diff --git a/samples/tic6x-uclinux/reported.by b/samples/tic6x-uclinux/reported.by
new file mode 100644
index 0000000..e51f694
--- /dev/null
+++ b/samples/tic6x-uclinux/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Dan Tejada <dan.tejada@cantada.com>"
+reporter_url="https://www.cantada.com/"
+reporter_comment="Tested with uclibc and linux kernel from http://linux-c6x.org"
-- 
cgit v0.10.2-6-g49f6