6eb63019af
This board ships with an ancient 14.07-based OpenWrt using block2mtd, and the MBR partition table contains nonsense. It is possible to sysupgrade to an upstream OpenWrt image, but the legacy layout of the OpenWrt images start at 0xA00 in the eMMC, with a raw uImage. The legacy OpenWrt image doesn't "own" the beginning of the device, including the MBR and U-Boot. This means that when a user upgrades to upstream OpenWrt, it doesn't boot because it can't find the right partitions. So hard-code them on the kernel's command line using CONFIG_CMDLINE_PARTITION (for block). Additionally, the vendor firmware doesn't cope with images larger than about 36MiB, because it only overwrites the contents of its "firmware" MTD partition. The current layout of the legacy image wastes a lot of space, allowing over 32MiB for the kernel and another 10MiB for the FAT recovery file system which is only created as 3MiB. So pull those in to allow 4¾ MiB for the kernel, 3MiB for recovery, and then we have over 20MiB for the root file system. This doesn't affect the new images which ship with a full eMMC image including a different MBR layout and a partition for U-Boot, because our modern U-Boot can actually pass the command line to the kernel, and the built-in one doesn't get used anyway. Tested by upgrading from vendor OpenWrt to the current legacy image, from legacy to itself, to the previous legacy layout, and then to finally the full-system image. This commit probably wants backporting to 19.07, which also doesn't install over the vendor OpenWrt and doesn't even have a full-system installation option. Signed-off-by: David Woodhouse <dwmw2@infradead.org>
31 lines
1.0 KiB
Bash
Executable File
31 lines
1.0 KiB
Bash
Executable File
#!/bin/sh
|
|
#
|
|
# This script is used only to create the "legacy" image for UniElec U7623,
|
|
# suitable for upgrading from the vendor OpenWrt or from OpenWrt 19.07.
|
|
#
|
|
OUTPUT_FILE=$1
|
|
KERNEL_FILE=$2
|
|
RECOVERY_FILE=$3
|
|
ROOTFS_FILE=$4
|
|
|
|
BS=512
|
|
|
|
# These two offsets are relative to the absolute location of the kernel on the mmc
|
|
# (0xA00), so their position in the image is -2560 blocks
|
|
#
|
|
# They must be kept in sync with the default command line for U7623.
|
|
# blkdevparts=mmcblk0:3M@6M(recovery),256M@9M(root)"
|
|
#
|
|
# For upgrading from the vendor firmware, the total image must fit in its
|
|
# MTD 'firmware' partition, which is typically 36MiB.
|
|
|
|
# In the legacy image, the uImage starts at block 0xa00. Allow 4864 KiB (9728) blocks.
|
|
RECOVERY_OFFSET=9728
|
|
# The recovery image is 3MiB, or 6144 blocks.
|
|
ROOTFS_OFFSET=15872
|
|
|
|
dd bs="$BS" of="$OUTPUT_FILE" if="$KERNEL_FILE"
|
|
dd bs="$BS" of="$OUTPUT_FILE" if="$RECOVERY_FILE" seek="$RECOVERY_OFFSET"
|
|
dd bs="$BS" of="$OUTPUT_FILE" if="$ROOTFS_FILE" seek="$ROOTFS_OFFSET"
|
|
dd if=/dev/zero of="$OUTPUT_FILE" bs=128k count=1 oflag=append conv=notrunc
|