diff options
Diffstat (limited to 'target')
| -rw-r--r-- | target/arm/Makefile | 3 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-stellaris-m3 | 16 | ||||
| -rw-r--r-- | target/config/Config.in.arm.choice | 8 | ||||
| -rw-r--r-- | target/config/Config.in.kernel | 1 | ||||
| -rw-r--r-- | target/config/Config.in.qemu | 6 |
5 files changed, 4 insertions, 30 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 180e02e83..479ab738e 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -28,9 +28,6 @@ endif ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9),y) QEMU_ARGS+=-M vexpress-a9 -cpu cortex-a9 -net user -net nic,model=lan9118 endif -ifeq ($(ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3),y) -QEMU_ARGS+=-M lm3s6965evb -cpu cortex-m3 -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 endif diff --git a/target/arm/kernel/qemu-arm-stellaris-m3 b/target/arm/kernel/qemu-arm-stellaris-m3 deleted file mode 100644 index c6256088e..000000000 --- a/target/arm/kernel/qemu-arm-stellaris-m3 +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARCH_REALVIEW=y -CONFIG_MACH_REALVIEW_EB=y -CONFIG_CPU_32=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_V7=y -CONFIG_CPU_32v7M=y -CONFIG_ARM_THUMB=y -CONFIG_ARM_NVIC=y -CONFIG_KUSER_HELPERS=y -CONFIG_ARM_AMBA=y -CONFIG_USE_OF=y -CONFIG_ATAGS=y -CONFIG_SERIAL_AMBA_PL011=y -CONFIG_SERIAL_AMBA_PL011_CONSOLE=y diff --git a/target/config/Config.in.arm.choice b/target/config/Config.in.arm.choice index 80fe2b310..ecb9be64d 100644 --- a/target/config/Config.in.arm.choice +++ b/target/config/Config.in.arm.choice @@ -14,14 +14,14 @@ config ADK_CPU_ARMV7A_CORTEX_A7 select ADK_CPU_CORTEX_A7 config ADK_CPU_ARMV7M_CORTEX_M4 - bool "cortex-m4" - select ADK_CPU_CORTEX_M4 + bool "cortex-m4" + select ADK_CPU_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_UCLINUX config ADK_CPU_ARMV7M_CORTEX_M3 - bool "cortex-m3" - select ADK_CPU_CORTEX_M3 + bool "cortex-m3" + select ADK_CPU_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_UCLINUX diff --git a/target/config/Config.in.kernel b/target/config/Config.in.kernel index 993fd0a77..8e96264d0 100644 --- a/target/config/Config.in.kernel +++ b/target/config/Config.in.kernel @@ -40,7 +40,6 @@ config ADK_TARGET_KERNEL_MINICONFIG default "qemu-microblaze-ml605" if ADK_TARGET_QEMU_MICROBLAZE_MODEL_ML605 default "qemu-aarch64" if ADK_TARGET_SYSTEM_QEMU_AARCH64 default "qemu-arm-versatilepb" if ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB - default "qemu-arm-stellaris-m3" if ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3 default "qemu-arm-vexpress-a9" if ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 default "qemu-arm-spitz" if ADK_TARGET_QEMU_ARM_MODEL_SPITZ default "qemu-arm-terrier" if ADK_TARGET_QEMU_ARM_MODEL_TERRIER diff --git a/target/config/Config.in.qemu b/target/config/Config.in.qemu index 2e16341ba..863353c77 100644 --- a/target/config/Config.in.qemu +++ b/target/config/Config.in.qemu @@ -36,12 +36,6 @@ config ADK_TARGET_QEMU_ARM_MODEL_VEXPRESS_A9 bool "ARM Ltd. Versatile Express with Cortex-A9" select ADK_CPU_CORTEX_A9 -config ADK_TARGET_QEMU_ARM_MODEL_STELLARIS_M3 - bool "Stellaris LM3S6965EVB with Cortex-M3" - select ADK_CPU_CORTEX_M3 - select ADK_TARGET_ARCH_ARM_WITH_THUMB - select ADK_TARGET_UCLINUX - config ADK_TARGET_QEMU_ARM_MODEL_VERSATILEPB bool "ARM Ltd. Versatile/PB with ARM926EJ-S" select ADK_CPU_ARM926EJ_S |