diff options
Diffstat (limited to 'strata')
24 files changed, 49 insertions, 142 deletions
diff --git a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph index 58ad90b4..dfebf69c 100644 --- a/strata/bsp-armv7-highbank/linux-armv7-highbank.morph +++ b/strata/bsp-armv7-highbank/linux-armv7-highbank.morph @@ -37,6 +37,8 @@ configure-commands: - scripts/config -e TMPFS - scripts/config -e TMPFS_POSIX_ACL - scripts/config -e VFAT_FS +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make zImage $MAKEFLAGS diff --git a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph index 9b03991b..1da640e7 100644 --- a/strata/bsp-armv7-versatile/linux-armv7-versatile.morph +++ b/strata/bsp-armv7-versatile/linux-armv7-versatile.morph @@ -17,6 +17,8 @@ configure-commands: - scripts/config -e SECCOMP - scripts/config -d DEBUG_STACK_TRACE - scripts/config -e FB_VESA +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make ARCH=arm zImage $MAKEFLAGS diff --git a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph index e3601dc4..ea1a2d5f 100644 --- a/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph +++ b/strata/bsp-armv7b-highbank/linux-armv7b-highbank.morph @@ -39,6 +39,8 @@ configure-commands: - scripts/config -e EXT4_USE_FOR_EXT23 - scripts/config -e MSDOS_FS - scripts/config -e VFAT_FS +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make zImage $MAKEFLAGS diff --git a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph index e187716d..ecf6b9bc 100644 --- a/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph +++ b/strata/bsp-armv7b-vexpress-tc2/linux-armv7b-vexpress-tc2.morph @@ -39,6 +39,8 @@ configure-commands: - scripts/config -e EXT4_USE_FOR_EXT23 - scripts/config -e MSDOS_FS - scripts/config -e VFAT_FS +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make zImage vexpress-v2p-ca15_a7.dtb diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph deleted file mode 100644 index e5f52a9c..00000000 --- a/strata/bsp-jetson-devel.morph +++ /dev/null @@ -1,39 +0,0 @@ -name: bsp-jetson-devel -kind: stratum -description: | - Platform-specific chunks for NVIDIA Jetson TK1 development system. - - Support for the Tegra platform is still being developed. This BSP uses - a patched version of Linux 3.10 supplied by NVIDIA, which provides - reliable SATA, USB and networking and runs the CPUs at full speed. - To make use of the graphics acceleration on the Jetson you will need - to use a newer kernel. -build-depends: -- morph: strata/core.morph -chunks: -- name: device-tree-compiler - morph: strata/bsp-jetson-devel/device-tree-compiler.morph - repo: upstream:device-tree-compiler - ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 - unpetrify-ref: baserock/morph - build-depends: [] -- name: u-boot - morph: strata/bsp-jetson-devel/u-boot.morph - repo: upstream:u-boot - ref: b15ae44ab9f085140039b09a00232d5aed6596a9 - unpetrify-ref: baserock/arm/tegra-uboot-btrfs - build-depends: - - device-tree-compiler -- name: linux-jetson-tk1 - morph: strata/bsp-jetson-devel/linux-jetson-tk1.morph - repo: upstream:linux - ref: de3664efca390a8d2fe525a583d17772deee8500 - unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: - - u-boot -- name: bsp-support - morph: strata/bsp-jetson-devel/bsp-support.morph - repo: baserock:baserock/bsp-support - ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 - unpetrify-ref: baserock/arm/tegra-3.10 - build-depends: [] diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph deleted file mode 100644 index 3494f62b..00000000 --- a/strata/bsp-jetson-devel/linux-jetson-tk1.morph +++ /dev/null @@ -1,53 +0,0 @@ -name: linux-jetson-tk1 -kind: chunk -configure-commands: -- make ARCH=arm tegra12_defconfig -- scripts/config -d KERNEL_LZO -- scripts/config -e KERNEL_GZIP -- scripts/config -e NAMESPACES -- scripts/config -e PACKET -- scripts/config -e SATA_AHCI -- scripts/config -e ATA_GENERIC -- scripts/config -e HAVE_IDE -- scripts/config -d BLK_DEV_IDE_SATA -- scripts/config -e BTRFS_FS -- scripts/config -e BTRFS_FS_POSIX_ACL -- scripts/config -e DEVTMPFS -- scripts/config -e DEVTMPFS_MOUNT -- scripts/config -e CONFIG_FHANDLE -- scripts/config -e CGROUPS -- scripts/config -e AUTOFS4_FS -- scripts/config --set-str UEVENT_HELPER_PATH '' -- scripts/config -e EXT2_FS -- scripts/config -e EXT2_FS_XATTR -- scripts/config -e EXT2_FS_POSIX_ACL -- scripts/config -e EXT2_FS_SECURITY -- scripts/config -e EXT2_FS_XIP -- scripts/config -e EXT3_FS -- scripts/config -d EXT3_DEFAULTS_TO_ORDERED -- scripts/config -e EXT3_FS_XATTR -- scripts/config -e EXT3_FS_POSIX_ACL -- scripts/config -e EXT3_FS_SECURITY -- scripts/config -e EXT4_FS -- scripts/config -e EXT4_FS_XATTR -- scripts/config -e EXT4_FS_POSIX_ACL -- scripts/config -e EXT4_FS_SECURITY -- scripts/config -d EXT4_DEBUG -- scripts/config -d JBD_DEBUG -- scripts/config -d JBD2_DEBUG -- scripts/config -e BLK_DEV_LOOP -- scripts/config -d BLK_DEV_CRYPTOLOOP -- scripts/config --set-val BLK_DEV_LOOP_MIN_COUNT 8 -- scripts/config -e IKCONFIG -- scripts/config -e IKCONFIG_PROC -- scripts/config -e SECCOMP -- scripts/config -d DEBUG_STACK_TRACE -- scripts/config -e NFSD -- scripts/config -e NFSD_V3 -- yes '' | make ARCH=arm oldconfig -build-commands: -- make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs -install-commands: -- mkdir -p "$DESTDIR"/boot -- cp arch/arm/boot/zImage "$DESTDIR"/boot/zImage -- cp arch/arm/boot/dts/tegra124-pm375.dtb "$DESTDIR"/boot/. diff --git a/strata/bsp-jetson-genivi/bsp-support.morph b/strata/bsp-jetson-genivi/bsp-support.morph deleted file mode 100644 index 23524ac7..00000000 --- a/strata/bsp-jetson-genivi/bsp-support.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: bsp-support -kind: chunk -install-commands: -- install -o 0 -g 0 -m 755 -D nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service" -- install -d "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants" -- ln -s /usr/lib/systemd/system/nv-ondemand-cpufreq-governor.service "$DESTDIR/usr/lib/systemd/system/sysinit.target.wants/nv-ondemand-cpufreq-governor.service" diff --git a/strata/bsp-jetson-genivi/device-tree-compiler.morph b/strata/bsp-jetson-genivi/device-tree-compiler.morph deleted file mode 100644 index 8abfafc8..00000000 --- a/strata/bsp-jetson-genivi/device-tree-compiler.morph +++ /dev/null @@ -1,6 +0,0 @@ -name: device-tree-compiler -kind: chunk -build-commands: -- make all -install-commands: -- make install DESTDIR="$DESTDIR" PREFIX="$PREFIX" diff --git a/strata/bsp-jetson-genivi/u-boot.morph b/strata/bsp-jetson-genivi/u-boot.morph deleted file mode 100644 index 705b3851..00000000 --- a/strata/bsp-jetson-genivi/u-boot.morph +++ /dev/null @@ -1,16 +0,0 @@ -name: u-boot -kind: chunk -configure-commands: -- make ARCH=arm jetson-tk1_config -build-commands: -- make ARCH=arm CROSS_COMPILE=/usr/bin/ -- make ARCH=arm CROSS_COMPILE=/usr/bin/ tools -install-commands: -- mkdir -p "$DESTDIR$PREFIX/bin" -- mkdir -p "$DESTDIR/boot" -- install -m 755 u-boot-dtb-tegra.bin "$DESTDIR/boot/u-boot.bin" -- install -m 755 tools/img2brec.sh "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/jtagconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/netconsole "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkenvimage "$DESTDIR$PREFIX/bin/." -- install -m 755 tools/mkimage "$DESTDIR$PREFIX/bin/." diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson.morph index 62835b74..eda1d99b 100644 --- a/strata/bsp-jetson-genivi.morph +++ b/strata/bsp-jetson.morph @@ -1,7 +1,7 @@ -name: bsp-jetson-genivi +name: bsp-jetson kind: stratum description: | - Platform-specific chunks for NVIDIA Jetson TK1 GENIVI Baseline + Platform-specific chunks for NVIDIA Jetson TK1 Support for the Tegra platform is still being developed. A very recent kernel with some patches is currently required to get a fully @@ -13,35 +13,41 @@ build-depends: - morph: strata/core.morph chunks: - name: device-tree-compiler - morph: strata/bsp-jetson-genivi/device-tree-compiler.morph + morph: strata/bsp-jetson/device-tree-compiler.morph repo: upstream:device-tree-compiler ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 unpetrify-ref: baserock/morph build-depends: [] - name: u-boot - morph: strata/bsp-jetson-genivi/u-boot.morph + morph: strata/bsp-jetson/u-boot.morph repo: upstream:u-boot ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e unpetrify-ref: baserock/jetson/u-boot-tegra-next build-depends: - device-tree-compiler -- name: linux-jetson-tk1-genivi - morph: strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph +- name: linux-jetson-tk1 + morph: strata/bsp-jetson/linux-jetson-tk1.morph repo: upstream:linux - ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623 - unpetrify-ref: baserock/jetson/3.17.0-rc5 + ref: 8c885b20c4c9115d29dca4e5afd66228c51c5f69 + unpetrify-ref: baserock/jetson/linux-tegra-3.18-rc3 build-depends: - u-boot - name: bsp-support - morph: strata/bsp-jetson-genivi/bsp-support.morph + morph: strata/bsp-jetson/bsp-support.morph repo: baserock:baserock/bsp-support ref: 19bc31ce3198a3c19cdd96d392bde34cb34ed525 unpetrify-ref: baserock/arm/tegra-3.10 build-depends: [] - name: nouveau-drm - morph: strata/bsp-jetson-genivi/nouveau-drm.morph + morph: strata/bsp-jetson/nouveau-drm.morph repo: upstream:nouveau - ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45 - unpetrify-ref: baserock/jetson/3.17-rc5 + ref: 4d0929aa231a0c2d2b66fa1f8ea1c8fa4d872501 + unpetrify-ref: baserock/jetson/gk20a build-depends: - - linux-jetson-tk1-genivi + - linux-jetson-tk1 +- name: linux-firmware-jetson + morph: strata/bsp-jetson/linux-firmware-jetson.morph + repo: upstream:linux-firmware + ref: 9322ef5b14c78ec28163baa41bff240a0e098810 + unpetrify-ref: baserock/jetson + build-depends: [] diff --git a/strata/bsp-jetson-devel/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph index 23524ac7..23524ac7 100644 --- a/strata/bsp-jetson-devel/bsp-support.morph +++ b/strata/bsp-jetson/bsp-support.morph diff --git a/strata/bsp-jetson-devel/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph index 8abfafc8..8abfafc8 100644 --- a/strata/bsp-jetson-devel/device-tree-compiler.morph +++ b/strata/bsp-jetson/device-tree-compiler.morph diff --git a/strata/bsp-jetson/linux-firmware-jetson.morph b/strata/bsp-jetson/linux-firmware-jetson.morph new file mode 100644 index 00000000..c803eab2 --- /dev/null +++ b/strata/bsp-jetson/linux-firmware-jetson.morph @@ -0,0 +1,6 @@ +name: linux-firmware-jetson +kind: chunk +install-commands: +- install -d "$DESTDIR/lib/firmware/nvidia/tegra124" +- install -m644 nvidia/tegra124/gk20a_ctxsw.bin "$DESTDIR/lib/firmware/nvidia/tegra124" +- install -m644 nvidia/tegra124/xusb.bin "$DESTDIR/lib/firmware/nvidia/tegra124" diff --git a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson/linux-jetson-tk1.morph index e1c99473..42c16f01 100644 --- a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -1,4 +1,4 @@ -name: linux-jetson-tk1-genivi +name: linux-jetson-tk1 kind: chunk configure-commands: - make ARCH=arm tegra_defconfig @@ -46,6 +46,8 @@ configure-commands: - 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 - yes '' | make ARCH=arm oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x80200000 zImage dtbs diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph index e297a069..e297a069 100644 --- a/strata/bsp-jetson-genivi/nouveau-drm.morph +++ b/strata/bsp-jetson/nouveau-drm.morph diff --git a/strata/bsp-jetson-devel/u-boot.morph b/strata/bsp-jetson/u-boot.morph index 705b3851..705b3851 100644 --- a/strata/bsp-jetson-devel/u-boot.morph +++ b/strata/bsp-jetson/u-boot.morph diff --git a/strata/bsp-wandboard/linux-armv7-wandboard.morph b/strata/bsp-wandboard/linux-armv7-wandboard.morph index 16929c9d..15317978 100644 --- a/strata/bsp-wandboard/linux-armv7-wandboard.morph +++ b/strata/bsp-wandboard/linux-armv7-wandboard.morph @@ -44,6 +44,8 @@ configure-commands: - scripts/config -d DEBUG_STACK_TRACE - scripts/config -e NFSD - scripts/config -e NFSD_V3 +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make $MAKEFLAGS ARCH=arm LOADADDR=0x10800000 uImage dtbs diff --git a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph index 10bac0cd..593d9a65 100644 --- a/strata/bsp-x86_32-generic/linux-x86-32-generic.morph +++ b/strata/bsp-x86_32-generic/linux-x86-32-generic.morph @@ -78,6 +78,8 @@ configure-commands: - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI - scripts/config -e HOTPLUG_PCI_ACPI +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph index 4b18b537..fe0721cc 100644 --- a/strata/bsp-x86_64-generic/linux-x86-64-generic.morph +++ b/strata/bsp-x86_64-generic/linux-x86-64-generic.morph @@ -78,6 +78,8 @@ configure-commands: - scripts/config -e FB_VESA - scripts/config -e HOTPLUG_PCI - scripts/config -e HOTPLUG_PCI_ACPI +- scripts/config -e VLAN_8021Q +- scripts/config -e BRIDGE_VLAN_FILTERING - yes '' | make oldconfig build-commands: - make $MAKEFLAGS diff --git a/strata/mesa-common.morph b/strata/mesa-common.morph index 290ff0c2..efae2449 100644 --- a/strata/mesa-common.morph +++ b/strata/mesa-common.morph @@ -8,6 +8,6 @@ chunks: - name: mesa morph: strata/mesa-common/mesa.morph repo: upstream:mesa - ref: 3b6a4758fa8958db4b76e6d7efccc93b12b1da06 - unpetrify-ref: mesa-10.3.2 + ref: 1a9cc5f50db5d27530a3449743b43aac389d781f + unpetrify-ref: mesa-10.3.3 build-depends: [] diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index f946390f..4194acc2 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -8,7 +8,6 @@ configure-commands: armv7lhf) DRIDRIVERS=no GALLIUMDRIVERS=nouveau,freedreno,svga,swrast,vc4 - EXTRAARGS="--enable-gallium-egl" ;; *) DRIDRIVERS=yes @@ -21,4 +20,4 @@ configure-commands: --with-egl-platforms=drm,wayland \ --with-gallium-drivers="$GALLIUMDRIVERS" \ --with-dri-drivers="$DRIDRIVERS" \ - $EXTRAARGS + --enable-gallium-egl diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index 81496d8d..54292eb0 100644 --- a/strata/morph-utils.morph +++ b/strata/morph-utils.morph @@ -71,7 +71,7 @@ chunks: build-depends: [] - name: morph repo: baserock:baserock/morph - ref: 384dc8d2eb9222746085f0274c625eb163eda88a + ref: 9b0b5206a25c1d874d6e17952c4385838e57563e unpetrify-ref: master build-depends: - cliapp diff --git a/strata/trove.morph b/strata/trove.morph index d0773314..3b285372 100644 --- a/strata/trove.morph +++ b/strata/trove.morph @@ -190,7 +190,7 @@ chunks: - name: lorry-controller morph: strata/trove/lorry-controller.morph repo: baserock:baserock/lorry-controller - ref: d7ca3f2f14ad28437f7332ca387a790fecb8b081 + ref: 689174532cc4920d2ef96bcebeb8a1adaf985804 unpetrify-ref: master build-depends: [] - name: lua-scrypt diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index d5d9faec..d47d0ac4 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -9,8 +9,8 @@ build-depends: chunks: - name: linux-pam repo: upstream:linux-pam - ref: 6e36ca00ed774a7c5b2f2322c96b023999b733a4 - unpetrify-ref: Linux-PAM-1.1.5 + ref: b1521c97e73b10469f7b34c0571d51c647eca83c + unpetrify-ref: Linux-PAM-1.1.8 build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph |