Ubuntu
flash-kernel package

Merge lp:~dannf/ubuntu/trusty/flash-kernel/moonshot-cmdline into lp:ubuntu/trusty-updates/flash-kernel

  1. Trusty (14.04)
  2. moonshot-cmdline
  3. Merge into trusty-updates
Proposed by dann frazier
Status: Merged
Merge reported by: dann frazier
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/flash-kernel/moonshot-cmdline
Merge into: lp:ubuntu/trusty-updates/flash-kernel
Diff against target: 36 lines (+11/-2)
3 files modified
bootscript/bootscr.keystone2 (+1/-1)
bootscript/bootscr.xgene (+1/-1)
debian/changelog (+9/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/flash-kernel/moonshot-cmdline
Reviewer Review Type Date Requested Status
Adam Conrad Pending
Review via email: mp+236018@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'bootscript/bootscr.keystone2'
2--- bootscript/bootscr.keystone2 2014-06-20 17:09:02 +0000
3+++ bootscript/bootscr.keystone2 2014-09-25 17:51:16 +0000
4@@ -1,4 +1,4 @@
5-setenv bootargs 'console=ttyS0,9600n8r ro'
6+setenv bootargs "console=ttyS0,${baudrate}n8r ro pci=firmware rio-scan.static_enum=1 rio-scan.scan=0"
7 @@UBOOT_ENV_EXTRA@@
8 load scsi 0 ${kernel_addr_r} vmlinuz
9 load scsi 0 ${ramdisk_addr_r} initrd.img
10
11=== modified file 'bootscript/bootscr.xgene'
12--- bootscript/bootscr.xgene 2014-06-20 17:09:02 +0000
13+++ bootscript/bootscr.xgene 2014-09-25 17:51:16 +0000
14@@ -1,4 +1,4 @@
15-setenv bootargs 'console=ttyS0,9600n8r ro'
16+setenv bootargs "console=ttyS0,${baudrate}n8r ro"
17 @@UBOOT_ENV_EXTRA@@
18 load scsi 0 ${kernel_addr_r} uImage
19 load scsi 0 ${ramdisk_addr_r} uInitrd
20
21=== modified file 'debian/changelog'
22--- debian/changelog 2014-09-02 10:13:43 +0000
23+++ debian/changelog 2014-09-25 17:51:16 +0000
24@@ -1,3 +1,12 @@
25+flash-kernel (3.0~rc.4ubuntu49.4) UNRELEASED; urgency=medium
26+
27+ * HP Moonshot Cartridges: Use $baudrate from u-boot environment as
28+ serial console speed (LP: #1373628)
29+ * Set required boot arguments for HP ProLiant m400 cartridges
30+ (LP: #1373659)
31+
32+ -- dann frazier <dann.frazier@canonical.com> Thu, 25 Sep 2014 10:41:01 -0600
33+
34 flash-kernel (3.0~rc.4ubuntu49.3) trusty-proposed; urgency=medium
35
36 * Do not fail if there are no specified Kernel-Flavors for this

Subscribers

People subscribed via source and target branches

to all changes: