Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Sat, 2012-08-04 at 14:30 +0200, Hector Oron wrote: Hi Ian, 2012/7/27 Ian Campbell i...@hellion.org.uk: On Fri, 2012-07-27 at 18:37 +0200, Hector Oron wrote: Did the d-i beta get done? I must have been sleeping ;-) No, not really, I think I got that wrong. Got confused with alpha1. OK, I think we can go ahead now. :-) Thanks, I've pushed my changes to libdebian-installer and debian-installer. I think that was everything. Apart perhaps from this update to the manual. I'm not sure how useful this is, I don't think the existing list is exhaustive anyway. diff --git a/manual/en/hardware/supported/arm.xml b/manual/en/hardware/supported/arm.xml index a386eaf..98637eb 100644 --- a/manual/en/hardware/supported/arm.xml +++ b/manual/en/hardware/supported/arm.xml @@ -49,8 +49,8 @@ Kirkwood is a system on a chip (SoC) from Marvell that integrates an ARM CPU, Ethernet, SATA, USB, and other functionality in one chip. We currently support the following Kirkwood based devices: OpenRD (OpenRD-Base, OpenRD-Client and OpenRD-Ultimate), ulink -url=url-arm-cyrius-sheevaplug;plug computers (SheevaPlug and -GuruPlug)/ulink, and ulink url=url-arm-cyrius-qnap-kirkwood;QNAP +url=url-arm-cyrius-sheevaplug;plug computers (SheevaPlug, GuruPlug and +DreamPlug)/ulink, and ulink url=url-arm-cyrius-qnap-kirkwood;QNAP Turbo Station/ulink (all TS-11x, TS-21x and TS-41x models). /para/listitem diff --git a/manual/en/install-methods/download/arm.xml b/manual/en/install-methods/download/arm.xml index f3c826d..7ca55d7 100644 --- a/manual/en/install-methods/download/arm.xml +++ b/manual/en/install-methods/download/arm.xml @@ -65,8 +65,8 @@ the installation files for QNAP TS-11x, TS-21x and TS-41x models from titlePlug Computer and OpenRD Installation Files/title para -The installation files for plug computers (SheevaPlug, GuruPlug, etc) and -OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain +The installation files for plug computers (SheevaPlug, GuruPlug, DreamPlug etc) +and OpenRD devices consist of a kernel and initrd for U-Boot. You can obtain these files from kirkwood-marvell-firmware-img;. /para -- Ian Campbell Do you mean to say that I can read mail with vi too? ;-) Didn't you know that? :r /var/spool/mail/jk -- Seen on #debian-mentors signature.asc Description: This is a digitally signed message part
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hi Ian, 2012/7/27 Ian Campbell i...@hellion.org.uk: On Fri, 2012-07-27 at 18:37 +0200, Hector Oron wrote: Did the d-i beta get done? I must have been sleeping ;-) No, not really, I think I got that wrong. Got confused with alpha1. OK, I think we can go ahead now. :-) regards, -- Héctor Orón -.. . -... .. .- -. -.. . ...- . .-.. --- .--. . .-. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/caodfweebq0pqazf04+wxux0nhex-bydj0ga-gtdd7qotnhj...@mail.gmail.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hector Oron hector.o...@gmail.com (04/08/2012): 2012/7/27 Ian Campbell i...@hellion.org.uk: No, not really, I think I got that wrong. Got confused with alpha1. OK, I think we can go ahead now. :-) Yes, thanks for your patience. Mraw, KiBi. signature.asc Description: Digital signature
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hello Ian, 2012/7/17 Ian Campbell i...@hellion.org.uk: diff --git a/debian/changelog b/debian/changelog index 9edf023..c5f7181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +flash-kernel (3.2) UNRELEASED; urgency=low + + * Use get_machine in flash-kernel-installer udeb. Fixes flash-kernel at +install time on Dreamplug failure to install u-boot-tools. Thanks Ian. I have applied change to 3.2 and released to unstable. Unblock request has already been filed. Could you poke me if there are any missing bits? Regards, -- Héctor Orón -.. . -... .. .- -. -.. . ...- . .-.. --- .--. . .-. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAODfWeFLZdBygMrAV=bzyb30f1oymc60ys4ifnum4l22pgg...@mail.gmail.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hello Ian, 2012/7/12 Martin Michlmayr t...@cyrius.com: * Ian Campbell i...@hellion.org.uk [2012-07-10 15:31]: Martin tells me this is necessary for d-i to pick the correct kernel while installing. Looks good. Hector, please apply after beta 1 is done. Ian, could you push your changes adding Dreamplug support for libdebian-installer and debian-installer? (I think beta 1 days have already passed) regards, -- Héctor Orón -.. . -... .. .- -. -.. . ...- . .-.. --- .--. . .-. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAODfWeGS=OPgV7iS85qUpLn=tz6cu9ggq0pgjjpt5fyj_2b...@mail.gmail.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Fri, 2012-07-27 at 17:25 +0200, Hector Oron wrote: Hello Ian, 2012/7/17 Ian Campbell i...@hellion.org.uk: diff --git a/debian/changelog b/debian/changelog index 9edf023..c5f7181 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +flash-kernel (3.2) UNRELEASED; urgency=low + + * Use get_machine in flash-kernel-installer udeb. Fixes flash-kernel at +install time on Dreamplug failure to install u-boot-tools. Thanks Ian. I have applied change to 3.2 and released to unstable. Did the d-i beta get done? I must have been sleeping ;-) Unblock request has already been filed. Could you poke me if there are any missing bits? Unless you want to take the /etc/flash-kernel/db stuf for wheezy (I don't think you do) then there's just the libdebian-installer and debian-installer bits remaining. Ian. Regards, -- Ian Campbell Current Noise: Nile - Annihilation Of The Wicked I was at this restaurant. The sign said Breakfast Anytime. So I ordered French Toast in the Rennaissance. -- Steven Wright -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1343405326.25096.22.ca...@zakaz.uk.xensource.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Fri, 2012-07-27 at 17:57 +0200, Hector Oron wrote: Hello Ian, 2012/7/12 Martin Michlmayr t...@cyrius.com: * Ian Campbell i...@hellion.org.uk [2012-07-10 15:31]: Martin tells me this is necessary for d-i to pick the correct kernel while installing. Looks good. Hector, please apply after beta 1 is done. Ian, could you push your changes adding Dreamplug support for libdebian-installer and debian-installer? (I think beta 1 days have already passed) Ah, I was just replying to your other mail... Sure, I'll hopefully get to it this weekend. Ian. -- Ian Campbell Current Noise: Nile - Annihilation Of The Wicked Voiceless it cries, Wingless flutters, Toothless bites, Mouthless mutters. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1343405371.25096.23.ca...@zakaz.uk.xensource.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Fri, 2012-07-27 at 18:37 +0200, Hector Oron wrote: Hi, 2012/7/27 Ian Campbell i...@hellion.org.uk: On Fri, 2012-07-27 at 17:25 +0200, Hector Oron wrote: Did the d-i beta get done? I must have been sleeping ;-) No, not really, I think I got that wrong. Got confused with alpha1. Ah, right, easily done! Unblock request has already been filed. Could you poke me if there are any missing bits? Unless you want to take the /etc/flash-kernel/db stuf for wheezy (I don't think you do) then there's just the libdebian-installer and debian-installer bits remaining. OK, lets leave /etc/flash-kernel/db for wheezy+1. Agreed. And, yes, let's leave libdebian-installer and debian-installer for after beta 1. OK. So, contrary to what I said earlier, I *won't* commit anything this weekend. Cheers, Ian. -- Ian Campbell You are number 6! Who is number one? -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1343407296.25096.31.ca...@zakaz.uk.xensource.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Tue, 2012-07-10 at 17:35 -0600, Ian Campbell wrote:
On Tue, 2012-07-10 at 16:37 -0600, Ian Campbell wrote:
On Wed, 2012-07-11 at 00:33 +0200, Hector Oron wrote:
Hello Ian,
2012/7/10 Ian Campbell i...@hellion.org.uk:
Martin tells me this is necessary for d-i to pick the correct kernel
while installing. I believe him ;-)
Thanks for the patch, it looks fine to me, but incomplete for d-i.
You need to add Dreamplug platform in debian-installer configuration
(see installer/build/config/armel/kirkwood/* )
Thanks for the pointer. I'll cook something up shortly...
Here we are (patch follow pull request). I've built it but not booted
it...
I've now run through an install on a DP and found that I needed the
following, or else the flash-kernel invocation fails due to lack of
mkimage. This is because get_cpuinfo_hardware doesn't check dt model so
flash-kernel-installer doesn't correctly detect DreamPlug and we don't
process Required-Packages: u-boot-tools.
I manually installed u-boot-tools in the target and the installation
completed.
The use of get_cpuinfo_hardware in initramfs tools hooks doesn't seem to
have any bad impact, although I think it should still be changed.
I'm continuing to hold off on committing anything until after the beta.
I'll also rebuild and retest with the the fixed flash-kernel udebs.
Ian.
diff --git a/debian/changelog b/debian/changelog
index 9edf023..c5f7181 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+flash-kernel (3.2) UNRELEASED; urgency=low
+
+ * Use get_machine in flash-kernel-installer udeb. Fixes flash-kernel at
+install time on Dreamplug failure to install u-boot-tools.
+
+ -- Ian Campbell ian.campb...@citrix.com Tue, 17 Jul 2012 21:15:21 +
+
flash-kernel (3.2~exp.1) UNRELEASED; urgency=low
[ Ian Campbell ]
diff --git a/debian/flash-kernel-installer.postinst
b/debian/flash-kernel-installer.postinst
index c7846e5..c07dee5 100755
--- a/debian/flash-kernel-installer.postinst
+++ b/debian/flash-kernel-installer.postinst
@@ -24,7 +24,7 @@ findfs () {
mount | grep on /target${1%/} | tail -n1 | cut -d' ' -f1
}
-machine=$(get_cpuinfo_hardware)
+machine=$(get_machine)
if machine_uses_flash $machine; then
db_progress START 0 3 flash-kernel-installer/progress
diff --git a/initramfs-tools/hooks/flash_kernel_set_root
b/initramfs-tools/hooks/flash_kernel_set_root
index e78f76a..38a0bf8 100755
--- a/initramfs-tools/hooks/flash_kernel_set_root
+++ b/initramfs-tools/hooks/flash_kernel_set_root
@@ -91,7 +91,7 @@ if [ ! -e $rootdev ]; then
pause_error
fi
-machine=$(get_cpuinfo_hardware)
+machine=$(get_machine)
# Should we override the root device or merely provide a default root
# device?
--
Ian Campbell
It's not whether you win or lose, it's how you look playing the game.
signature.asc
Description: This is a digitally signed message part
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
* Ian Campbell i...@hellion.org.uk [2012-07-10 15:31]: Martin tells me this is necessary for d-i to pick the correct kernel while installing. Looks good. Hector, please apply after beta 1 is done. -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120712160515.gl5...@jirafa.cyrius.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Thu, 2012-07-12 at 10:05 -0600, Martin Michlmayr wrote: * Ian Campbell i...@hellion.org.uk [2012-07-10 15:31]: Martin tells me this is necessary for d-i to pick the correct kernel while installing. Looks good. Thanks. Hector, please apply after beta 1 is done. I think I have push access myself. I used to have access to the old monolithic svn (for Xen porting work). I presume it has been carried over to the git trees. So I can push myself after beta 1 assuming no one minds ;-) or beats me to it... I'll still need to ping Hector for an upload though (ENOTADD). Ian. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1342109661.8586.150.ca...@hastur.hellion.org.uk
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
* Ian Campbell i...@hellion.org.uk [2012-07-12 10:14]: I think I have push access myself. I used to have access to the old monolithic svn (for Xen porting work). I presume it has been carried over to the git trees. So I can push myself after beta 1 assuming no one minds ;-) or beats me to it... I was planning to add whether you want a guest account but seems you have one already. Feel free to apply after the beta. -- Martin Michlmayr http://www.cyrius.com/ -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/20120712161800.go5...@jirafa.cyrius.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Thu, 2012-07-12 at 10:18 -0600, Martin Michlmayr wrote: * Ian Campbell i...@hellion.org.uk [2012-07-12 10:14]: I think I have push access myself. I used to have access to the old monolithic svn (for Xen porting work). I presume it has been carried over to the git trees. So I can push myself after beta 1 assuming no one minds ;-) or beats me to it... I was planning to add whether you want a guest account but seems you have one already. Right, I'm ijc-guest. Feel free to apply after the beta. Will do. Hopefully that will also give me time to more than build test it too. Ian. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1342110468.8586.155.ca...@hastur.hellion.org.uk
[GIT/PATCH] libdebian-installer: Add support for dreamplug
Martin tells me this is necessary for d-i to pick the correct kernel
while installing. I believe him ;-)
As with flash-kernel I needed to make libdebian-installer
use /proc/device-tree/model if it exists (and continue to
use /proc/cpuinfo:Hardware if it does not).
Pull request is below, followed by the patch.
I tested with the attached simple test program, works on my dreamplug
and FWIW does the expected thing in an armel chroot my (non-DT) mx5
board (i.e. it reads proc/cpuinfo but eventually returns unknown). I
didn't try with a real install image.
Should I file a bug with this too?
Ian.
The following changes since commit ae2565e660e2d80b0b4d1373b8152b9cf239ca6c:
Releasing version 0.81 (2012-06-01 18:51:10 +0200)
are available in the git repository at:
git://gitorious.org/ijc-debian/libdebian-installer.git dreamplug
for you to fetch changes up to 4ac8107d9338cd0ff48c1223529516359c32fec6:
Add Dreamplug device (Kirkwood) (2012-07-10 21:20:51 +)
Ian Campbell (1):
Add Dreamplug device (Kirkwood)
debian/changelog |8 +++
src/system/subarch-arm-linux.c | 41 +++
2 files changed, 44 insertions(+), 5 deletions(-)
From 4ac8107d9338cd0ff48c1223529516359c32fec6 Mon Sep 17 00:00:00 2001
From: Ian Campbell i...@hellion.org.uk
Date: Tue, 10 Jul 2012 21:20:51 +
Subject: [PATCH] Add Dreamplug device (Kirkwood)
---
debian/changelog |8 +++
src/system/subarch-arm-linux.c | 41 +++
2 files changed, 44 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 11a4b32..03ea18f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libdebian-installer (0.82) unstable; urgency=low
+
+ [ Ian Campbell ]
+ * Support for reading hardware model from Device Tree (armel).
+ * Add Dreamplug device (Kirkwood)
+
+ -- Ian Campbell i...@hellion.org.uk Tue, 10 Jul 2012 21:15:56 +
+
libdebian-installer (0.81) unstable; urgency=low
[ Simon Guinot ]
diff --git a/src/system/subarch-arm-linux.c b/src/system/subarch-arm-linux.c
index af315ea..3ff3d16 100644
--- a/src/system/subarch-arm-linux.c
+++ b/src/system/subarch-arm-linux.c
@@ -41,6 +41,7 @@ static struct map map_hardware[] = {
{ Marvell OpenRD Ultimate Board, kirkwood },
{ Marvell SheevaPlug Reference Board, kirkwood },
{ Marvell eSATA SheevaPlug Reference Board, kirkwood },
+{ Globalscale Technologies Dreamplug, kirkwood },
{ QNAP TS-119/TS-219, kirkwood },
{ QNAP TS-41x, kirkwood },
{ Seagate FreeAgent DockStar, kirkwood },
@@ -89,17 +90,30 @@ static struct map map_hardware[] = {
{ NULL, NULL }
};
-const char *di_system_subarch_analyze(void)
+static int read_dt_model(char *entry, int entry_len)
+{
+ FILE *model;
+ int ret;
+
+ model = fopen(/proc/device-tree/model, r);
+ if (model == NULL)
+ return 1;
+
+ ret = fgets(entry, entry_len, model) == NULL;
+ fclose(model);
+ return ret;
+}
+
+static int read_cpuinfo(char *entry, int entry_len)
{
FILE *cpuinfo;
char line[1024];
- char entry[256];
char *pos;
- int i;
+ int ret = 1;
cpuinfo = fopen(/proc/cpuinfo, r);
if (cpuinfo == NULL)
- return unknown;
+ return 1;
while (fgets(line, sizeof(line), cpuinfo) != NULL)
{
@@ -110,12 +124,29 @@ const char *di_system_subarch_analyze(void)
continue;
while (*++pos (*pos == '\t' || *pos == ' '));
- strncpy(entry, pos, sizeof(entry));
+ strncpy(entry, pos, entry_len);
+ ret = 0;
break;
}
}
fclose(cpuinfo);
+ return ret;
+}
+
+const char *di_system_subarch_analyze(void)
+{
+ char entry[256];
+ int i;
+ int ret;
+
+ entry[0] = '\0';
+
+ ret = read_dt_model(entry, sizeof(entry));
+ if (ret)
+ ret = read_cpuinfo(entry, sizeof(entry));
+ if (ret)
+ return unknown;
for (i = 0; map_hardware[i].entry; i++)
{
--
1.7.9.1
#include stdio.h
#include debian-installer/system/subarch.h
int main(int argc, char **argv)
{
printf(di_system_subarch_analyze = %s\n, di_system_subarch_analyze());
printf(di_system_subarch_analyze_guess = %s\n, di_system_subarch_analyze_guess());
return 0;
}
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hello Ian, 2012/7/10 Ian Campbell i...@hellion.org.uk: Martin tells me this is necessary for d-i to pick the correct kernel while installing. I believe him ;-) Thanks for the patch, it looks fine to me, but incomplete for d-i. You need to add Dreamplug platform in debian-installer configuration (see installer/build/config/armel/kirkwood/* ) As soon as we get the configs patch, I'd like to apply your patches for next d-i build, unless someone thinks its a bad idea. Regards, -- Héctor Orón -.. . -... .. .- -. -.. . ...- . .-.. --- .--. . .-. -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/CAODfWeGzUcPcZcHmHfG85+pQwh8=A_B=yntzhvswxqxw5xj...@mail.gmail.com
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Wed, 2012-07-11 at 00:33 +0200, Hector Oron wrote: Hello Ian, 2012/7/10 Ian Campbell i...@hellion.org.uk: Martin tells me this is necessary for d-i to pick the correct kernel while installing. I believe him ;-) Thanks for the patch, it looks fine to me, but incomplete for d-i. You need to add Dreamplug platform in debian-installer configuration (see installer/build/config/armel/kirkwood/* ) Thanks for the pointer. I'll cook something up shortly... As soon as we get the configs patch, I'd like to apply your patches for next d-i build, unless someone thinks its a bad idea. Regards, -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1341959864.8586.128.ca...@hastur.hellion.org.uk
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
Hector Oron hector.o...@gmail.com (11/07/2012): Thanks for the patch, it looks fine to me, but incomplete for d-i. You need to add Dreamplug platform in debian-installer configuration (see installer/build/config/armel/kirkwood/* ) As soon as we get the configs patch, I'd like to apply your patches for next d-i build, unless someone thinks its a bad idea. I'm uploading d-i beta 1 as soon as mirrors see the recently migrated udeb producing packages. ACK for a commit right after that. Mraw, KiBi. signature.asc Description: Digital signature
Re: [GIT/PATCH] libdebian-installer: Add support for dreamplug
On Tue, 2012-07-10 at 16:37 -0600, Ian Campbell wrote: On Wed, 2012-07-11 at 00:33 +0200, Hector Oron wrote: Hello Ian, 2012/7/10 Ian Campbell i...@hellion.org.uk: Martin tells me this is necessary for d-i to pick the correct kernel while installing. I believe him ;-) Thanks for the patch, it looks fine to me, but incomplete for d-i. You need to add Dreamplug platform in debian-installer configuration (see installer/build/config/armel/kirkwood/* ) Thanks for the pointer. I'll cook something up shortly... Here we are (patch follow pull request). I've built it but not booted it... The following changes since commit 53e092b070c8279830855b7339f166b451dc5f27: Add Joy mentions to debian/copyright. (2012-07-10 15:50:04 -0600) are available in the git repository at: git://gitorious.org/ijc-debian/debian-installer.git dreamplug for you to fetch changes up to 1f963d2db046e804f3ced58904022b0446bfd66f: (armel) add Dreamplug images (2012-07-10 23:33:37 +) Ian Campbell (1): (armel) add Dreamplug images build/config/armel/kirkwood/netboot.cfg | 13 +++-- 1 files changed, 11 insertions(+), 2 deletions(-) From 1f963d2db046e804f3ced58904022b0446bfd66f Mon Sep 17 00:00:00 2001 From: Ian Campbell ian.campb...@citrix.com Date: Tue, 10 Jul 2012 23:33:37 + Subject: [PATCH] (armel) add Dreamplug images --- build/config/armel/kirkwood/netboot.cfg | 13 +++-- 1 files changed, 11 insertions(+), 2 deletions(-) diff --git a/build/config/armel/kirkwood/netboot.cfg b/build/config/armel/kirkwood/netboot.cfg index 1fc5eeb..4645dd8 100644 --- a/build/config/armel/kirkwood/netboot.cfg +++ b/build/config/armel/kirkwood/netboot.cfg @@ -1,8 +1,10 @@ MEDIA_TYPE = netboot image -TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd sheevaplug +TARGET = $(TEMP_INITRD) $(TEMP_KERNEL) openrd sheevaplug dreamplug EXTRANAME = $(MEDIUM) +TEMP_DTB = $(TEMP)/lib + # OpenRD openrd: mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/openrd @@ -18,7 +20,14 @@ sheevaplug: mkimage -A arm -O linux -T ramdisk -C gzip -a 0x0 -e 0x0 -n debian-installer ramdisk -d $(TEMP_INITRD) $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uImage Linux kernel for SheevaPlug update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/sheevaplug/uInitrd initrd for SheevaPlug - ln -s sheevaplug $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug + ln -nfs sheevaplug $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uImage Linux kernel for GuruPlug update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/guruplug/uInitrd initrd for GuruPlug +dreamplug: sheevaplug + mkdir -p $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug + cat $(TEMP_KERNEL) $(TEMP_DTB)/kirkwood-dreamplug.dtb $(TEMP)/vmlinuz-dreamplug + mkimage -A arm -O linux -T kernel -C none -a 0x8000 -e 0x8000 -n Debian kernel -d $(TEMP)/vmlinuz-dreamplug $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uImage + ln -nfs ../sheevaplug/uInitrd $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uInitrd + update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uImage Linux kernel for DreamPlug + update-manifest $(SOME_DEST)/$(EXTRANAME)/marvell/dreamplug/uInitrd initrd for DreamPlug -- 1.7.9.1 -- To UNSUBSCRIBE, email to debian-boot-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/1341963345.8586.131.ca...@hastur.hellion.org.uk
