switch to new images

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

11 files changed, 161 insertions, 75 deletions

diff --git a/config/images/boot-vfat.config b/config/images/boot-vfat.config
new file mode 100644
index 0000000..4861fb6
--- /dev/null
+++ b/config/images/boot-vfat.config
@@ -0,0 +1,10 @@
+
+include("kernel.config")
+
+image @IMAGE@ {
+    vfat {
+        files = { @FILES@, kernel.img }
+    }
+    name = boot-vfat
+    size = 16M
+}
diff --git a/config/images/hdimage.config b/config/images/hdimage.config
new file mode 100644
index 0000000..7d566a9
--- /dev/null
+++ b/config/images/hdimage.config
@@ -0,0 +1,14 @@
+image @IMAGE@ {
+    hdimage {
+        align =1M
+    }
+    size = 100M
+    partition boot {
+        image = "boot.vfat"
+        partition-type = 0xC
+    }
+    partition root {
+        image = "root.ext2"
+        partition-type = 0x83
+    }
+}
diff --git a/config/images/kernel.config b/config/images/kernel.config
new file mode 100644
index 0000000..405798d
--- /dev/null
+++ b/config/images/kernel.config
@@ -0,0 +1,14 @@
+
+image kernel.img {
+    hdimage {
+        partition-table = false
+    }
+    partition header {
+        image = @HEADER@
+    }
+    partition kernel {
+        image = @KERNEL@
+    }
+    size = 5M
+}
+
diff --git a/platformconfig b/platformconfig
index 99ac3cd..05fe896 100644
--- a/platformconfig
+++ b/platformconfig
@@ -1,8 +1,8 @@
 #
 # Automatically generated make config: don't edit
-# PTXdist 2012.05.0-00085-g478405e
+# PTXdist 2012.07.0-00027-gc4e3bfd
 #
-PTXCONF_PLATFORMCONFIG_VERSION="2012.05.0-00085-g478405e"
+PTXCONF_PLATFORMCONFIG_VERSION="2012.07.0-00027-gc4e3bfd"
 PTXCONF_RUNTIME=y
 PTXCONF_BUILDTIME=y
 PTXCONF__platformconfig_MAGIC__=y
@@ -142,27 +142,13 @@ PTXCONF_FLASH_BLOCKSIZE="128k"
 #
 # image creation options        
 #
-# PTXCONF_IMAGE_ROOT_TGZ is not set
 PTXCONF_IMAGE_BOOT_VFAT=y
+PTXCONF_IMAGE_HDIMAGE=y
+# PTXCONF_IMAGE_BOOT_MLO_VFAT is not set
 # PTXCONF_IMAGE_CPIO is not set
 # PTXCONF_IMAGE_CPIO_GZ is not set
-PTXCONF_IMAGE_EXT2=y
-PTXCONF_IMAGE_EXT2_SIZE=102400
-PTXCONF_IMAGE_EXT2_EXTRA_ARGS=""
-# PTXCONF_IMAGE_EXT2_GZIP is not set
-# PTXCONF_IMAGE_EXT2_JOURNAL is not set
-PTXCONF_IMAGE_HD=y
-PTXCONF_IMAGE_HD_PART1=y
-PTXCONF_IMAGE_HD_PART1_START="2048"
-PTXCONF_IMAGE_HD_PART1_END="43007"
-PTXCONF_IMAGE_HD_PART1_TYPE="0x0C"
-PTXCONF_IMAGE_HD_PART2=y
-PTXCONF_IMAGE_HD_PART2_START="43008"
-PTXCONF_IMAGE_HD_PART2_END="247807"
-PTXCONF_IMAGE_HD_PART2_TYPE="0x83"
-# PTXCONF_IMAGE_HD_PART3 is not set
-PTXCONF_IMAGE_HD_PART1_CONTENT="${IMAGEDIR}/boot.vfat"
-PTXCONF_IMAGE_HD_PART2_CONTENT="${IMAGEDIR}/root.ext2"
+# PTXCONF_IMAGE_EXT2 is not set
+# PTXCONF_IMAGE_HD is not set
 # PTXCONF_IMAGE_VDI is not set
 
 #
@@ -182,20 +168,33 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y
 # PTXCONF_IMAGE_UBI is not set
 # PTXCONF_IMAGE_UBIFS is not set
 # PTXCONF_IMAGE_UIMAGE is not set
-PTXCONF_IMAGE_VFAT_TOOLS=y
+
+#
+# new image creation options    
+#
+# PTXCONF_IMAGE_BOOT_MLO is not set
+PTXCONF_IMAGE_ROOT_EXT=y
+PTXCONF_IMAGE_ROOT_EXT_SIZE="40M"
+# PTXCONF_IMAGE_ROOT_EXT_EXT2 is not set
+# PTXCONF_IMAGE_ROOT_EXT_EXT3 is not set
+PTXCONF_IMAGE_ROOT_EXT_EXT4=y
+PTXCONF_IMAGE_ROOT_EXT_TYPE="ext4"
+PTXCONF_IMAGE_ROOT_TGZ=y
 PTXCONF_CROSS_MODULE_INIT_TOOLS=y
 # PTXCONF_HOST_CDRKIT is not set
 # PTXCONF_HOST_CMAKE is not set
 # PTXCONF_HOST_CRAMFS is not set
-PTXCONF_HOST_DOSFSTOOLS=y
-# PTXCONF_HOST_E2FSPROGS is not set
+# PTXCONF_HOST_DOSFSTOOLS is not set
+PTXCONF_HOST_E2FSPROGS=y
 PTXCONF_HOST_GENEXT2FS=y
-PTXCONF_HOST_GENPART=y
+PTXCONF_HOST_GENIMAGE=y
+# PTXCONF_HOST_GENPART is not set
 # PTXCONF_HOST_LIBICONV is not set
 # PTXCONF_HOST_GETTEXT is not set
 # PTXCONF_HOST_LIBBLKID is not set
 # PTXCONF_HOST_LIBBZ2 is not set
 # PTXCONF_HOST_LIBCAP is not set
+PTXCONF_HOST_LIBCONFUSE=y
 # PTXCONF_HOST_LIBLZO is not set
 # PTXCONF_HOST_LIBUUID is not set
 # PTXCONF_HOST_LZOP is not set
diff --git a/platforms/image-boot-vfat.in b/platforms/image-boot-vfat.in
new file mode 100644
index 0000000..16ad52b
--- /dev/null
+++ b/platforms/image-boot-vfat.in
@@ -0,0 +1,9 @@
+## SECTION=image2
+
+config IMAGE_BOOT_VFAT
+	tristate
+	select HOST_GENIMAGE
+	select HOST_MTOOLS
+	prompt "Generate image/boot.vfat"
+	help
+	  FIXME
diff --git a/platforms/image-hdimage.in b/platforms/image-hdimage.in
new file mode 100644
index 0000000..3b4eb79
--- /dev/null
+++ b/platforms/image-hdimage.in
@@ -0,0 +1,10 @@
+## SECTION=image2
+
+config IMAGE_HDIMAGE
+	tristate
+	select HOST_GENIMAGE
+	select IMAGE_BOOT_VFAT
+	select IMAGE_ROOT_EXT
+	prompt "Generate images/hd.img"
+	help
+	  FIXME
diff --git a/platforms/image_boot_vfat.in b/platforms/image_boot_vfat.in
deleted file mode 100644
index 02e4723..0000000
--- a/platforms/image_boot_vfat.in
+++ /dev/null
@@ -1,8 +0,0 @@
-## SECTION=image
-
-config IMAGE_BOOT_VFAT
-	bool
-	select IMAGE_VFAT_TOOLS
-	select KERNEL
-	prompt "Generate images/boot.vfat"
-
diff --git a/rules/image-boot-vfat.make b/rules/image-boot-vfat.make
new file mode 100644
index 0000000..d7fa980
--- /dev/null
+++ b/rules/image-boot-vfat.make
@@ -0,0 +1,48 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_BOOT_VFAT) += image-boot-vfat
+
+#
+# Paths and names
+#
+IMAGE_BOOT_VFAT		:= image-boot-vfat
+IMAGE_BOOT_VFAT_DIR	:= $(BUILDDIR)/$(IMAGE_BOOT_VFAT)
+IMAGE_BOOT_VFAT_IMAGE	:= $(IMAGEDIR)/boot.vfat
+IMAGE_BOOT_VFAT_DATA	:= \
+	$(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/firmware/*.bin) \
+	$(wildcard $(PTXDIST_PLATFORMCONFIGDIR)/firmware/*.elf) \
+	$(PTXDIST_PLATFORMCONFIGDIR)/config.txt \
+	$(PTXDIST_PLATFORMCONFIGDIR)/cmdline.txt
+IMAGE_BOOT_VFAT_CONFIG	:= boot-vfat.config
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+define squote_and_comma
+$(subst $(ptx/def/space),$(comma) ,$(addsuffix $(ptx/def/squote),$(addprefix $(ptx/def/squote),$(1))))
+endef
+
+
+IMAGE_BOOT_VFAT_ENV := \
+	FILES="$(call squote_and_comma,$(IMAGE_BOOT_VFAT_DATA))" \
+	HEADER=$(PTXDIST_PLATFORMCONFIGDIR)/first32k.bin \
+	KERNEL=linuximage
+
+$(IMAGE_BOOT_VFAT_IMAGE):
+	@$(call targetinfo)
+	@$(call image/genimage, IMAGE_BOOT_VFAT)
+	@$(call finish)
+
+# vim: syntax=make
diff --git a/rules/image-hdimage.make b/rules/image-hdimage.make
new file mode 100644
index 0000000..f207037
--- /dev/null
+++ b/rules/image-hdimage.make
@@ -0,0 +1,33 @@
+# -*-makefile-*-
+#
+# Copyright (C) 2012 by Michael Olbrich <m.olbrich@pengutronix.de>
+#
+# See CREDITS for details about who has contributed to this project.
+#
+# For further information about the PTXdist project and license conditions
+# see the README file.
+#
+
+#
+# We provide this package
+#
+IMAGE_PACKAGES-$(PTXCONF_IMAGE_HDIMAGE) += image-hdimage
+
+#
+# Paths and names
+#
+IMAGE_HDIMAGE		:= image-hdimage
+IMAGE_HDIMAGE_DIR	:= $(BUILDDIR)/$(IMAGE_HDIMAGE)
+IMAGE_HDIMAGE_IMAGE	:= $(IMAGEDIR)/hd.img
+IMAGE_HDIMAGE_CONFIG	:= hdimage.config
+
+# ----------------------------------------------------------------------------
+# Image
+# ----------------------------------------------------------------------------
+
+$(IMAGE_HDIMAGE_IMAGE):
+	@$(call targetinfo)
+	@$(call image/genimage, IMAGE_HDIMAGE)
+	@$(call finish)
+
+# vim: syntax=make
diff --git a/rules/post/image_boot_vfat.make b/rules/post/image_boot_vfat.make
deleted file mode 100644
index 1683883..0000000
--- a/rules/post/image_boot_vfat.make
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-RPI_FIRMWARE_DIR := $(PTXDIST_PLATFORMCONFIGDIR)/firmware
-
-RPI_FIRMWARE := $(wildcard $(RPI_FIRMWARE_DIR)/*.bin $(RPI_FIRMWARE_DIR)/*.elf)
-
-$(IMAGEDIR)/boot.vfat.map: $(PTXDIST_PLATFORMCONFIGDIR)/rules/post/image_boot_vfat.make
-	@echo "$(IMAGEDIR)/kernel.img"					>  "$@"
-	@$(foreach firmware, $(RPI_FIRMWARE), echo "$(firmware)"	>> "$@";)
-	@echo "$(PTXDIST_PLATFORMCONFIGDIR)/config.txt"			>> "$@"
-	@echo "$(PTXDIST_PLATFORMCONFIGDIR)/cmdline.txt"		>> "$@"
-
-$(IMAGEDIR)/boot.vfat: $(PTXDIST_PLATFORMCONFIGDIR)/config.txt
-$(IMAGEDIR)/boot.vfat: $(IMAGEDIR)/kernel.img
-
-# 10MiB
-boot_VFAT_SIZE := 20971520
-
-ifdef PTXCONF_IMAGE_BOOT_VFAT
-images: $(IMAGEDIR)/boot.vfat
-endif
-
diff --git a/rules/post/image_kernel.make b/rules/post/image_kernel.make
deleted file mode 100644
index a369c61..0000000
--- a/rules/post/image_kernel.make
+++ /dev/null
@@ -1,13 +0,0 @@
-# -*-makefile-*-
-#
-# Copyright (C) 2011 by Michael Olbrich <m.olbrich@pengutronix.de>
-#
-# See CREDITS for details about who has contributed to this project.
-#
-# For further information about the PTXdist project and license conditions
-# see the README file.
-#
-
-$(IMAGEDIR)/kernel.img: $(IMAGEDIR)/linuximage
-	cat $(PTXDIST_PLATFORMCONFIGDIR)/first32k.bin $< > $@
-