From 29d30c4d0813e50a095b156182a1452746cf5c09 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Sun, 13 Sep 2015 17:58:37 +0100 Subject: strata/bsp-jetson.morph: Upgrade Linux kernel to 4.4rc8 Also remove some configuration that its already done by tegra_defconfig Signed-off-by: James Thomas Change-Id: I8dadbf328dc068c4ab19a5faa201e387aa5d4cea --- strata/bsp-jetson.morph | 4 ++-- strata/bsp-jetson/linux-jetson-tk1.morph | 13 ++++++++----- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index cc43a7c5..3caad7a6 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -27,8 +27,8 @@ chunks: - name: linux-jetson-tk1 morph: strata/bsp-jetson/linux-jetson-tk1.morph repo: upstream:linux - ref: a6df05fd37874251833bd6f18404cd2efaa62603 - unpetrify-ref: baserock/tegra/4.0-with-cpufreq-gpu + ref: 168309855a7d1e16db751e9c647119fe2d2dc878 + unpetrify-ref: v4.4-rc8 - name: linux-firmware@jetson morph: strata/bsp-jetson/linux-firmware@jetson.morph repo: upstream:linux-firmware diff --git a/strata/bsp-jetson/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index 784a39c4..395ac136 100644 --- a/strata/bsp-jetson/linux-jetson-tk1.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -34,7 +34,6 @@ configure-commands: - scripts/config -e EXT4_FS_POSIX_ACL - scripts/config -e EXT4_FS_SECURITY - scripts/config -d EXT4_DEBUG -- scripts/config -e FUSE_FS - scripts/config -e OVERLAY_FS - scripts/config -e XFS_FS - scripts/config -e LIBCRC32C @@ -51,7 +50,6 @@ configure-commands: - scripts/config -e NFSD - scripts/config -e NFSD_V3 - scripts/config -e DRM_TEGRA_STAGING -- scripts/config -m DRM_NOUVEAU - scripts/config -e VLAN_8021Q - scripts/config -e BRIDGE_VLAN_FILTERING - scripts/config -e BLK_DEV_NBD @@ -218,11 +216,8 @@ configure-commands: - scripts/config -e SCSI_ISCSI_ATTRS - scripts/config -e ISCSI_TCP - scripts/config -e SCSI_LOWLEVEL -- scripts/config -m DRM_NOUVEAU - scripts/config -e NOUVEAU_PLATFORM_DRIVER - scripts/config -e DRM_TEGRA_STAGING -- scripts/config --set-val NOUVEAU_DEBUG 5 -- scripts/config --set-val NOUVEAU_DEBUG_DEFAULT 3 - yes '' | make ARCH=arm oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs @@ -246,3 +241,11 @@ install-commands: find include/uapi -print0 find scripts -print0 ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" +system-integration: + linux-jetson-tk1-misc: + # This is required for any modules to work correctly. However, it depends + # `depmod` from the 'kmod' chunk in the 'foundation' stratum, so it runs + # conditionally on `depmod` existing to avoid breaking in + # minimal-system-x86_64. + 00-depmod: + - if which depmod; then (cd /lib/modules && for version in *; do depmod -a "$version"; done) fi -- cgit v1.2.1