diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-31 18:22:32 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-05-31 18:22:53 +0200 |
| commit | 0c095815c447305416758ceed6cdf965411a4bf5 (patch) | |
| tree | d26f920edb42fcb8ae773a2af8cadf9a7d6a9194 /target/arm | |
| parent | 2e5369d8206e340754ee64cd9d057748eab0ebab (diff) | |
fix qemu spitz emulation, add emulation for terrier
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 5 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-spitz | 11 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-terrier | 42 |
3 files changed, 46 insertions, 12 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 24ffce9ae..47fa758e0 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -19,6 +19,9 @@ QEMU_ARGS:=${ADK_QEMU_ARGS} ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_SPITZ),y) QEMU_ARGS+=-M spitz endif +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_TERRIER),y) +QEMU_ARGS+=-M terrier +endif ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 endif @@ -33,7 +36,7 @@ endif ifeq ($(ADK_TARGET_FS),archive) targethelp: @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSTARBALL)" -ifeq ($(ADK_TARGET_QEMU),y) +ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB),y) @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' @echo "Use following command to create a QEMU Image:" @echo "./scripts/create.sh qemu-${CPU_ARCH}.img $(FW_DIR)/$(ROOTFSTARBALL)" diff --git a/target/arm/kernel/qemu-arm-spitz b/target/arm/kernel/qemu-arm-spitz index b7e6815ce..4e85ca73b 100644 --- a/target/arm/kernel/qemu-arm-spitz +++ b/target/arm/kernel/qemu-arm-spitz @@ -33,21 +33,10 @@ CONFIG_POWER_SUPPLY=y CONFIG_PDA_POWER=y CONFIG_APM_POWER=y CONFIG_SENSORS_MAX1111=y -CONFIG_FB=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_PXA=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_CORGI=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_GENERIC=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y -CONFIG_FONTS=y -CONFIG_FONT_8x16=y -CONFIG_FONT_AUTOSELECT=y CONFIG_HID=y CONFIG_HID_GENERIC=y diff --git a/target/arm/kernel/qemu-arm-terrier b/target/arm/kernel/qemu-arm-terrier new file mode 100644 index 000000000..eaa9301c0 --- /dev/null +++ b/target/arm/kernel/qemu-arm-terrier @@ -0,0 +1,42 @@ +CONFIG_ARM=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARCH_PXA=y +CONFIG_PXA_SHARPSL=y +CONFIG_PXA_SHARPSL_DETECT_MACH_ID=y +CONFIG_MACH_BORZOI=y +CONFIG_PXA27x=y +CONFIG_PXA_SHARP_Cxx00=y +CONFIG_SHARPSL_PM=y +CONFIG_SHARPSL_PM_MAX1111=y +CONFIG_PXA_SSP=y +CONFIG_PLAT_PXA=y +CONFIG_CPU_XSCALE=y +CONFIG_IWMMXT=y +CONFIG_XSCALE_PMU=y +CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_SHARP_PARAM=y +CONFIG_SHARP_SCOOP=y +CONFIG_AEABI=y +CONFIG_ATAGS=y +CONFIG_ATAGS_PROC=y +CONFIG_I2C=y +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_PXA=y +CONFIG_SPI=y +CONFIG_SPI_MASTER=y +CONFIG_SPI_PXA2XX_DMA=y +CONFIG_SPI_PXA2XX=y +CONFIG_GPIO_DEVRES=y +CONFIG_GPIOLIB=y +CONFIG_GPIO_PXA=y +CONFIG_POWER_SUPPLY=y +CONFIG_PDA_POWER=y +CONFIG_APM_POWER=y +CONFIG_SENSORS_MAX1111=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +CONFIG_LCD_CORGI=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_GENERIC=y +CONFIG_HID=y +CONFIG_HID_GENERIC=y |