From 8b698b04c94bde6fe82ed63fa752cd5f69143f3c Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 7 Nov 2014 16:45:57 +0000 Subject: Use only one bsp for both the devel and genivi systems --- strata/bsp-jetson-devel.morph | 39 ------------ strata/bsp-jetson-devel/bsp-support.morph | 6 -- strata/bsp-jetson-devel/device-tree-compiler.morph | 6 -- strata/bsp-jetson-devel/linux-jetson-tk1.morph | 53 ---------------- strata/bsp-jetson-devel/u-boot.morph | 16 ----- strata/bsp-jetson-genivi.morph | 47 -------------- strata/bsp-jetson-genivi/bsp-support.morph | 6 -- .../bsp-jetson-genivi/device-tree-compiler.morph | 6 -- .../linux-jetson-tk1-genivi.morph | 71 ---------------------- strata/bsp-jetson-genivi/nouveau-drm.morph | 12 ---- strata/bsp-jetson-genivi/u-boot.morph | 16 ----- strata/bsp-jetson.morph | 47 ++++++++++++++ strata/bsp-jetson/bsp-support.morph | 6 ++ strata/bsp-jetson/device-tree-compiler.morph | 6 ++ strata/bsp-jetson/linux-jetson-tk1.morph | 71 ++++++++++++++++++++++ strata/bsp-jetson/nouveau-drm.morph | 12 ++++ strata/bsp-jetson/u-boot.morph | 16 +++++ systems/build-system-armv7lhf-jetson.morph | 4 +- systems/devel-system-armv7lhf-jetson.morph | 4 +- .../genivi-baseline-system-armv7lhf-jetson.morph | 4 +- 20 files changed, 164 insertions(+), 284 deletions(-) delete mode 100644 strata/bsp-jetson-devel.morph delete mode 100644 strata/bsp-jetson-devel/bsp-support.morph delete mode 100644 strata/bsp-jetson-devel/device-tree-compiler.morph delete mode 100644 strata/bsp-jetson-devel/linux-jetson-tk1.morph delete mode 100644 strata/bsp-jetson-devel/u-boot.morph delete mode 100644 strata/bsp-jetson-genivi.morph delete mode 100644 strata/bsp-jetson-genivi/bsp-support.morph delete mode 100644 strata/bsp-jetson-genivi/device-tree-compiler.morph delete mode 100644 strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph delete mode 100644 strata/bsp-jetson-genivi/nouveau-drm.morph delete mode 100644 strata/bsp-jetson-genivi/u-boot.morph create mode 100644 strata/bsp-jetson.morph create mode 100644 strata/bsp-jetson/bsp-support.morph create mode 100644 strata/bsp-jetson/device-tree-compiler.morph create mode 100644 strata/bsp-jetson/linux-jetson-tk1.morph create mode 100644 strata/bsp-jetson/nouveau-drm.morph create mode 100644 strata/bsp-jetson/u-boot.morph 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/bsp-support.morph b/strata/bsp-jetson-devel/bsp-support.morph deleted file mode 100644 index 23524ac7..00000000 --- a/strata/bsp-jetson-devel/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-devel/device-tree-compiler.morph b/strata/bsp-jetson-devel/device-tree-compiler.morph deleted file mode 100644 index 8abfafc8..00000000 --- a/strata/bsp-jetson-devel/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-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-devel/u-boot.morph b/strata/bsp-jetson-devel/u-boot.morph deleted file mode 100644 index 705b3851..00000000 --- a/strata/bsp-jetson-devel/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-genivi.morph deleted file mode 100644 index 62835b74..00000000 --- a/strata/bsp-jetson-genivi.morph +++ /dev/null @@ -1,47 +0,0 @@ -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 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/linux-jetson-tk1-genivi.morph b/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph deleted file mode 100644 index e1c99473..00000000 --- a/strata/bsp-jetson-genivi/linux-jetson-tk1-genivi.morph +++ /dev/null @@ -1,71 +0,0 @@ -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 deleted file mode 100644 index e297a069..00000000 --- a/strata/bsp-jetson-genivi/nouveau-drm.morph +++ /dev/null @@ -1,12 +0,0 @@ -name: nouveau-drm -kind: chunk -build-commands: - - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules -install-commands: - - cd drm && make ARCH=arm 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 rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done) - - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done) - - (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 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.morph b/strata/bsp-jetson.morph new file mode 100644 index 00000000..058466b7 --- /dev/null +++ b/strata/bsp-jetson.morph @@ -0,0 +1,47 @@ +name: bsp-jetson +kind: stratum +description: | + 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 + 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/device-tree-compiler.morph + repo: upstream:device-tree-compiler + ref: c92f284c3cf76d471eb27a271de3a51cb45ed058 + unpetrify-ref: baserock/morph + build-depends: [] +- name: u-boot + 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 + morph: strata/bsp-jetson/linux-jetson-tk1.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/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/nouveau-drm.morph + repo: upstream:nouveau + ref: 62d1f5d2f5b3e5122eeac0f763dcdd1d04bf5c45 + unpetrify-ref: baserock/jetson/3.17-rc5 + build-depends: + - linux-jetson-tk1 diff --git a/strata/bsp-jetson/bsp-support.morph b/strata/bsp-jetson/bsp-support.morph new file mode 100644 index 00000000..23524ac7 --- /dev/null +++ b/strata/bsp-jetson/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/device-tree-compiler.morph b/strata/bsp-jetson/device-tree-compiler.morph new file mode 100644 index 00000000..8abfafc8 --- /dev/null +++ b/strata/bsp-jetson/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/linux-jetson-tk1.morph b/strata/bsp-jetson/linux-jetson-tk1.morph new file mode 100644 index 00000000..1f980098 --- /dev/null +++ b/strata/bsp-jetson/linux-jetson-tk1.morph @@ -0,0 +1,71 @@ +name: linux-jetson-tk1 +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/nouveau-drm.morph b/strata/bsp-jetson/nouveau-drm.morph new file mode 100644 index 00000000..e297a069 --- /dev/null +++ b/strata/bsp-jetson/nouveau-drm.morph @@ -0,0 +1,12 @@ +name: nouveau-drm +kind: chunk +build-commands: + - cd drm && make ARCH=arm M=$(pwd) -C /usr/src/linux/ modules +install-commands: + - cd drm && make ARCH=arm 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 rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau.ko"; done) + - (cd /lib/modules && for version in *; do rm "$version/kernel/drivers/gpu/drm/nouveau/nouveau_platform.ko"; done) + - (cd /lib/modules && for version in *; do depmod -a "$version"; done) diff --git a/strata/bsp-jetson/u-boot.morph b/strata/bsp-jetson/u-boot.morph new file mode 100644 index 00000000..705b3851 --- /dev/null +++ b/strata/bsp-jetson/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/systems/build-system-armv7lhf-jetson.morph b/systems/build-system-armv7lhf-jetson.morph index db0b36e9..674b5406 100644 --- a/systems/build-system-armv7lhf-jetson.morph +++ b/systems/build-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: tools morph: strata/tools.morph - name: morph-utils diff --git a/systems/devel-system-armv7lhf-jetson.morph b/systems/devel-system-armv7lhf-jetson.morph index 7892056d..6f468fc6 100644 --- a/systems/devel-system-armv7lhf-jetson.morph +++ b/systems/devel-system-armv7lhf-jetson.morph @@ -19,8 +19,8 @@ strata: morph: strata/morph-utils.morph - name: openstack-clients morph: strata/openstack-clients.morph -- name: bsp-jetson-devel - morph: strata/bsp-jetson-devel.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: nodejs morph: strata/nodejs.morph - name: ruby diff --git a/systems/genivi-baseline-system-armv7lhf-jetson.morph b/systems/genivi-baseline-system-armv7lhf-jetson.morph index 39f05b4f..59cca3e8 100644 --- a/systems/genivi-baseline-system-armv7lhf-jetson.morph +++ b/systems/genivi-baseline-system-armv7lhf-jetson.morph @@ -9,8 +9,8 @@ strata: morph: strata/core.morph - name: foundation morph: strata/foundation.morph -- name: bsp-jetson-genivi - morph: strata/bsp-jetson-genivi.morph +- name: bsp-jetson + morph: strata/bsp-jetson.morph - name: connectivity morph: strata/connectivity.morph - name: connman-common -- cgit v1.2.1 From 14ad80cb552ab9ecb61f09c24042dc49831cf070 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 7 Nov 2014 12:21:59 +0000 Subject: Upgrade the kernel to 3.18-rc3 This is in a special jetson branch because: i) it's still a rc, so probably don't want to use this for everything ii) it contains specific jetson patches (cpufreq) However the goal will be to maintain a branch all systems will use, hopefully the 3.18 mainline will include the cpufreq stuff, so we can start using that for everything --- strata/bsp-jetson.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index 058466b7..be0385bf 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -28,8 +28,8 @@ chunks: - 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 -- cgit v1.2.1 From 4cf2deef5d0bb8af6a8fd9454f6e9217169d943c Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 7 Nov 2014 12:26:44 +0000 Subject: Update the nouveau drm driver I've branched this from gk20a since this has been forced-pushed before, so want to ensure this stays around --- strata/bsp-jetson.morph | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index be0385bf..cfb78544 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -41,7 +41,7 @@ chunks: - name: nouveau-drm 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 -- cgit v1.2.1 From 4f0e54baeb4cfa0fcbfd84ae12d22f8ddc97d7c3 Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 7 Nov 2014 12:39:16 +0000 Subject: Add firmware for jetson Needed for the GPU --- strata/bsp-jetson.morph | 6 ++++++ strata/bsp-jetson/linux-firmware-jetson.morph | 6 ++++++ 2 files changed, 12 insertions(+) create mode 100644 strata/bsp-jetson/linux-firmware-jetson.morph diff --git a/strata/bsp-jetson.morph b/strata/bsp-jetson.morph index cfb78544..eda1d99b 100644 --- a/strata/bsp-jetson.morph +++ b/strata/bsp-jetson.morph @@ -45,3 +45,9 @@ chunks: unpetrify-ref: baserock/jetson/gk20a build-depends: - 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/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" -- cgit v1.2.1 From 09c2dc8456b1abc033c79b97646284db113b80ff Mon Sep 17 00:00:00 2001 From: James Thomas Date: Fri, 7 Nov 2014 12:43:19 +0000 Subject: Simplify kernel args --- clusters/jetson-upgrade.morph | 6 +++--- clusters/release.morph | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph index 4eb6b801..a73507aa 100644 --- a/clusters/jetson-upgrade.morph +++ b/clusters/jetson-upgrade.morph @@ -6,11 +6,11 @@ systems: TROVE_HOST: TROVE_HOST TROVE_ID: TROVE_ID ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-pm375.dtb" + DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt - FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime 0 2 + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 + FSTAB_SRC: LABEL=src /src auto defaults,rw,noatime,nofail 0 2 deploy: self: type: ssh-rsync diff --git a/clusters/release.morph b/clusters/release.morph index 5466df22..7651d502 100644 --- a/clusters/release.morph +++ b/clusters/release.morph @@ -36,10 +36,10 @@ systems: location: build-system-armv7lhf-jetson.img DISK_SIZE: 4G ROOT_DEVICE: "/dev/mmcblk0p1" - DTB_PATH: "boot/tegra124-pm375.dtb" + DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 - morph: systems/genivi-baseline-system-x86_64-generic.morph deploy: genivi-baseline-system-x86_64-generic: @@ -57,4 +57,4 @@ systems: DTB_PATH: "boot/tegra124-jetson-tk1.dtb" BOOTLOADER_CONFIG_FORMAT: "extlinux" BOOTLOADER_INSTALL: "none" - KERNEL_ARGS: cma=256M console=ttyS0,115200n8 no_console_suspend=1 lp0_vec=2064@0xf46ff000 video=tegrafb mem=1862M@2048M memtype=255 ddr_die=2048M@2048M section=256M pmuboard=0x0177:0x0000:0x02:0x43:0x00 vpr=151M@3945M tsec=32M@3913M otf_key=c75e5bb91eb3bd94560357b64422f85 usbcore.old_scheme_first=1 core_edp_mv=1150 core_edp_ma=4000 tegraid=40.1.1.0.0 debug_uartport=lsport,3 power_supply=Adapter audio_codec=rt5640 modem_id=0 android.kerneltype=normal usb_port_owner_info=0 fbcon=map:1 commchip_id=0 usb_port_owner_info=0 lane_owner_info=6 emc_max_dvfs=0 touch_id=0@0 tegra_fbmem=32899072@0xad012000 board_info=0x0177:0x0000:0x02:0x43:0x00 tegraboot=sdmmc gpt + KERNEL_ARGS: cma=256M console=tty0 console=ttyS0,115200n8 no_console_suspend=1 nouveau.pstate=1 -- cgit v1.2.1