From 0b5d02dca7003e8193b76915c61a2e6bc322ff69 Mon Sep 17 00:00:00 2001 From: Paul Sherwood Date: Sun, 24 Aug 2014 12:25:51 +0000 Subject: Rename jetson linux chunk, add jetson-upgrade cluster morph Make the name of the Jetson-specific linux morph file consistent with the others, and add the jetson-upgrade cluster --- clusters/jetson-upgrade.morph | 18 +++++++++ strata/bsp-jetson-devel.morph | 4 +- strata/bsp-jetson-devel/linux-jetson-tk1.morph | 53 ++++++++++++++++++++++++++ strata/bsp-jetson-devel/linux.morph | 53 -------------------------- 4 files changed, 73 insertions(+), 55 deletions(-) create mode 100644 clusters/jetson-upgrade.morph create mode 100644 strata/bsp-jetson-devel/linux-jetson-tk1.morph delete mode 100644 strata/bsp-jetson-devel/linux.morph diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph new file mode 100644 index 00000000..e378cca5 --- /dev/null +++ b/clusters/jetson-upgrade.morph @@ -0,0 +1,18 @@ +name: jetson-upgrade +kind: cluster +systems: +- morph: devel-system-armv7lhf-jetson + deploy-defaults: + TROVE_HOST: TROVE_HOST + TROVE_ID: TROVE_ID + ROOT_DEVICE: "/dev/mmcblk0p1" + DTB_PATH: "boot/tegra124-pm375.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 + deploy: + jetson: + type: ssh-rsync + location: root@localhost + HOSTNAME: baserock-jetson diff --git a/strata/bsp-jetson-devel.morph b/strata/bsp-jetson-devel.morph index 2743a2ec..bf110d1f 100644 --- a/strata/bsp-jetson-devel.morph +++ b/strata/bsp-jetson-devel.morph @@ -18,8 +18,8 @@ chunks: unpetrify-ref: baserock/arm/tegra-uboot-btrfs build-depends: - device-tree-compiler -- name: linux - morph: strata/bsp-jetson-devel/linux.morph +- 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 diff --git a/strata/bsp-jetson-devel/linux-jetson-tk1.morph b/strata/bsp-jetson-devel/linux-jetson-tk1.morph new file mode 100644 index 00000000..3494f62b --- /dev/null +++ b/strata/bsp-jetson-devel/linux-jetson-tk1.morph @@ -0,0 +1,53 @@ +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/linux.morph b/strata/bsp-jetson-devel/linux.morph deleted file mode 100644 index 7edbd87c..00000000 --- a/strata/bsp-jetson-devel/linux.morph +++ /dev/null @@ -1,53 +0,0 @@ -name: linux -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/. -- cgit v1.2.1