From 1b79b41fd8edb06d09e3b3f79516f158c1cdfcff Mon Sep 17 00:00:00 2001 From: Manuel Traut Date: Tue, 24 May 2011 10:00:25 +0200 Subject: ubi fixes, lwn update Signed-off-by: Manuel Traut --- beagle/debian-rfs/etc/hostname | 1 - beagle/debian-rfs/etc/resolv.conf | 4 +++- beagle/debian-rfs/var/lib/dpkg/status | 1 - beagle/ubi.sh | 11 +++++++++++ beagle/uboot.txt | 3 ++- 5 files changed, 16 insertions(+), 4 deletions(-) delete mode 100644 beagle/debian-rfs/etc/hostname (limited to 'beagle') diff --git a/beagle/debian-rfs/etc/hostname b/beagle/debian-rfs/etc/hostname deleted file mode 100644 index c9133b5..0000000 --- a/beagle/debian-rfs/etc/hostname +++ /dev/null @@ -1 +0,0 @@ -deepthought diff --git a/beagle/debian-rfs/etc/resolv.conf b/beagle/debian-rfs/etc/resolv.conf index 07ee6e3..8ea6f32 100644 --- a/beagle/debian-rfs/etc/resolv.conf +++ b/beagle/debian-rfs/etc/resolv.conf @@ -1,3 +1,5 @@ +# Generated by dhcpcd from wlan0 +# /etc/resolv.conf.head can replace this line domain traut -search traut nameserver 10.0.3.10 +# /etc/resolv.conf.tail can replace this line diff --git a/beagle/debian-rfs/var/lib/dpkg/status b/beagle/debian-rfs/var/lib/dpkg/status index a16559a..80b37dc 100644 --- a/beagle/debian-rfs/var/lib/dpkg/status +++ b/beagle/debian-rfs/var/lib/dpkg/status @@ -1,4 +1,3 @@ Package: dpkg Version: 1.15.8.10 -Maintainer: unknown Status: install ok installed diff --git a/beagle/ubi.sh b/beagle/ubi.sh index 9129115..5e0c87f 100644 --- a/beagle/ubi.sh +++ b/beagle/ubi.sh @@ -9,6 +9,7 @@ cp -a /bin /dev /etc /home /lib /media /mnt /opt /root /sbin /usr /var /target/ mkdir /target/sys mkdir /target/proc mkdir /target/tmp +mkdir /target/selinux df -h rootfs 1.3G 147M 1.1G 12% / @@ -19,3 +20,13 @@ reboot # uboot kernelcmdline # setenv bootargs console=ttyO2,115200n8 ubi.mtd=4 root=ubi0:rootfs rootfstype=ubifs + +# kernel in ubi +ubimkvol /dev/ubi1 -N kernel -t static -m +ubiupdatevol /dev/ubi1_0 /media/uImage.ubi + +# uboot +# setenv mtdparts mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs) +ubi part kernel +ubi read ${loadaddr} kernel + diff --git a/beagle/uboot.txt b/beagle/uboot.txt index 5ad36bf..4b58a4c 100644 --- a/beagle/uboot.txt +++ b/beagle/uboot.txt @@ -1,6 +1,7 @@ setenv loadaddr 0x80200000 mmc init -fatload mmc1 1 ${loadaddr} uimage +mmc rescan 0 +fatload mmc 0 ${loadaddr} uimage.ubi setenv bootargs console=ttyO2,115200n8 root=/dev/mmcblk0p2 rootwait init=/bin/bash -- cgit v1.2.3