diff options
Diffstat (limited to 'strata')
-rw-r--r-- | strata/bsp-jetson-devel.morph | 14 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi.morph | 47 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi/bsp-support.morph | 6 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi/device-tree-compiler.morph | 6 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph | 71 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi/nouveau-drm.morph | 10 | ||||
-rw-r--r-- | strata/bsp-jetson-genivi/u-boot.morph | 16 | ||||
-rw-r--r-- | strata/cross-bootstrap.morph | 2 | ||||
-rw-r--r-- | strata/foundation.morph | 2 | ||||
-rw-r--r-- | strata/input-common.morph | 3 | ||||
-rw-r--r-- | strata/mesa-common/mesa.morph | 24 | ||||
-rw-r--r-- | strata/morph-utils.morph | 2 | ||||
-rw-r--r-- | strata/wayland-generic.morph | 3 | ||||
-rw-r--r-- | strata/weston-genivi.morph | 11 | ||||
-rw-r--r-- | strata/x-common.morph | 5 | ||||
-rw-r--r-- | strata/x-common/drm.morph | 10 |
16 files changed, 210 insertions, 22 deletions
diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph index bf110d1f..a8fc696a 100644 --- a/strata/bsp-jetson-devel.morph +++ b/strata/bsp-jetson-devel.morph @@ -1,7 +1,13 @@ name: bsp-jetson-devel kind: stratum -description: The platform dependent components required to boot an NVIDIA Jetson TK1 - development image board. +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: @@ -14,8 +20,8 @@ chunks: - name: u-boot morph: strata/bsp-jetson-devel/u-boot.morph repo: upstream:u-boot - ref: b15ae44ab9f085140039b09a00232d5aed6596a9 - unpetrify-ref: baserock/arm/tegra-uboot-btrfs + ref: c77921345b943cdf5f2f28bbe88c6d8970620d2e + unpetrify-ref: baserock/jetson/u-boot-tegra-next build-depends: - device-tree-compiler - name: linux-jetson-tk1 diff --git a/strata/bsp-jetson-genivi.morph b/strata/bsp-jetson-genivi.morph new file mode 100644 index 00000000..62835b74 --- /dev/null +++ b/strata/bsp-jetson-genivi.morph @@ -0,0 +1,47 @@ +name: bsp-jetson-genivi +kind: stratum +description: | + Platform-specific chunks for NVIDIA Jetson TK1 GENIVI Baseline + + Support for the Tegra platform is still being developed. A very recent + kernel with some patches is currently required to get a fully + accelerated graphics stack on this platform. Note that the SATA and + networking will not work unless you have flashed the bootloader on + your board to the version of U-Boot built in this stratum. Also, the + CPUs on the Jetson run at a slow speed with this version of Linux. +build-depends: +- morph: strata/core.morph +chunks: +- name: device-tree-compiler + morph: strata/bsp-jetson-genivi/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 + 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 + repo: upstream:linux + ref: 8da6ad2e1c6366ebb2d9a72aeaf4a42dc32c8623 + unpetrify-ref: baserock/jetson/3.17.0-rc5 + build-depends: + - u-boot +- name: bsp-support + morph: strata/bsp-jetson-genivi/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 + repo: upstream:nouveau + ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45 + unpetrify-ref: baserock/jetson/3.17-rc5 + build-depends: + - linux-jetson-tk1-genivi diff --git a/strata/bsp-jetson-genivi/bsp-support.morph b/strata/bsp-jetson-genivi/bsp-support.morph new file mode 100644 index 00000000..23524ac7 --- /dev/null +++ b/strata/bsp-jetson-genivi/bsp-support.morph @@ -0,0 +1,6 @@ +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 new file mode 100644 index 00000000..8abfafc8 --- /dev/null +++ b/strata/bsp-jetson-genivi/device-tree-compiler.morph @@ -0,0 +1,6 @@ +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/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph new file mode 100644 index 00000000..e1c99473 --- /dev/null +++ b/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph @@ -0,0 +1,71 @@ +name: linux-jetson-tk1-genivi +kind: chunk +configure-commands: +- make ARCH=arm tegra_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 +- scripts/config -e DRM_TEGRA_STAGING +- scripts/config -m DRM_NOUVEAU +- 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-jetson-tk1.dtb "$DESTDIR"/boot/. +- make modules +- make INSTALL_MOD_PATH="$DESTDIR" modules_install +- install -d "$DESTDIR$PREFIX/src/linux" +- | + ( + printf 'Makefile\0' + printf 'Module.symvers\0' + find arch/arm -maxdepth 1 -name 'Makefile*' -print0 + find arch/arm \( -name 'module.lds' -o -name 'Kbuild.platforms' -o -name 'Platform' \) -print0 + find arch/arm \( -type d -a \( -name include -o -name scripts \) \) -o \ + \! -type d -a \( -path '*include/*' -o -path '*scripts/*' \) -print0 + find include -name 'asm*' -prune -o -print0 + find include/asm-generic -print0 + find include/uapi -print0 + find scripts -print0 + ) | cpio -0pumd "$DESTDIR$PREFIX/src/linux" diff --git a/strata/bsp-jetson-genivi/nouveau-drm.morph b/strata/bsp-jetson-genivi/nouveau-drm.morph new file mode 100644 index 00000000..e89df38b --- /dev/null +++ b/strata/bsp-jetson-genivi/nouveau-drm.morph @@ -0,0 +1,10 @@ +name: nouveau-drm +kind: chunk +build-commands: + - cd drm && make M=$(pwd) -C /usr/src/linux/ modules +install-commands: + - cd drm && make M="$(pwd)" -C /usr/src/linux/ INSTALL_MOD_PATH="$DESTDIR" modules_install +system-integration: + nouveau-drm-misc: + 00-earlyconf: + - (cd /lib/modules && for version in *; do depmod -a "$version"; done) diff --git a/strata/bsp-jetson-genivi/u-boot.morph b/strata/bsp-jetson-genivi/u-boot.morph new file mode 100644 index 00000000..705b3851 --- /dev/null +++ b/strata/bsp-jetson-genivi/u-boot.morph @@ -0,0 +1,16 @@ +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/cross-bootstrap.morph b/strata/cross-bootstrap.morph index 43f0802b..f6a627b8 100644 --- a/strata/cross-bootstrap.morph +++ b/strata/cross-bootstrap.morph @@ -74,7 +74,7 @@ chunks: - six - name: morph repo: baserock:baserock/morph - ref: 963dca9868938241740d63ec1475c5f887513e0c + ref: 53e1b30f654d05a26a999a0ad7b8ff9c1895aef6 unpetrify-ref: master build-depends: - cliapp diff --git a/strata/foundation.morph b/strata/foundation.morph index c97a1cff..f321eb87 100644 --- a/strata/foundation.morph +++ b/strata/foundation.morph @@ -132,7 +132,7 @@ chunks: - name: tbdiff morph: strata/foundation/tbdiff.morph repo: baserock:baserock/tbdiff - ref: fb9bdefbbbdbd8fef01278b7c3d9c1592998f6d1 + ref: 3190be6906eb21a1ba6878d3c8edb4bd16f925d7 unpetrify-ref: master build-depends: - attr diff --git a/strata/input-common.morph b/strata/input-common.morph index 8cee9f7d..d7c4727a 100644 --- a/strata/input-common.morph +++ b/strata/input-common.morph @@ -22,7 +22,8 @@ chunks: build-depends: [] - name: libinput repo: upstream:libinput - ref: 0.5.0 + ref: bb10ec84d3704fc0fb40591bcbffe90f6c77966d + unpetrify-ref: 0.5.0 build-depends: - mtdev - libevdev diff --git a/strata/mesa-common/mesa.morph b/strata/mesa-common/mesa.morph index 44a9af85..9a528cbe 100644 --- a/strata/mesa-common/mesa.morph +++ b/strata/mesa-common/mesa.morph @@ -4,19 +4,31 @@ build-system: autotools configure-commands: - | cpu=$(echo $TARGET | cut -d '-' -f 1) + EXTRAARGS=--disable-gallium-egl case "$cpu" in x86_32|x64_64) - DRIDRIVERS=i915,i965,swrast,nouveau + DRIDRIVERS=intel,i915,i965,swrast + GALLIUMDRIVERS=swrast + EGLPLATFORMS=x11,wayland,drm + ;; + armv7lhf) + DRIDRIVERS=nouveau,swrast + GALLIUMDRIVERS=nouveau,swrast + EXTRAARGS="--with-state-trackers=egl --enable-gallium-egl" + EGLPLATFORMS=wayland,drm ;; *) - DRIDRIVERS=swrast,nouveau + DRIDRIVERS=swrast + GALLIUMDRIVERS=swrast + EGLPLATFORMS=x11,wayland,drm ;; esac ./autogen.sh --prefix="$PREFIX" \ --enable-gles2 \ - --disable-gallium-egl \ - --with-egl-platforms=x11,drm,wayland \ + --with-egl-platforms="$EGLPLATFORMS" \ --enable-gbm \ --enable-shared-glapi \ - --with-gallium-drivers=swrast \ - --with-dri-drivers="$DRIDRIVERS" + --with-gallium-drivers="$GALLIUMDRIVERS" \ + --with-dri-drivers="$DRIDRIVERS" \ + --disable-dri3 $EXTRAARGS + diff --git a/strata/morph-utils.morph b/strata/morph-utils.morph index d7389a6c..3e86e733 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: b98cfd4e0673cee64e61abee714f12dd220c8a2e + ref: 8b85d60e9294713097928d52b8ca4cfe5d5f801a unpetrify-ref: master build-depends: - cliapp diff --git a/strata/wayland-generic.morph b/strata/wayland-generic.morph index a2f97de2..1913fe91 100644 --- a/strata/wayland-generic.morph +++ b/strata/wayland-generic.morph @@ -12,6 +12,7 @@ chunks: - name: wayland morph: strata/wayland-generic/wayland.morph repo: upstream:wayland - ref: baserock/gnome + ref: c946301cc7616cda6944e29635b424a12147950f + unpetrify-ref: baserock/gnome build-depends: - libxkbcommon diff --git a/strata/weston-genivi.morph b/strata/weston-genivi.morph index 5d1c9ab1..a84c9aa9 100644 --- a/strata/weston-genivi.morph +++ b/strata/weston-genivi.morph @@ -9,18 +9,19 @@ build-depends: chunks: - name: linux-pam repo: upstream:linux-pam - ref: master + ref: 6e36ca00ed774a7c5b2f2322c96b023999b733a4 + unpetrify-ref: Linux-PAM-1.1.5 build-depends: [] - name: weston morph: strata/weston-genivi/weston.morph repo: upstream:weston - ref: 8658e06e69cc3944e89684a2de619e479751633f - unpetrify-ref: baserock/genivi/baseline-h-1.1 + ref: 5d9e9c1393c6b0ea6ce52912fc458c963e644547 + unpetrify-ref: baserock/genivi/1.2.0 build-depends: - linux-pam - name: wayland-ivi-extension repo: upstream:genivi/wayland-ivi-extension - ref: 8b59529cf3b279a948f253bc79263d00d3f051a5 - unpetrify-ref: baserock/genivi/baseline-h-1.1 + ref: 633ce4f89f695c575bdfc080551b0e59c8287427 + unpetrify-ref: baserock/genivi/1.2.0 build-depends: - weston diff --git a/strata/x-common.morph b/strata/x-common.morph index 987862a9..9acb4bf0 100644 --- a/strata/x-common.morph +++ b/strata/x-common.morph @@ -231,9 +231,10 @@ chunks: build-depends: - xorg-util-macros - name: drm + morph: strata/x-common/drm.morph repo: upstream:drm - ref: d6861609b2b887612d652bb2be7c39f199802937 - unpetrify-ref: libdrm-2.4.56 + ref: bcac0a17407dc78d0813b2eea7fae7c34de54c1b + unpetrify-ref: baserock/jetson/drm build-depends: - xcb-pthread-stubs - xorg-lib-libpciaccess diff --git a/strata/x-common/drm.morph b/strata/x-common/drm.morph new file mode 100644 index 00000000..8f5b88e2 --- /dev/null +++ b/strata/x-common/drm.morph @@ -0,0 +1,10 @@ +name: drm +kind: chunk +build-system: autotools +configure-commands: + - NOCONFIGURE=1 ./autogen.sh + - ./configure --prefix="$PREFIX" --enable-tegra-experimental-api +install-commands: + - make install DESTDIR="$DESTDIR" + - mkdir -p "$DESTDIR"/usr/lib/pkgconfig + - /usr/bin/install -c -m 644 tegra/libdrm_tegra.pc "$DESTDIR"/usr/lib/pkgconfig |