sys-kernel/armv7multi-sources: updates for grs and udoo/armv7

Signed-off-by: Steve Arnold <nerdboy@gentoo.org>

3 files changed, 24 insertions, 8 deletions

diff --git a/configs/crossdev-examples.txt b/configs/crossdev-examples.txt
index 15b74f3..a66ee7e 100644
--- a/configs/crossdev-examples.txt
+++ b/configs/crossdev-examples.txt
@@ -58,6 +58,18 @@ USE="hardened multitarget lzma multilib -openmp -fortran -jit" \
  crossdev -t armv7m-hardfloat-eabi -s4 --ex-gdb  \
  --show-fail-log  --ov-output /usr/local/cortex-m4
 
+For Arduino IDE we need multilib for multiple cortex-M cpus (and most
+don't have FPUs except cortex-M4).  Note the overlays are for Ada support
+and local newlib package.
+
+PORTDIR_OVERLAY="/usr/local/cortex-m3 /usr/local/portage /var/lib/layman/ada" \
+  USE="ada hardened multitarget lzma multilib -nls -openmp -fortran -jit -sanitize -vtv" \
+  crossdev --g 6.4.0 -s4 -t armv7m-hardfloat-eabi \
+  --genv 'EXTRA_ECONF="--with-newlib --disable-libada --with-arch=armv7e-m --with-tune=cortex-m4 --with-float-abi=hard --with-fpu=fpv4-sp-d16 --with-mode=thumb --with-abi=aapcs-linux --enable-libstdcxx-time=no --with-host-libstdcxx=-static-libgcc -Wl,-Bstatic,-lstdc++,-Bdynamic -lm" \
+  INHIBIT_LIBC_CFLAGS="-DUSE_TM_CLONE_REGISTRY=0"' \
+  --lenv 'USE="newlib-nano"' \
+  --benv 'USE='multitarget'' --ex-gdb  --show-fail-log
+
 
 This works for avr:
 
diff --git a/sys-kernel/armv7multi-sources/Manifest b/sys-kernel/armv7multi-sources/Manifest
index 6f70f40..3201d94 100644
--- a/sys-kernel/armv7multi-sources/Manifest
+++ b/sys-kernel/armv7multi-sources/Manifest
@@ -5,8 +5,8 @@ DIST genpatches-4.14-2.extras.tar.xz 17480 BLAKE2B 16712b535d1548ad14e7c6b21a85f
 DIST genpatches-4.14-25.base.tar.xz 638040 BLAKE2B 162d2117d125b277ae0d4557d203e5aca666b478c20ce46341fed43dcfca01aaa6727669f8f1eb851806c3838dd535da90f4f1a673aad9c439a1e7ac4f7505b1 SHA512 3cfcfed1389bea5a0341bebfc41552b0a9cc1b87099efca83fc32700a0cfb43dd4bd04b6e6a964ac8e4d23bab02707d3614025a6bce4bb614639f5d34bcb0854
 DIST genpatches-4.14-25.experimental.tar.xz 5184 BLAKE2B d1b0ae6d6e27920a91f230dd6768741fcbc2f3c3f45c94dd764ca33e08edc4d6f9a52caf8c0e8cfc5431fe49dc189710208d9f1fcf4199d51cf66f0578c6430f SHA512 dcb81b7063be6b19eb64bfe72f07d51762f3693b087e6feee118993d524bc48caa4ca6843ca45de7b017e30907c58b7f383f1a5efdc67f801f06d1ea8380474f
 DIST genpatches-4.14-25.extras.tar.xz 17480 BLAKE2B efcbfd671a8d34546dec1077c6e4033b04f5babd596a1d673bc4aa98b73b98c11b75f47288f8f1f9a89bbc5f0c053ba852d170bdd513f7d8e2747371cac213f5 SHA512 a78ee7bc750f0c41b526b95c63d9124aeabde8c4544fec7b76a8145e045b1106dc619d36d73d6e8bb262447f0f232a5b364028945f7251a29cd45e46f4612fd9
+DIST gentoo-armv7-4.14.20_defconfig 170441 BLAKE2B 95aa51d1b15bf95fce50c32fa297d9840544f4777e8c8b3e21e443236ce737a091f0c6171fc684153c6431e360d07e1701ca0eab8bf4dffbf7988b512b584b7a SHA512 ff92be94d7a43e4ebd375f7805cd1a5ad1bf5cf3c1f94ecba6420e2c4e9f378762f73da2d5271365ee3524062961f16ec7d169a06dc1e27113674909be6cf852
 DIST gentoo-armv7multi_defconfig 141107 BLAKE2B 7bd261e505cfc8af0cdced6721711ed923c904168213448ace4c42ca6a94aa0f5c96e2154f71f8fa6e5fa11a9c5553e90d02d2001f3b91da5caa884738ac0645 SHA512 62a0b663323d33b2cee108ac785bfaa1be6db371b1673d8809ccd2a15eb1574d59be3546736fc31bfa494683b3c14e751db48e44f9b1a3d8534d2249a9097449
-DIST gentoo-multi_v7_defconfig 170441 BLAKE2B 95aa51d1b15bf95fce50c32fa297d9840544f4777e8c8b3e21e443236ce737a091f0c6171fc684153c6431e360d07e1701ca0eab8bf4dffbf7988b512b584b7a SHA512 ff92be94d7a43e4ebd375f7805cd1a5ad1bf5cf3c1f94ecba6420e2c4e9f378762f73da2d5271365ee3524062961f16ec7d169a06dc1e27113674909be6cf852
 DIST linux-4.12.tar.xz 99186576 BLAKE2B 02d031c7f2f29849c06a6b5b589af78bc486a05a758267e47f2ff16844ae8ca701fff53cb859fcc105f7ea92c0769acf8d7f7cc116444c15235ef4d63cadc8c0 SHA512 8e81b41b253e63233e92948941f44c6482acb52aa3a3fd172f03a38a86f2c35b2ad4fd407acd1bc3964673eba344fe104d3a03e3ff4bf9cd1f22bd44263bd728
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST patch-4.12.14-armv7-x3.diff.xz 331864 BLAKE2B 2846392f85ea363e398a6837204b09d4cbf563ed706f04594ae5ca5efb781333bc3bacc7af43463ec91d4996da23aaa64ae985f1babc47449394870c8b35f65d SHA512 73c38b77549dc2f80e82803dfdeabdcdaab828ea6c67230664be89891d619855dfb33534abb33aadae395c5acd484693541d7ae626888bf53c9bdb9138787c12
diff --git a/sys-kernel/armv7multi-sources/armv7multi-sources-4.14.20-r4.ebuild b/sys-kernel/armv7multi-sources/armv7multi-sources-4.14.20-r4.ebuild
index 681758a..fa2433b 100644
--- a/sys-kernel/armv7multi-sources/armv7multi-sources-4.14.20-r4.ebuild
+++ b/sys-kernel/armv7multi-sources/armv7multi-sources-4.14.20-r4.ebuild
@@ -4,7 +4,7 @@
 EAPI="6"
 
 ETYPE="sources"
-K_DEFCONFIG="gentoo-multi_v7_defconfig"
+K_DEFCONFIG="gentoo-armv7-${PV}_defconfig"
 UNIPATCH_STRICTORDER="1"
 K_WANT_GENPATCHES="base extras experimental"
 K_GENPATCHES_VER="25"
@@ -48,10 +48,10 @@ If you are reading this, you know what to do..."
 
 RDEPEND=""
 DEPEND="${RDEPEND}
-	>=sys-devel/patch-2.7.4"
+	>=dev-vcs/git-1.8.2.1"
 
 src_unpack() {
-	# need to unpack manually due to patch reqs below
+	# need to unpack manually abd depend on git due to patch reqs below
 	unpack ${MULTI_PATCH}.xz
 
 	kernel-2_src_unpack
@@ -64,12 +64,16 @@ src_prepare() {
 	# diffs that always cause dry-run errors (even with --force).
 	# That is okay since this is not intended for beaglebone.
 
-	ebegin "Applying ${MULTI_PATCH}"
-		patch -p1 "${WORKDIR}"/${MULTI_PATCH}
+	ebegin "Applying ARMv7 ${MULTI_PATCH}"
+		git apply -p1 < "${WORKDIR}"/${MULTI_PATCH} || die "multipatch failed!"
 	eend $? || return
 
-	sed -i '/CONFIG_EXTRA_FIRMWARE/s/".*"/""/' \
-		-e 's|CONFIG_VIDEO_CODA=y|CONFIG_VIDEO_CODA=m|' \
+	# remove beaglebone firmware
+#	sed -i '/CONFIG_EXTRA_FIRMWARE/s/".*"/""/' \
+#		"${S}"/arch/arm/configs/"${K_DEFCONFIG}" || die "sed1 defconfig failed!"
+	# remove unsupported compression, make VPU driver a module
+	sed -i -e 's/CONFIG_VIDEO_CODA=y/CONFIG_VIDEO_CODA=m/' \
+		-e 's/_COMPRESS_XZ/_COMPRESS_GZIP/' \
 		"${S}"/arch/arm/configs/"${K_DEFCONFIG}" || die "sed defconfig failed!"
 
 	default