diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 14 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 2 | ||||
| -rw-r--r-- | target/config/Config.in.tools | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.flash | 16 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 1 | ||||
| -rw-r--r-- | target/linux/config/Config.in.spi | 2 |
6 files changed, 32 insertions, 4 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 571f3a4a7..f0ef2261c 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -34,7 +34,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER)$(ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${ADK_TARGET_CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" @@ -113,6 +113,15 @@ targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif +ifeq ($(ADK_TARGET_FS),jffs2) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" +ifeq ($(ADK_TARGET_QEMU),y) + @echo "Start qemu with following options:" + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) -pflash $(FW_DIR)/$(ROOTFSSQUASHFS)' +endif +endif kernel-strip: @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) @@ -168,6 +177,9 @@ endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif +ifeq ($(ADK_TARGET_FS),jffs2) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSJFFS2) targethelp +endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp endif diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 1b704defe..313a5c3f8 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -28,6 +28,7 @@ endchoice choice prompt "Qemu Emulation with storage device" depends on ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB \ + || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 \ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER \ || ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ \ || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ @@ -62,6 +63,7 @@ config ADK_TARGET_QEMU_WITH_BLOCK select ADK_KERNEL_PATA_PLATFORM if ADK_TARGET_SYSTEM_QEMU_SH select ADK_KERNEL_PATA_PXA if ADK_TARGET_QEMU_ARM_SPITZ \ || ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER + select ADK_KERNEL_MTD_PLATRAM if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 config ADK_TARGET_QEMU_WITHOUT_BLOCK bool "disabled" diff --git a/target/config/Config.in.tools b/target/config/Config.in.tools index 62f48ca0b..600869754 100644 --- a/target/config/Config.in.tools +++ b/target/config/Config.in.tools @@ -208,6 +208,7 @@ config ADK_HOST_NEED_SQUASHFS config ADK_HOST_BUILD_SQUASHFS bool + select ADK_HOST_BUILD_XZ default y if ADK_HOST_NEED_SQUASHFS default n diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index e44814cb3..ded3dfe6f 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -23,6 +23,9 @@ config ADK_KERNEL_MTD_NAND_PLATFORM config ADK_KERNEL_MTD_CHAR bool +config ADK_KERNEL_MTD_CMDLINE_PARTS + bool + config ADK_KERNEL_MTD_BLKDEVS bool @@ -103,6 +106,18 @@ config ADK_KERNEL_MTD_NAND_PLATFORM help platform nand driver +config ADK_KERNEL_MTD_PLATRAM + bool "MTD RAM driver" + select ADK_KERNEL_MISC_FILESYSTEMS + select ADK_KERNEL_MTD + select ADK_KERNEL_MTD_BLOCK + select ADK_KERNEL_MTD_CFI + select ADK_KERNEL_MTD_CFI_INTELEXT + select ADK_KERNEL_MTD_PHYSMAP + select ADK_KERNEL_MTD_PHYSMAP_OF + select ADK_KERNEL_MTD_CMDLINE_PARTS + default n + config ADK_TARGET_MTD_SIZE int depends on ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 \ @@ -112,4 +127,3 @@ config ADK_TARGET_MTD_SIZE default "0" endmenu - diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index f09343690..ec428f3bc 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -231,7 +231,6 @@ config ADK_KERNEL_JFFS2_FS select ADK_KERNEL_MTD_BLOCK select ADK_KERNEL_JFFS2_COMPRESSION_OPTIONS select ADK_KERNEL_JFFS2_ZLIB - depends on ADK_TARGET_WITH_MTD help JFFS2 flash filesystem diff --git a/target/linux/config/Config.in.spi b/target/linux/config/Config.in.spi index 7442195db..8d1424a98 100644 --- a/target/linux/config/Config.in.spi +++ b/target/linux/config/Config.in.spi @@ -2,7 +2,7 @@ # material, please see the LICENCE file in the top-level directory. menu "SPI driver support" -depends on ADK_TARGET_WITH_SPI +depends on ADK_TARGET_WITH_SPI || ADK_TARGET_QEMU config ADK_KERNEL_SPI bool |