Signed-off-by: Felix Fietkau <nbd@nbd.name>master
Felix Fietkau
8 years ago
parent
5b6b0aa267
commit
ad76fdfc8a
@ -0,0 +1,11 @@ |
||||
get_model_rb532() { |
||||
grep system\ type /proc/cpuinfo | awk -F ": " '{print $2}' |
||||
} |
||||
|
||||
do_sysinfo_rb532() { |
||||
mkdir -p /tmp/sysinfo |
||||
echo rb532 > /tmp/sysinfo/board_name |
||||
get_model_rb532 > /tmp/sysinfo/model |
||||
} |
||||
|
||||
boot_hook_add preinit_main do_sysinfo_rb532 |
||||
@ -0,0 +1,26 @@ |
||||
REQUIRE_IMAGE_METADATA=1 |
||||
RAMFS_COPY_BIN=/usr/sbin/nandwrite |
||||
CI_KERNPART=none |
||||
|
||||
platform_check_image() { |
||||
[ -e /dev/ubi0 ] || { |
||||
ubiattach -m 1 |
||||
sleep 1 |
||||
} |
||||
return 0; |
||||
} |
||||
|
||||
platform_pre_upgrade() { |
||||
nand_do_upgrade "$1" |
||||
} |
||||
|
||||
platform_nand_pre_upgrade() { |
||||
local board_name="$(cat /tmp/sysinfo/board_name)" |
||||
|
||||
mtd erase kernel |
||||
tar xf "$1" sysupgrade-$board_name/kernel -O | nandwrite -o /dev/mtd0 - |
||||
} |
||||
|
||||
platform_do_upgrade() { |
||||
default_do_upgrade "$ARGV" |
||||
} |
||||
@ -1,67 +0,0 @@ |
||||
#!/bin/sh |
||||
. /lib/functions.sh |
||||
|
||||
copy_kernel() { |
||||
local input="$1" |
||||
local output="$2" |
||||
local cmdline="$3" |
||||
size="$(echo -n "$cmdline" | wc -c)" |
||||
dd if="$input" bs=3M count=1 > "$output" |
||||
/sbin/patch-cmdline "$output" "$cmdline" |
||||
} |
||||
|
||||
fstype="$(mount | grep ' / ' | awk '$5 != "rootfs" {print $5}')" |
||||
case "$fstype" in |
||||
ext2|jffs2) echo "Copying from $fstype to yaffs2";; |
||||
*) echo "Invalid filesystem."; exit 1;; |
||||
esac |
||||
|
||||
[ -d /tmp/cf2nand ] && { |
||||
echo "/tmp/cf2nand already exists" |
||||
exit 1 |
||||
} |
||||
|
||||
mkdir /tmp/cf2nand |
||||
mkdir /tmp/cf2nand/rootfs |
||||
mount -t "$fstype" /dev/root /tmp/cf2nand/rootfs || { |
||||
echo "Mounting rootfs failed." |
||||
exit 1 |
||||
} |
||||
|
||||
boot="$(find_mtd_part 'Routerboard NAND boot')" |
||||
main="$(find_mtd_part 'rootfs')" |
||||
[ -z "$boot" -o -z "$main" ] && { |
||||
echo "Cannot find NAND Flash partitions" |
||||
exit 1 |
||||
} |
||||
|
||||
echo "Erasing filesystem..." |
||||
mtd erase Boot 2>/dev/null >/dev/null |
||||
mtd erase Main 2>/dev/null >/dev/null |
||||
|
||||
mkdir /tmp/cf2nand/p1 |
||||
mkdir /tmp/cf2nand/p2 |
||||
mount -t yaffs2 "$boot" /tmp/cf2nand/p1 |
||||
mount -t yaffs2 "$main" /tmp/cf2nand/p2 |
||||
|
||||
echo "Copying kernel..." |
||||
copy_kernel /dev/cfa1 /tmp/cf2nand/p1/kernel "root=/dev/mtdblock1 rootfstype=yaffs2 " 2>/dev/null >/dev/null |
||||
umount /tmp/cf2nand/p1 |
||||
rmdir /tmp/cf2nand/p1 |
||||
|
||||
echo "Copying filesystem..." |
||||
( cd /tmp/cf2nand/rootfs; tar c . ) | ( cd /tmp/cf2nand/p2; tar x ) |
||||
echo "chmod ugo+x /" > /tmp/cf2nand/p2/etc/uci-defaults/set_root_permission |
||||
sync |
||||
# Use kexec is present |
||||
[ -x /usr/bin/kexec ] && { |
||||
kexec -l /tmp/cf2nand/p1/kernel --command-line="$(cat /proc/cmdline) root=/dev/mtdblock1 rootfstype=yaffs2" |
||||
kexec -e |
||||
} |
||||
umount /tmp/cf2nand/p2 |
||||
rmdir /tmp/cf2nand/p2 |
||||
|
||||
umount /tmp/cf2nand/rootfs |
||||
rmdir /tmp/cf2nand/rootfs |
||||
rmdir /tmp/cf2nand |
||||
|
||||
@ -1,71 +0,0 @@ |
||||
#!/bin/sh |
||||
# wget2nand |
||||
# This script can be used to download a TGZ file from your build system which |
||||
# contains the files to be installed on the NAND flash on your RB1xx card. |
||||
# The one parameter is the URL of the TGZ file to be downloaded. |
||||
# Licence GPL V2 |
||||
# Author david.goodenough@linkchoose.co.uk |
||||
# Based on cf2nand from RB532 support |
||||
. /lib/functions.sh |
||||
|
||||
[ -d /tmp/wget2nand ] && { |
||||
echo "/tmp/wget2nand already exists" |
||||
exit 1 |
||||
} |
||||
|
||||
# first get an address for br-lan using udhcpc |
||||
killall udhcpc |
||||
/sbin/udhcpc -i br-lan |
||||
|
||||
# need to find the wget server from the command line |
||||
url=$1 |
||||
[ -z "$url" ] && { |
||||
echo "No URL specified for image TGZ" |
||||
echo "Usage : $0 URL" |
||||
exit 1 |
||||
} |
||||
|
||||
boot="$(find_mtd_part 'Routerboard NAND Boot')" |
||||
main="$(find_mtd_part 'rootfs')" |
||||
[ -z "$boot" -o -z "$main" ] && { |
||||
echo "Cannot find NAND Flash partitions" |
||||
exit 1 |
||||
} |
||||
|
||||
echo "Erasing filesystem." |
||||
mtd erase Boot 2>/dev/null >/dev/null |
||||
mtd erase Main 2>/dev/null >/dev/null |
||||
|
||||
echo "Mounting $main as new root and $boot as boot partition" |
||||
|
||||
mkdir /tmp/wget2nand/ |
||||
mkdir /tmp/wget2nand-boot |
||||
mount -t yaffs2 "$main" /tmp/wget2nand/ |
||||
mount -t yaffs2 "$boot" /tmp/wget2nand-boot |
||||
|
||||
echo "Copying filesystem..." |
||||
( wget -O - $url/openwrt-rb532-rootfs.tgz) | ( cd /tmp/wget2nand/; tar xvz ) |
||||
wget -O /tmp/wget2nand-boot/kernel $url/openwrt-rb532-vmlinux |
||||
|
||||
# No need to patch the kernel, this was done during the build process |
||||
chmod +x /tmp/wget2nand-boot/kernel |
||||
|
||||
# make sure everything is written before we unmount the partitions |
||||
echo "chmod ugo+x /" > /tmp/wget2nand/etc/uci-defaults/set_root_permission |
||||
sync |
||||
ls /tmp/wget2nand-boot/ |
||||
ls /tmp/wget2nand/ |
||||
# use kexec if present |
||||
[ -x /usr/bin/kexec ] && { |
||||
kexec -l /tmp/wget2nand-boot/kernel --command-line="$(cat /proc/cmdline) root=$main rootfstype=yaffs2" |
||||
kexec -e |
||||
} |
||||
|
||||
# unmount the partitions and remove the directories into which they were mounted |
||||
umount /tmp/wget2nand-boot |
||||
umount /tmp/wget2nand |
||||
rmdir /tmp/wget2nand-boot |
||||
rmdir /tmp/wget2nand |
||||
|
||||
# all done |
||||
echo "Image written, you can now reboot. Remember to change the boot source to Boot from Nand" |
||||
@ -0,0 +1,17 @@ |
||||
--- a/arch/mips/rb532/devices.c
|
||||
+++ b/arch/mips/rb532/devices.c
|
||||
@@ -199,11 +199,11 @@ static struct platform_device nand_slot0
|
||||
|
||||
static struct mtd_partition rb532_partition_info[] = {
|
||||
{
|
||||
- .name = "Routerboard NAND boot",
|
||||
+ .name = "kernel",
|
||||
.offset = 0,
|
||||
- .size = 4 * 1024 * 1024,
|
||||
+ .size = 8 * 1024 * 1024,
|
||||
}, {
|
||||
- .name = "rootfs",
|
||||
+ .name = "ubi",
|
||||
.offset = MTDPART_OFS_NXTBLK,
|
||||
.size = MTDPART_SIZ_FULL,
|
||||
}
|
||||
@ -1,11 +0,0 @@ |
||||
--- a/arch/mips/rb532/devices.c
|
||||
+++ b/arch/mips/rb532/devices.c
|
||||
@@ -203,7 +203,7 @@ static struct mtd_partition rb532_partit
|
||||
.offset = 0,
|
||||
.size = 4 * 1024 * 1024,
|
||||
}, {
|
||||
- .name = "rootfs",
|
||||
+ .name = "rootfs_onboard",
|
||||
.offset = MTDPART_OFS_NXTBLK,
|
||||
.size = MTDPART_SIZ_FULL,
|
||||
}
|
||||
Loading…
Reference in new issue