diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2017-02-19 13:43:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2017-02-23 03:09:27 +0100 |
| commit | 0fdcbb4efc907387aef61f79d1b35679eb38f00e (patch) | |
| tree | 6eee4d46eae5a8f2afc6e49df459e36c88e1458b | |
| parent | c0201ae0fe67e757bd77af4eade95a214d8ae6ee (diff) | |
fallback to generic genimage config, the size of partition and filesystem still need to be made configurable
| -rw-r--r-- | adk/genimage/genimage-dual.cfg | 23 | ||||
| -rw-r--r-- | adk/genimage/genimage.cfg | 17 | ||||
| -rw-r--r-- | mk/image.mk | 8 | ||||
| -rw-r--r-- | target/x86_64/qemu-x86_64/genimage-dual.cfg | 2 | ||||
| -rw-r--r-- | target/x86_64/qemu-x86_64/genimage.cfg | 1 |
5 files changed, 50 insertions, 1 deletions
diff --git a/adk/genimage/genimage-dual.cfg b/adk/genimage/genimage-dual.cfg new file mode 100644 index 000000000..80ea64a84 --- /dev/null +++ b/adk/genimage/genimage-dual.cfg @@ -0,0 +1,23 @@ +image disk.img { + + hdimage { + } + + partition root1 { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition root2 { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/adk/genimage/genimage.cfg b/adk/genimage/genimage.cfg new file mode 100644 index 000000000..9e17390b1 --- /dev/null +++ b/adk/genimage/genimage.cfg @@ -0,0 +1,17 @@ +image disk.img { + + hdimage { + } + + partition root { + partition-type = 0x83 + image = "rootfs.ext" + size = 64M + } + + partition cfgfs { + partition-type = 0x88 + image = "cfgfs.img" + } + +} diff --git a/mk/image.mk b/mk/image.mk index f3ebcf50f..e0851418e 100644 --- a/mk/image.mk +++ b/mk/image.mk @@ -293,6 +293,12 @@ ${FW_DIR}/${ROOTFSISO}: ${TARGET_DIR} kernel-package -c boot/syslinux/boot.cat -no-emul-boot \ -boot-load-size 4 -boot-info-table ${TARGET_DIR} +ifeq (,$(wildcard $(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_GENIMAGE_FILENAME))) +GENCFG:=$(ADK_TOPDIR)/adk/genimage/$(ADK_TARGET_GENIMAGE_FILENAME) +else +GENCFG:=$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_GENIMAGE_FILENAME) +endif + ${FW_DIR}/${GENIMAGE}: ${TARGET_DIR} kernel-package @rm -rf ${FW_DIR}/temp @mkdir -p ${FW_DIR}/temp @@ -312,7 +318,7 @@ endif -d "$(TARGET_DIR)" \ -o $(FW_DIR)/rootfs.ext $(MAKE_TRACE) PATH='${HOST_PATH}' genimage \ - --config "$(ADK_TOPDIR)/target/$(ADK_TARGET_ARCH)/$(ADK_TARGET_SYSTEM)/$(ADK_TARGET_GENIMAGE_FILENAME)" \ + --config "$(GENCFG)" \ --tmppath "${FW_DIR}/temp" \ --rootpath "$(TARGET_DIR)" \ --inputpath "$(FW_DIR)" \ diff --git a/target/x86_64/qemu-x86_64/genimage-dual.cfg b/target/x86_64/qemu-x86_64/genimage-dual.cfg index 82d6dc2c2..647a2bcb5 100644 --- a/target/x86_64/qemu-x86_64/genimage-dual.cfg +++ b/target/x86_64/qemu-x86_64/genimage-dual.cfg @@ -19,11 +19,13 @@ image disk.img { partition root1 { partition-type = 0x83 image = "rootfs.ext" + size = 64M } partition root2 { partition-type = 0x83 image = "rootfs.ext" + size = 64M } partition cfgfs { diff --git a/target/x86_64/qemu-x86_64/genimage.cfg b/target/x86_64/qemu-x86_64/genimage.cfg index 0b8992731..d86f7ffd7 100644 --- a/target/x86_64/qemu-x86_64/genimage.cfg +++ b/target/x86_64/qemu-x86_64/genimage.cfg @@ -19,6 +19,7 @@ image disk.img { partition root { partition-type = 0x83 image = "rootfs.ext" + size = 64M } partition cfgfs { |