Simplify image/Makefile by using the new perl script for RedBoot.
Signed-off-by: Álvaro Fernández Rojas <nolt...@gmail.com>
---
v2: fix livebox (redboot) image generation.
target/linux/brcm63xx/image/Makefile | 20 +++++---------------
target/linux/brcm63xx/image/redbootscript.template | 15 ---------------
2 files changed, 5 insertions(+), 30 deletions(-)
delete mode 100644 target/linux/brcm63xx/image/redbootscript.template
diff --git a/target/linux/brcm63xx/image/Makefile
b/target/linux/brcm63xx/image/Makefile
index 98d1452..b9f2c22 100755
--- a/target/linux/brcm63xx/image/Makefile
+++ b/target/linux/brcm63xx/image/Makefile
@@ -100,21 +100,11 @@ define Image/Build/RedBootDTB
dd if=$(KDIR)/root.squashfs
of="$(BIN_DIR)/$(IMG_PREFIX)-$(2)-root.squashfs" bs=64k conv=sync
echo -ne \\xDE\\xAD\\xC0\\xDE >>
"$(BIN_DIR)/$(IMG_PREFIX)-$(2)-root.squashfs"
# Generate the scripted image
- $(CP) ./redbootscript.template $(BIN_DIR)/redbootscript
- let \
- kernellen="$$$$(stat -c%s
$(BIN_DIR)/$(IMG_PREFIX)-$(2)-vmlinux.gz)" \
- rootfsdatalen="$$$$(stat -c %s
$(BIN_DIR)/$(IMG_PREFIX)-$(2)-root.squashfs)" \
- rootfsaddr="0xBE430000 + kernellen" \
- rootfslen="0xBEBF0000 - rootfsaddr" \
- offset2="0x1000 + kernellen"; \
- $(SED) "s,%loadaddr,$(strip $(LOADADDR)),g" \
- -e "s,%kernellen,$$$$(printf '%#x' $$$$kernellen),g" \
- -e "s,%offset2,$$$$(printf '%#x' $$$$offset2),g" \
- -e "s,%rootfsdatalen,$$$$(printf '%#x'
$$$$rootfsdatalen),g" \
- -e "s,%rootfsaddr,$$$$(printf '%#x' $$$$rootfsaddr),g" \
- -e "s,%rootfslen,$$$$(printf '%#x' $$$$rootfslen),g" \
- "$(BIN_DIR)/redbootscript"
-
+ $(TOPDIR)/scripts/redboot-script.pl \
+ -k $(BIN_DIR)/$(IMG_PREFIX)-$(2)-vmlinux.gz \
+ -r $(BIN_DIR)/$(IMG_PREFIX)-$(2)-root.squashfs \
+ -a $(strip $(LOADADDR)) -f 0xbe430000 -l 0x7c0000 \
+ -s 0x1000 -t 20 -o $(BIN_DIR)/redbootscript
dd if="$(BIN_DIR)/redbootscript" of="$(BIN_DIR)/redbootscript.padded"
bs=4096 conv=sync
cat \
"$(BIN_DIR)/redbootscript.padded" \
diff --git a/target/linux/brcm63xx/image/redbootscript.template
b/target/linux/brcm63xx/image/redbootscript.template
deleted file mode 100644
index a007c84..0000000
--- a/target/linux/brcm63xx/image/redbootscript.template
+++ /dev/null
@@ -1,15 +0,0 @@
-fis init -f
-
-fconfig boot_script true
-fconfig boot_script_data
-fis load -b %loadaddr -d kernel
-exec -c "noinitrd" %loadaddr
-
-
-fconfig boot_script_timeout 20
-
-fis create -o 0x1000 -f 0xBE430000 -l %kernellen kernel
-
-fis create -o %offset2 -s %rootfsdatalen -f %rootfsaddr -l %rootfslen rootfs
-
-reset
--
1.9.1
_______________________________________________
openwrt-devel mailing list
openwrt-devel@lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
