diff options
| -rw-r--r-- | mk/host-bottom.mk | 5 | ||||
| -rw-r--r-- | mk/rootfs.mk | 2 | ||||
| -rw-r--r-- | package/libffi/Makefile | 1 | ||||
| -rw-r--r-- | target/arm/Makefile | 25 | ||||
| -rw-r--r-- | target/config/Config.in.qemuopts | 2 | ||||
| -rw-r--r-- | target/linux/config/Config.in.block | 14 | ||||
| -rw-r--r-- | target/linux/config/Config.in.flash | 16 | ||||
| -rw-r--r-- | target/microblaze/Makefile | 2 |
8 files changed, 41 insertions, 26 deletions
diff --git a/mk/host-bottom.mk b/mk/host-bottom.mk index cfd4ce120..c27b3f2a6 100644 --- a/mk/host-bottom.mk +++ b/mk/host-bottom.mk @@ -22,8 +22,6 @@ ifeq (${HOST_STYLE},) cd ${WRKBUILD}; \ env ${HOST_CONFIGURE_ENV} \ ${BASH} ${WRKSRC}/${CONFIGURE_PROG} \ - --program-prefix= \ - --program-suffix= \ --prefix=${STAGING_HOST_DIR}/usr \ --bindir=${STAGING_HOST_DIR}/usr/bin \ --datadir=${STAGING_HOST_DIR}/usr/share \ @@ -31,9 +29,6 @@ ifeq (${HOST_STYLE},) --libdir=${STAGING_HOST_DIR}/usr/lib \ --libexecdir=${STAGING_HOST_DIR}/usr/libexec \ --sysconfdir=${STAGING_HOST_DIR}/etc \ - --disable-dependency-tracking \ - --disable-libtool-lock \ - --disable-nls \ ${HOST_CONFIGURE_ARGS} $(MAKE_TRACE) endif ifeq (${HOST_STYLE},auto) diff --git a/mk/rootfs.mk b/mk/rootfs.mk index 5f47a1547..7539185f7 100644 --- a/mk/rootfs.mk +++ b/mk/rootfs.mk @@ -18,7 +18,7 @@ ROOTFS:= root=/dev/sda1 rootwait endif endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) -ROOTFS:= root=/dev/mtdblock0 +ROOTFS:= root=/dev/mmcblk0p1 endif endif diff --git a/package/libffi/Makefile b/package/libffi/Makefile index f35cd2d6e..da7195d5d 100644 --- a/package/libffi/Makefile +++ b/package/libffi/Makefile @@ -9,6 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37 PKG_DESCR:= foreign function interface library PKG_SECTION:= libs/misc +HOST_BUILDDEP:= libtool-host PKG_URL:= http://sourceware.org/libffi/ PKG_SITES:= ftp://sourceware.org/pub/libffi/ PKG_OPTS:= dev diff --git a/target/arm/Makefile b/target/arm/Makefile index f0ef2261c..ad37c1eac 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -25,6 +25,9 @@ QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -m 256 -net user -net nic,model=lan9118 -dtb $(FW_DIR)/vexpress-v2p-ca9.dtb +ifeq ($(ADK_TARGET_ROOTFS_ARCHIVE),y) +QEMU_ARGS+=-drive file=qemu-arm.img,if=sd,format=raw +endif endif ifeq ($(ADK_TARGET_QEMU_WITH_VIRTIO),y) QEMU_ARGS+=-drive file=qemu-${ADK_TARGET_CPU_ARCH}.img,if=virtio,index=0 -net nic,model=virtio -net user @@ -113,13 +116,22 @@ targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" endif -ifeq ($(ADK_TARGET_FS),jffs2) +ifeq ($(ADK_TARGET_FS),squashfs) 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)' + @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} $(QEMU_ARGS) -nographic -kernel $(FW_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(ROOTFSSQUASHFS)' +endif +endif +ifeq ($(ADK_TARGET_FS),jffs2) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSJFFS2)" +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) $(FW_DIR)/$(ROOTFSJFFS2)' endif endif @@ -133,6 +145,10 @@ endif kernel-install: kernel-strip @cp $(BUILD_DIR)/$(TARGET_KERNEL) $(FW_DIR)/$(TARGET_KERNEL) +ifeq ($(ADK_TARGET_FS),squashfs) + env PATH=$(HOST_PATH) qemu-img create -f raw $(FW_DIR)/$(ROOTFSSQUASHFS) $(ADK_TARGET_MTD_SIZE) + dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) +endif dtb-install: ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) @@ -177,8 +193,11 @@ endif ifeq ($(ADK_TARGET_FS),nfsroot) imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp endif +ifeq ($(ADK_TARGET_FS),squashfs) +imageinstall: $(BUILD_DIR)/root.squashfs kernel-install dtb-install targethelp +endif ifeq ($(ADK_TARGET_FS),jffs2) -imageinstall: kernel-install $(FW_DIR)/$(ROOTFSJFFS2) targethelp +imageinstall: kernel-install dtb-install $(FW_DIR)/$(ROOTFSJFFS2) targethelp endif ifeq ($(ADK_TARGET_FS),usb) imageinstall: $(FW_DIR)/$(ROOTFSTARBALL) targethelp diff --git a/target/config/Config.in.qemuopts b/target/config/Config.in.qemuopts index 313a5c3f8..4ef3aa1aa 100644 --- a/target/config/Config.in.qemuopts +++ b/target/config/Config.in.qemuopts @@ -63,7 +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 + select ADK_KERNEL_MMC_ARMMMCI if ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 config ADK_TARGET_QEMU_WITHOUT_BLOCK bool "disabled" diff --git a/target/linux/config/Config.in.block b/target/linux/config/Config.in.block index ab5ca76ba..f33465242 100644 --- a/target/linux/config/Config.in.block +++ b/target/linux/config/Config.in.block @@ -323,7 +323,19 @@ config ADK_KERNEL_SCSI_SUNESP endmenu menu "SD/MMC driver support" -depends on ADK_TARGET_WITH_SD +depends on ADK_TARGET_WITH_SD || ADK_TARGET_QEMU + +config ADK_KERNEL_MMC_ARMMMCI + bool "SD card support for Qemu ARM Vexpress A9" + select ADK_KERNEL_BLOCK + select ADK_KERNEL_LBDAF + select ADK_KERNEL_SCSI + select ADK_KERNEL_MMC + select ADK_KERNEL_MMC_BLOCK + select ADK_KERNEL_BLK_DEV + select ADK_KERNEL_BLK_DEV_SD + depends on ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 + default n config ADK_KERNEL_MMC_AT91 tristate diff --git a/target/linux/config/Config.in.flash b/target/linux/config/Config.in.flash index 7f2886a3e..ca0041688 100644 --- a/target/linux/config/Config.in.flash +++ b/target/linux/config/Config.in.flash @@ -108,23 +108,11 @@ config ADK_KERNEL_MTD_NAND_PLATFORM help platform nand driver -config ADK_KERNEL_MTD_PLATRAM - bool "MTD RAM driver" - select ADK_KERNEL_BLOCK - 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 \ - || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 + || ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 \ + || ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 default "16777216" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_S3ADSP1800 default "33554432" if ADK_TARGET_SYSTEM_QEMU_MICROBLAZE_ML605 default "0" diff --git a/target/microblaze/Makefile b/target/microblaze/Makefile index 8555a1b01..a5c3a24e0 100644 --- a/target/microblaze/Makefile +++ b/target/microblaze/Makefile @@ -54,7 +54,7 @@ endif ifeq ($(ADK_TARGET_FS),jffs2) targethelp: @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' - @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSSQUASHFS)" + @echo "The RootFS image is: $(FW_DIR)/$(ROOTFSJFFS2)" 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)/$(ROOTFSJFFS2)' |