| developer | 20d6771 | 2022-03-02 14:09:32 +0800 | [diff] [blame^] | 1 | diff --git a/scripts/mkits.sh b/scripts/mkits.sh |
| 2 | index 42a8818..9cb1407 100755 |
| 3 | --- a/scripts/mkits.sh |
| 4 | +++ b/scripts/mkits.sh |
| 5 | @@ -72,27 +72,27 @@ ARCH_UPPER=$(echo "$ARCH" | tr '[:lower:]' '[:upper:]') |
| 6 | # Conditionally create fdt information |
| 7 | if [ -n "${DTB}" ]; then |
| 8 | FDT_NODE=" |
| 9 | - fdt@$FDTNUM { |
| 10 | + fdt-$FDTNUM { |
| 11 | description = \"${ARCH_UPPER} OpenWrt ${DEVICE} device tree blob\"; |
| 12 | data = /incbin/(\"${DTB}\"); |
| 13 | type = \"flat_dt\"; |
| 14 | arch = \"${ARCH}\"; |
| 15 | compression = \"none\"; |
| 16 | - hash@1 { |
| 17 | + hash-1 { |
| 18 | algo = \"crc32\"; |
| 19 | }; |
| 20 | - hash@2 { |
| 21 | + hash-2 { |
| 22 | algo = \"sha1\"; |
| 23 | }; |
| 24 | }; |
| 25 | " |
| 26 | - FDT_PROP="fdt = \"fdt@$FDTNUM\";" |
| 27 | + FDT_PROP="fdt = \"fdt-$FDTNUM\";" |
| 28 | fi |
| 29 | |
| 30 | # Conditionally create script information |
| 31 | if [ -n "${UBOOT_SCRIPT}" ]; then |
| 32 | SCRIPT="\ |
| 33 | - script@1 { |
| 34 | + script-1 { |
| 35 | description = \"U-Boot Script\"; |
| 36 | data = /incbin/(\"${UBOOT_SCRIPT}\"); |
| 37 | type = \"script\"; |
| 38 | @@ -101,16 +101,16 @@ if [ -n "${UBOOT_SCRIPT}" ]; then |
| 39 | load = <0>; |
| 40 | entry = <0>; |
| 41 | compression = \"none\"; |
| 42 | - hash@1 { |
| 43 | + hash-1 { |
| 44 | algo = \"crc32\"; |
| 45 | }; |
| 46 | - hash@2 { |
| 47 | + hash-2 { |
| 48 | algo = \"sha1\"; |
| 49 | }; |
| 50 | };\ |
| 51 | " |
| 52 | LOADABLES="\ |
| 53 | - loadables = \"script@1\";\ |
| 54 | + loadables = \"script-1\";\ |
| 55 | " |
| 56 | SIGN_IMAGES="\ |
| 57 | sign-images = \"fdt\", \"kernel\", \"loadables\";\ |
| 58 | @@ -147,7 +147,7 @@ DATA="/dts-v1/; |
| 59 | #address-cells = <1>; |
| 60 | |
| 61 | images { |
| 62 | - kernel@1 { |
| 63 | + kernel-1 { |
| 64 | description = \"${ARCH_UPPER} OpenWrt Linux-${VERSION}\"; |
| 65 | data = /incbin/(\"${KERNEL}\"); |
| 66 | type = \"kernel\"; |
| 67 | @@ -156,10 +156,10 @@ DATA="/dts-v1/; |
| 68 | compression = \"${COMPRESS}\"; |
| 69 | load = <${LOAD_ADDR}>; |
| 70 | entry = <${ENTRY_ADDR}>; |
| 71 | - hash@1 { |
| 72 | + hash-1 { |
| 73 | algo = \"crc32\"; |
| 74 | }; |
| 75 | - hash@2 { |
| 76 | + hash-2 { |
| 77 | algo = \"sha1\"; |
| 78 | }; |
| 79 | }; |
| 80 | @@ -173,7 +173,7 @@ ${SCRIPT} |
| 81 | description = \"OpenWrt\"; |
| 82 | ${FIT_AR_VER} |
| 83 | ${LOADABLES} |
| 84 | - kernel = \"kernel@1\"; |
| 85 | + kernel = \"kernel-1\"; |
| 86 | ${FDT_PROP} |
| 87 | ${SIGNATURE} |
| 88 | }; |
| 89 | diff --git a/include/image-commands.mk b/include/image-commands.mk |
| 90 | index 51e7459..5a3f624 100644 |
| 91 | --- a/include/image-commands.mk |
| 92 | +++ b/include/image-commands.mk |
| 93 | @@ -202,7 +202,7 @@ define Build/fit |
| 94 | $(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \ |
| 95 | -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ |
| 96 | $(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \ |
| 97 | - -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config@1") \ |
| 98 | + -c $(if $(DEVICE_DTS_CONFIG),$(DEVICE_DTS_CONFIG),"config-1") \ |
| 99 | -A $(LINUX_KARCH) -v $(LINUX_VERSION) |
| 100 | PATH=$(LINUX_DIR)/scripts/dtc:$(PATH) mkimage -f $@.its $@.new |
| 101 | @mv $@.new $@ |