Ubuntu
flash-kernel package

Merge lp:~dannf/ubuntu/trusty/flash-kernel/xgene into lp:ubuntu/trusty/flash-kernel

  1. Trusty (14.04)
  2. xgene
  3. Merge into trusty
Proposed by dann frazier
Status: Merged
Merge reported by: Martin Pitt
Merged at revision: not available
Proposed branch: lp:~dannf/ubuntu/trusty/flash-kernel/xgene
Merge into: lp:ubuntu/trusty/flash-kernel
Diff against target: 125 lines (+42/-3)
7 files modified
README (+3/-0)
bootscript/bootscr.xgene (+4/-0)
db/all.db (+12/-0)
debian/changelog (+8/-0)
debian/control (+3/-3)
debian/flash-kernel-installer.isinstallable (+3/-0)
functions (+9/-0)
To merge this branch: bzr merge lp:~dannf/ubuntu/trusty/flash-kernel/xgene
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+201084@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Looks good, thanks! Uploaded.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'README'
2--- README 2013-09-19 10:27:47 +0000
3+++ README 2014-01-09 19:23:21 +0000
4@@ -106,6 +106,9 @@
5 Boot-Initrd-Path but for an U-Boot boot script; see also
6 U-Boot-Script-Name and Boot-Device
7
8+* Boot-Dtb-Path: (optional) where to put the DTB file on the filesystem;
9+ see also DTB-Id
10+
11 * Required-packages: (optional) list of packages which must be added
12 during installer phase for flash-kernel to work properly; failure to
13 add these packages aborts the installation
14
15=== added file 'bootscript/bootscr.xgene'
16--- bootscript/bootscr.xgene 1970-01-01 00:00:00 +0000
17+++ bootscript/bootscr.xgene 2014-01-09 19:23:21 +0000
18@@ -0,0 +1,4 @@
19+setenv bootargs 'console=ttyS0,115200n8 ro'
20+ext4load scsi 0 ${kernel_addr_r} uImage
21+ext4load scsi 0 ${ramdisk_addr_r} uInitrd
22+bootm ${kernel_addr_r} ${ramdisk_addr_r} ${fdt_addr_r}
23
24=== modified file 'db/all.db'
25--- db/all.db 2013-11-08 04:57:53 +0000
26+++ db/all.db 2014-01-09 19:23:21 +0000
27@@ -1,5 +1,17 @@
28 # somewhat RFC2822 based, but case sensitive, not tolerant to spaces etc.
29
30+Machine: APM X-Gene CPU Potenza
31+U-Boot-Kernel-Address: 0x80000
32+U-Boot-Initrd-Address: 0x0
33+U-Boot-Script-Address: 0x4004000000
34+U-Boot-Script-Name: bootscr.xgene
35+Required-Packages: u-boot-tools
36+Boot-Kernel-Path: /boot/uImage
37+Boot-Initrd-Path: /boot/uInitrd
38+Boot-Dtb-Path: /boot/mustang.dtb
39+Boot-Script-Path: /boot/boot.scr
40+DTB-Id: mustang.dtb
41+
42 Machine: Buffalo Linkstation LiveV3 (LS-CHL)
43 Kernel-Flavors: orion5x
44 Machine-Id: 2913
45
46=== modified file 'debian/changelog'
47--- debian/changelog 2013-12-11 03:48:23 +0000
48+++ debian/changelog 2014-01-09 19:23:21 +0000
49@@ -1,3 +1,11 @@
50+flash-kernel (3.0~rc.4ubuntu46) UNRELEASED; urgency=low
51+
52+ * Add support for APM X-Gene
53+ * Add support for installing dtb files in boot partition; activate this for
54+ APM X-Gene boards
55+
56+ -- dann frazier <dann.frazier@canonical.com> Mon, 23 Dec 2013 14:51:32 -0700
57+
58 flash-kernel (3.0~rc.4ubuntu45) trusty; urgency=low
59
60 * bootscr.highbank: allow more space to load larger kernels (LP: #1250495)
61
62=== modified file 'debian/control'
63--- debian/control 2013-11-03 15:46:22 +0000
64+++ debian/control 2014-01-09 19:23:21 +0000
65@@ -12,7 +12,7 @@
66 Vcs-Git: git://git.debian.org/d-i/flash-kernel.git
67
68 Package: flash-kernel
69-Architecture: arm armel armeb armhf
70+Architecture: arm armel armeb armhf arm64
71 Depends: ${misc:Depends},
72 devio,
73 initramfs-tools (>= 0.92f),
74@@ -29,8 +29,8 @@
75 Section: debian-installer
76 Priority: standard
77 XC-Package-Type: udeb
78-Architecture: arm armel armeb armhf
79-XB-Subarchitecture: armadaxp exynos5 generic-lpae generic iop32x ixp4xx kirkwood orion5x s3c24xx mx5 omap omap4
80+Architecture: arm armel armeb armhf arm64
81+XB-Subarchitecture: armadaxp exynos5 generic-lpae generic iop32x ixp4xx kirkwood orion5x s3c24xx mx5 omap omap4 xgene
82 Provides: bootable-system
83 Depends: cdebconf-udeb, installed-base
84 XB-Installer-Menu-Item: 7300
85
86=== modified file 'debian/flash-kernel-installer.isinstallable'
87--- debian/flash-kernel-installer.isinstallable 2013-11-04 17:37:57 +0000
88+++ debian/flash-kernel-installer.isinstallable 2014-01-09 19:23:21 +0000
89@@ -38,6 +38,9 @@
90 arm*/omap4)
91 exit 0
92 ;;
93+ arm64/xgene)
94+ exit 0
95+ ;;
96 # Don't activate it by default
97 *)
98 exit 1
99
100=== modified file 'functions'
101--- functions 2013-09-21 13:07:23 +0000
102+++ functions 2014-01-09 19:23:21 +0000
103@@ -408,6 +408,7 @@
104 boot_kernel_path="$(get_machine_field "$machine" "Boot-Kernel-Path")" || :
105 boot_initrd_path="$(get_machine_field "$machine" "Boot-Initrd-Path")" || :
106 boot_script_path="$(get_machine_field "$machine" "Boot-Script-Path")" || :
107+boot_dtb_path="$(get_machine_field "$machine" "Boot-Dtb-Path")" || :
108 boot_multi_path="$(get_machine_field "$machine" "Boot-Multi-Path")" || :
109 android_boot_device="$(get_machine_field "$machine" "Android-Boot-Device")" || :
110 android_skip_initrd="$(get_machine_field "$machine" "Android-Skip-Initrd")" || :
111@@ -534,6 +535,14 @@
112 flash_kernel "$tmpdir/uImage" "$kmtd" ""
113 rm -f "$tmpdir/uImage"
114 fi
115+ if [ -n "$dtb_name" ] && [ -n "$boot_dtb_path" ]; then
116+ dtb="/lib/firmware/$kvers/device-tree/$dtb_name"
117+ if [ -f "$dtb" ]; then
118+ cp "$dtb" "$tmpdir/$dtb_name"
119+ dtb_path="$boot_mnt_dir/$boot_dtb_path"
120+ backup_and_install "$tmpdir/$dtb_name" "$dtb_path"
121+ fi
122+ fi
123 if [ -n "$boot_multi_path" ]; then
124 backup_and_install "$tmpdir/uImage" "$boot_multi_path"
125 fi

Subscribers

People subscribed via source and target branches

to all changes: