diff options
| -rw-r--r-- | configs/platform-ti/config/images/sd.config | 15 | ||||
| -rw-r--r-- | configs/platform-ti/platformconfig | 43 | ||||
| -rw-r--r-- | configs/platform-ti/platforms/image-sd.in | 10 | ||||
| -rw-r--r-- | configs/platform-ti/platforms/image_hd_content.in | 22 | ||||
| -rw-r--r-- | configs/platform-ti/rules/image-sd.make | 34 | ||||
| -rw-r--r-- | configs/ptxconfig | 13 |
6 files changed, 90 insertions, 47 deletions
diff --git a/configs/platform-ti/config/images/sd.config b/configs/platform-ti/config/images/sd.config new file mode 100644 index 0000000..1b914c5 --- /dev/null +++ b/configs/platform-ti/config/images/sd.config @@ -0,0 +1,15 @@ +image @IMAGE@ { + hdimage { + align = 1M + } + size = 512M + partition boot { + image = boot-mlo.vfat + partition-type = 0x0C + bootable = true + } + partition root { + image = root.ext2 + partition-type = 0x83 + } +} diff --git a/configs/platform-ti/platformconfig b/configs/platform-ti/platformconfig index f427356..34129d9 100644 --- a/configs/platform-ti/platformconfig +++ b/configs/platform-ti/platformconfig @@ -1,8 +1,8 @@ # # Automatically generated make config: don't edit -# PTXdist 2012.06.0-00017-g89fbba7 +# PTXdist 2012.07.0-00008-gbf784fd-dirty # -PTXCONF_PLATFORMCONFIG_VERSION="2012.06.0-00017-g89fbba7" +PTXCONF_PLATFORMCONFIG_VERSION="2012.07.0-00008-gbf784fd-dirty" PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y PTXCONF__platformconfig_MAGIC__=y @@ -156,27 +156,11 @@ PTXCONF_FLASH_BLOCKSIZE="128k" # # image creation options # -PTXCONF_IMAGE_BOOT_MLO_VFAT=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=271360 -PTXCONF_IMAGE_EXT2_EXTRA_ARGS="-i 32768" -# PTXCONF_IMAGE_EXT2_GZIP is not set -PTXCONF_IMAGE_EXT2_JOURNAL=y -PTXCONF_IMAGE_EXT2_EXT4=y -PTXCONF_IMAGE_HD=y -PTXCONF_IMAGE_HD_PART1=y -PTXCONF_IMAGE_HD_PART1_START="2048" -PTXCONF_IMAGE_HD_PART1_END="22527" -PTXCONF_IMAGE_HD_PART1_TYPE="0x0C" -PTXCONF_IMAGE_HD_PART2=y -PTXCONF_IMAGE_HD_PART2_START="22528" -PTXCONF_IMAGE_HD_PART2_END="1071103" -PTXCONF_IMAGE_HD_PART2_TYPE="0x83" -# PTXCONF_IMAGE_HD_PART3 is not set -PTXCONF_IMAGE_HD_PART1_CONTENT="${IMAGEDIR}/boot-mlo.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 # @@ -200,6 +184,19 @@ PTXCONF_IMAGE_KERNEL_INSTALL_EARLY=y # 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=y +PTXCONF_IMAGE_ROOT_EXT=y +PTXCONF_IMAGE_ROOT_EXT_SIZE="256M" +# 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_IMAGE_SD=y PTXCONF_CROSS_MODULE_INIT_TOOLS=y # PTXCONF_HOST_CDRKIT is not set # PTXCONF_HOST_CMAKE is not set @@ -207,12 +204,14 @@ PTXCONF_CROSS_MODULE_INIT_TOOLS=y PTXCONF_HOST_DOSFSTOOLS=y 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=y # PTXCONF_HOST_LIBUUID is not set PTXCONF_HOST_LZOP=y diff --git a/configs/platform-ti/platforms/image-sd.in b/configs/platform-ti/platforms/image-sd.in new file mode 100644 index 0000000..0c37f8e --- /dev/null +++ b/configs/platform-ti/platforms/image-sd.in @@ -0,0 +1,10 @@ +## SECTION=image2 + +config IMAGE_SD + tristate + select HOST_GENIMAGE + select IMAGE_BOOT_MLO + select IMAGE_ROOT_EXT + prompt "Generate images/sd.hdimg" + help + FIXME diff --git a/configs/platform-ti/platforms/image_hd_content.in b/configs/platform-ti/platforms/image_hd_content.in deleted file mode 100644 index 920776a..0000000 --- a/configs/platform-ti/platforms/image_hd_content.in +++ /dev/null @@ -1,22 +0,0 @@ -## SECTION=image - -config IMAGE_HD_PART1_CONTENT - string - depends on IMAGE_HD_PART1 - default "${IMAGEDIR}/boot-mlo.vfat" - -config IMAGE_HD_PART2_CONTENT - string - depends on IMAGE_HD_PART2 - default "${IMAGEDIR}/root.ext2" - -config IMAGE_HD_PART3_CONTENT - string - depends on IMAGE_HD_PART3 - default "" - -config IMAGE_HD_PART4_CONTENT - string - depends on IMAGE_HD_PART4 - default "" - diff --git a/configs/platform-ti/rules/image-sd.make b/configs/platform-ti/rules/image-sd.make new file mode 100644 index 0000000..d81f42d --- /dev/null +++ b/configs/platform-ti/rules/image-sd.make @@ -0,0 +1,34 @@ +# -*-makefile-*- +# +# Copyright (C) 2012 by Jan Luebbe <jlu@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_SD) += image-sd + +# +# Paths and names +# +IMAGE_SD := image-sd +IMAGE_SD_DIR := $(BUILDDIR)/$(IMAGE_SD) +IMAGE_SD_IMAGE := $(IMAGEDIR)/sd.hdimg +IMAGE_SD_FILES := $(IMAGEDIR)/root.tgz +IMAGE_SD_CONFIG := sd.config + +# ---------------------------------------------------------------------------- +# Image +# ---------------------------------------------------------------------------- + +$(IMAGE_SD_IMAGE): + @$(call targetinfo) + @$(call image/genimage, IMAGE_SD) + @$(call finish) + +# vim: syntax=make diff --git a/configs/ptxconfig b/configs/ptxconfig index 4a1ab85..f512a08 100644 --- a/configs/ptxconfig +++ b/configs/ptxconfig @@ -1,6 +1,6 @@ # # Automatically generated make config: don't edit -# PTXdist 2012.06.0-00017-g89fbba7 +# PTXdist 2012.07.0-00008-gbf784fd-dirty # PTXCONF_MODULES=y @@ -34,7 +34,7 @@ PTXCONF_PROJECT_BUILD_DEVEL=y # PTXCONF_PROJECT_USE_DEVPKGS is not set PTXCONF_RUNTIME=y PTXCONF_BUILDTIME=y -PTXCONF_CONFIGFILE_VERSION="2012.06.0-00017-g89fbba7" +PTXCONF_CONFIGFILE_VERSION="2012.07.0-00008-gbf784fd-dirty" PTXCONF__ptxconfig_MAGIC__=y # @@ -82,7 +82,9 @@ PTXCONF_HOST_FIGLET=y # PTXCONF_HOST_FONTCONFIG is not set # PTXCONF_HOST_FREETYPE is not set # PTXCONF_HOST_GENEXT2FS is not set +# PTXCONF_HOST_GENIMAGE is not set # PTXCONF_HOST_GENPART is not set +PTXCONF_HOST_GETTEXT_DUMMY=y PTXCONF_HOST_GETTEXT=y PTXCONF_HOST_GLIB=y PTXCONF_HOST_GPERF=y @@ -93,6 +95,7 @@ PTXCONF_HOST_INTLTOOL=y # PTXCONF_HOST_LIBBLKID is not set # PTXCONF_HOST_LIBBZ2 is not set # PTXCONF_HOST_LIBCAP is not set +# PTXCONF_HOST_LIBCONFUSE is not set PTXCONF_HOST_LIBFFI=y # PTXCONF_HOST_LIBGD is not set PTXCONF_HOST_LIBICONV=y @@ -1428,6 +1431,7 @@ PTXCONF_SYSTEMD=y # PTXCONF_SYSTEMD_DISABLE_RANDOM_SEED is not set # PTXCONF_SYSTEMD_ANALYZE is not set # PTXCONF_TIMEOUT is not set +# PTXCONF_TMUX is not set # PTXCONF_U_BOOT_TOOLS is not set PTXCONF_UDEV=y @@ -1553,6 +1557,7 @@ PTXCONF_PYTHON_SYMLINK=y # PTXCONF_PYTHON_LIBTK is not set # PTXCONF_PYTHON_IDLELIB is not set # PTXCONF_PYTHON_DISTUTILS is not set +# PTXCONF_PYTHON_HASHLIB is not set # # python Extra Modules @@ -1697,6 +1702,8 @@ PTXCONF_WIRESHARK_TSHARK=y # # PTXCONF_ACL is not set # PTXCONF_ATTR is not set +# PTXCONF_CIFS_UTILS is not set +# PTXCONF_DDRESCUE is not set # PTXCONF_DOSFSTOOLS is not set PTXCONF_E2FSPROGS=y @@ -1974,6 +1981,7 @@ PTXCONF_RT_TESTS_CYCLICTEST=y # PTXCONF_RT_TESTS_HACKBENCH is not set # PTXCONF_RT_TESTS_PIP is not set # PTXCONF_RT_TESTS_PI_STRESS is not set +# PTXCONF_RT_TESTS_PMQTEST is not set # PTXCONF_RT_TESTS_PTSEMATEST is not set # PTXCONF_RT_TESTS_RT_MIGRATE_TEST is not set # PTXCONF_RT_TESTS_SENDME is not set @@ -2122,7 +2130,6 @@ PTXCONF_GLIB_GETTEXT_NONE=y # PTXCONF_SVGALIB is not set # PTXCONF_TSLIB is not set # PTXCONF_V4L_UTILS is not set -# PTXCONF_WXWIDGETS is not set # PTXCONF_XORG is not set # |