1
0
mirror of git://projects.qi-hardware.com/ben-wpan.git synced 2024-12-23 03:45:11 +02:00

Merge branch 'master' of projects.qi-hardware.com:ben-wpan

This commit is contained in:
Werner Almesberger 2012-01-27 14:13:48 -03:00
commit 762d33cf5d
4 changed files with 44 additions and 19 deletions

View File

@ -14,7 +14,7 @@
cd qi-kernel
git checkout ben-wpan
cp ../ben-wpan-config-2.6.38 .config
patch -p1 -s <../openwrt-preinit-hack.patch
patch -p1 -s < ../qi_lb60-NAND-add-data-partition.patch
OWRT make ARCH=mips CROSS_COMPILE=mipsel-openwrt-linux- vmlinux.bin
Jlime make ARCH=mips CROSS_COMPILE=mipsel-linux- vmlinux.bin
gzip -9 -f arch/mips/boot/vmlinux.bin
@ -32,6 +32,12 @@
3. Install the kernel
Using u-boot without reflash:
- set up TCP/IP networking with the Ben
- copy uImage to Ben /boot/uImage
- hold F4 when poweron
Using usbboot:
- remove battery and USB
@ -67,8 +73,12 @@
- connect to the Ben
ssh $NN
- run the following commands:
OWRT opkg update
OWRT opkg install ip
OWRT opkg install ldconfig
OWRT opkg install libnl-1
OWRT opkg install lowpan-tools
OWRT opkg install dirtpan
mkdir -p /usr/local/var/run
exit
@ -77,8 +87,6 @@
wget http://www.infradead.org/~tgr/libnl/files/libnl-1.1.tar.gz
tar xfz libnl-1.1.tar.gz
cd libnl-1.1
OWRT gcc=`readlink -f \`which mipsel-openwrt-linux-gcc\``
OWRT ./configure --prefix=${gcc%/bin/*} --host=mipsel-openwrt-linux
Jlime patch -p1 -s <../libnl-1.1-limits.patch
Jlime inc=`mipsel-linux-cpp -v </dev/null 2>&1 | grep usr/include | tr -d \ `
Jlime ./configure --prefix=${inc%/include} --host=mipsel-linux
@ -93,7 +101,6 @@
git clone git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee
cd linux-zigbee
OWRT ./autogen.sh --host=mipsel-openwrt-linux
JLime ./autogen.sh --host=mipsel-linux
make
@ -110,8 +117,6 @@
cp lowpan-tools-0.2.2/include/ieee802154.h tools/dirtpan/
cd ben-wpan/tools
OWRT make TARGET=ben_openwrt
OWRT make -C dirtpan TARGET=ben_openwrt
JLime make TARGET=ben_jlime
JLime make -C dirtpan TARGET=ben_jlime
scp dirtpan/dirtpan $NN:/usr/sbin

View File

@ -14,11 +14,12 @@
2. Set up the user space
# iproute - probably already installed
aptiude install libnl1
aptitude install libnl1
mkdir -p /usr/local/var/run
3. Build the user space tools of the linux-zigbee project
aptitude install libnl-dev
git clone git://linux-zigbee.git.sourceforge.net/gitroot/linux-zigbee/linux-zigbee
cd linux-zigbee
./autogen.sh

View File

@ -1,12 +0,0 @@
diff --git qi-kernel.orig/init/main.c qi-kernel/init/main.c
index 33c37c3..7be645f 100644
--- a/init/main.c
+++ b/init/main.c
@@ -852,6 +852,7 @@ static noinline int init_post(void)
printk(KERN_WARNING "Failed to execute %s. Attempting "
"defaults...\n", execute_command);
}
+ run_init_process("/etc/preinit");
run_init_process("/sbin/init");
run_init_process("/etc/init");
run_init_process("/bin/init");

View File

@ -0,0 +1,31 @@
From 1878b22649c3ecde1795d6695b92ca02fa9110c2 Mon Sep 17 00:00:00 2001
From: Xiangfu Liu <xiangfu@macbook.(none)>
Date: Fri, 19 Aug 2011 15:46:52 +0800
Subject: [PATCH 23/29] qi_lb60: NAND: add data partition
---
arch/mips/jz4740/board-qi_lb60.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/arch/mips/jz4740/board-qi_lb60.c b/arch/mips/jz4740/board-qi_lb60.c
index b622941..0bc4caa 100644
--- a/arch/mips/jz4740/board-qi_lb60.c
+++ b/arch/mips/jz4740/board-qi_lb60.c
@@ -118,8 +118,13 @@ static struct mtd_partition qi_lb60_partitions_2gb[] = {
{
.name = "NAND ROOTFS partition",
.offset = 8 * 0x100000,
- .size = (504 + 512 + 1024) * 0x100000,
+ .size = 512 * 0x100000,
},
+ {
+ .name = "NAND DATA partition",
+ .offset = 520 * 0x100000,
+ .size = 1528 * 0x100000,
+ },
};
static void qi_lb60_nand_ident(struct platform_device *pdev,
--
1.7.4.1