summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJames Thomas <james.thomas@codethink.co.uk>2014-11-07 12:43:19 (GMT)
committerPedro Alvarez <pedro.alvarez@codethink.co.uk>2014-11-13 17:41:00 (GMT)
commit09c2dc8456b1abc033c79b97646284db113b80ff (patch)
tree6cfef64e2a330079c4c4f8de1dbb653240d7a49a
parent4f0e54baeb4cfa0fcbfd84ae12d22f8ddc97d7c3 (diff)
downloaddefinitions-09c2dc8456b1abc033c79b97646284db113b80ff.tar.gz
Simplify kernel args
-rw-r--r--clusters/jetson-upgrade.morph6
-rw-r--r--clusters/release.morph6
2 files changed, 6 insertions, 6 deletions
diff --git a/clusters/jetson-upgrade.morph b/clusters/jetson-upgrade.morph
index 4eb6b80..a73507a 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 5466df2..7651d50 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