Skip to content

Commit

Permalink
in-memory is no longer supported - push firmware never needed it as i…
Browse files Browse the repository at this point in the history
…t flashes .image files - if you still flash with windows use eva-tools to convert
  • Loading branch information
fda77 committed Aug 17, 2020
1 parent 91abdc3 commit d2bd1d2
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 35 deletions.
25 changes: 0 additions & 25 deletions config/ui/fwmod.in
Expand Up @@ -91,31 +91,6 @@ menu "Firmware packaging (fwmod) options"
Freetz-NG for the 1st time.
If you plan to flash by the bootloader, this option isn't needed.

config FREETZ_FWMOD_CREATE_IN_MEMORY_IMAGE
bool "Create in-memory image file"
depends on ! FREETZ_FWMOD_SKIP_PACK
depends on !FREETZ_SYSTEM_TYPE_MULTICORE && FREETZ_AVM_HAS_SEPARATE_FILESYSTEM_IMAGE
default n
help
Creates a so-called in-memory or ram image suitable to be loaded
into the box memory by bootloader and used to boot and flash the
box from there.

On NAND devices this procedure (booting from the in-memory image)
corresponds to a regular recovery process. Every image (original
and a modified one) automatically detects the location it has been
started from: 1) flash memory partitions, or 2) box memory (RAM).
In the 2nd case instead of just running the image as in the 1st one
it flashes itself into the flash memory partitions marked as being
active (linux_fs_start urlader variable).

Flash by the bootloader does no signature checks and that's why this
method should be used for modifying a Fritz!Box for the first time.

The required flash scripts and a detailled description could be
found in the 'eva_tools' directory of the YourFritz repository:
https://github.com/PeterPawn/YourFritz/tree/master/eva_tools

config FREETZ_FWMOD_USBROOT
bool "Pack file system into archive (USB root mode)"
default n
Expand Down
11 changes: 1 addition & 10 deletions fwmod
Expand Up @@ -2025,18 +2025,9 @@ if [ "$DO_PACK" -gt 0 ]; then
[ -r "$PACKAGES_LIST_FILE" ] && cp "$PACKAGES_LIST_FILE" "$FIRMWARE_MOD_DIR/var"
fi

# Set img_name for in-memory, pack, sign & link
# Set img_name for pack, sign & link
img_name="${FW_IMAGES_DIR:-$DIR}/${modstring}.image"

# Create in-memory image
if [ "${FREETZ_FWMOD_CREATE_IN_MEMORY_IMAGE}" == "y" ]; then
echo0 "creating in-memory image ${img_name}.in-memory"
{
cat "$KERNEL_MOD" | dd bs=256 conv=sync 2>/dev/null;
cat "$FILESYSTEM_MOD" | dd bs=256 conv=sync 2>/dev/null;
} > "${img_name}.in-memory"
fi

# Pack firmware image
echo0 "packing ${img_name}"
if [ -e "$FIRMWARE_MOD_DIR/var/firmware-update.uimg" ]; then
Expand Down

0 comments on commit d2bd1d2

Please sign in to comment.