diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/Makefile | 2 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb | 1 | ||||
| -rw-r--r-- | target/arm/sys-available/qemu-armhf | 9 | ||||
| -rw-r--r-- | target/config/Config.in | 24 | ||||
| -rw-r--r-- | target/linux/config/Config.in.fs | 1 | ||||
| -rw-r--r-- | target/linux/kernel.config | 1 | ||||
| -rw-r--r-- | target/packages/pkg-available/development | 2 | ||||
| -rw-r--r-- | target/packages/pkg-available/test | 3 |
8 files changed, 35 insertions, 8 deletions
diff --git a/target/Makefile b/target/Makefile index f2ae18b60..1e091d3dc 100644 --- a/target/Makefile +++ b/target/Makefile @@ -53,6 +53,8 @@ config-prepare: $(TOPDIR)/.config while IFS='=' read symbol value; do \ sed -i -e "/^# $$symbol/d" ${BUILD_DIR}/.kernelconfig.board; \ done;) + @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 init=/sbin/init"#' \ + ${BUILD_DIR}/.kernelconfig.board @sed -i -e 's#^\(CONFIG_.*CMDLINE="\)\(.*\)"#\1\2 ${FS_CMDLINE}"#' \ ${BUILD_DIR}/.kernelconfig.board ifneq ($(ADK_TARGET_CMDLINE),) diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index ead723621..ce52647be 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -18,7 +18,6 @@ CONFIG_DTC=y CONFIG_OF=y CONFIG_SCSI=y CONFIG_SCSI_DMA=y -CONFIG_SCSI_PROC_FS=y CONFIG_BLK_DEV_SD=y CONFIG_SCSI_SPI_ATTRS=y CONFIG_SCSI_LOWLEVEL=y diff --git a/target/arm/sys-available/qemu-armhf b/target/arm/sys-available/qemu-armhf new file mode 100644 index 000000000..07059a8f3 --- /dev/null +++ b/target/arm/sys-available/qemu-armhf @@ -0,0 +1,9 @@ +config ADK_TARGET_SYSTEM_QEMU_ARMHF + bool "Qemu Emulator (hard-float)" + select ADK_arm + select ADK_qemu_arm + select ADK_little + select ADK_HARDWARE_QEMU + select ADK_TARGET_KERNEL_ZIMAGE + help + Support for Qemu Emulator (armhf). diff --git a/target/config/Config.in b/target/config/Config.in index 817b77a2c..a8b69fb90 100644 --- a/target/config/Config.in +++ b/target/config/Config.in @@ -279,21 +279,33 @@ config ADK_TARGET_QEMU_MICROBLAZE_MODEL_S3ADSP1800 endchoice choice +prompt "Qemu ARM Emulation (hard-float)" +depends on ADK_TARGET_SYSTEM_QEMU_ARMHF + +config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + boolean "ARM Ltd. Versatile Express for Cortex-A9" + select ADK_hard_float + select ADK_eabihf + select ADK_CPU_CORTEX_A9 + +endchoice + +choice prompt "Qemu ARM Emulation" depends on ADK_TARGET_SYSTEM_QEMU_ARM +config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 + boolean "ARM Ltd. Versatile Express for Cortex-A9" + select ADK_soft_float + select ADK_eabi + select ADK_CPU_CORTEX_A9 + config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB boolean "ARM Ltd. Versatile/PB" select ADK_soft_float select ADK_eabi select ADK_CPU_ARM926EJ_S -config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 - boolean "ARM Ltd. Versatile Express for Cortex-A9" - select ADK_hard_float - select ADK_eabihf - select ADK_CPU_CORTEX_A9 - config ADK_TARGET_QEMU_ARM_MODEL_SPITZ boolean "Xscale PXA270 Spitz PDA" select ADK_soft_float diff --git a/target/linux/config/Config.in.fs b/target/linux/config/Config.in.fs index 85065c093..377122dc5 100644 --- a/target/linux/config/Config.in.fs +++ b/target/linux/config/Config.in.fs @@ -62,6 +62,7 @@ config ADK_KERNEL_EXT2_FS boolean default y if ADK_TARGET_WITH_CF default y if ADK_TARGET_WITH_MMC && !ADK_TARGET_SYSTEM_RASPBERRY_PI + default y if ADK_TARGET_SYSTEM_LEMOTE_YEELONG default n config ADK_KPACKAGE_KMOD_EXT2_FS diff --git a/target/linux/kernel.config b/target/linux/kernel.config index d69b28908..3afd5bdf5 100644 --- a/target/linux/kernel.config +++ b/target/linux/kernel.config @@ -15,6 +15,7 @@ CONFIG_INET=y CONFIG_PROC_FS=y CONFIG_PROC_SYSCTL=y CONFIG_BLOCK=y +CONFIG_BLK_DEV=y CONFIG_FILE_LOCKING=y CONFIG_SYSFS=y CONFIG_TMPFS=y diff --git a/target/packages/pkg-available/development b/target/packages/pkg-available/development index 8ac207205..6a883ebf2 100644 --- a/target/packages/pkg-available/development +++ b/target/packages/pkg-available/development @@ -34,7 +34,7 @@ config ADK_PKG_DEVELOPMENT select ADK_PACKAGE_GDB select ADK_PACKAGE_PARTED select ADK_PACKAGE_SFDISK - select ADK_APCKAGE_MKE2FS + select ADK_PACKAGE_MKE2FS select ADK_PACKAGE_DOSFSTOOLS help After bootstrapping a Linux system you might want to diff --git a/target/packages/pkg-available/test b/target/packages/pkg-available/test index 6560dc8a1..074ce8246 100644 --- a/target/packages/pkg-available/test +++ b/target/packages/pkg-available/test @@ -5,6 +5,9 @@ config ADK_PKG_TEST select ADK_PACKAGE_STRACE select ADK_PACKAGE_SOCAT select ADK_PACKAGE_MAKE + select ADK_KERNEL_BLK_DEV_INITRD + select ADK_KERNEL_COMP_XZ + select ADK_KERNEL_INITRAMFS_COMPRESSION_XZ help Package collection used to build adk-test-framework root filesystem. |