diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 19:29:18 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-10-23 19:29:18 +0200 |
| commit | e0ab58405982a858f0e9d4c16c456131c7ba791d (patch) | |
| tree | 95d5a7d4cd1bea67944457f8dc1d2ebbdb2443ec /target/arm | |
| parent | dd5962419c3fe6f297b612ea0719c2057174130a (diff) | |
| parent | ffffb0121dbf54f491560c3539e6269e432517ae (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 3 | ||||
| -rw-r--r-- | target/arm/kernel/raspberry-pi | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 9ba6366e3..391afe6e4 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -28,6 +28,9 @@ 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/raspberry-pi b/target/arm/kernel/raspberry-pi index 146fd3655..a748b42e8 100644 --- a/target/arm/kernel/raspberry-pi +++ b/target/arm/kernel/raspberry-pi @@ -3,12 +3,12 @@ CONFIG_FIQ=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_KUSER_HELPERS=y CONFIG_ARCH_MULTI_V6=y +CONFIG_VFP=y CONFIG_ARCH_BCM2708=y +CONFIG_ARCH_BCM2835=y CONFIG_MACH_BCM2708=y -CONFIG_BCM2708_GPIO=y CONFIG_BCM2708_VCMEM=y CONFIG_BCM2708_DMAER=y -CONFIG_VFP=y CONFIG_BCM2708_VCHIQ=y CONFIG_SERIAL_AMBA_PL011=y CONFIG_SERIAL_AMBA_PL011_CONSOLE=y |