diff options
| author | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-01 04:51:01 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@uclibc-ng.org> | 2018-04-01 04:51:01 +0100 |
| commit | a58be2e9339a5241e89f5192969ce01e99c8a0f7 (patch) | |
| tree | 32719a1cb552cd9f39a9066ca80e4c344550c7da /target/arm | |
| parent | 33ddc482f90e91e4583e94be8af9c9af5625dade (diff) | |
arm: use >4.9 kernel for versatile nommu
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 8 | ||||
| -rw-r--r-- | target/arm/kernel/qemu-arm-versatilepb-nommu | 2 |
2 files changed, 2 insertions, 8 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 0965f60be..3be194688 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -33,11 +33,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) -ifeq ($(ADK_TARGET_WITH_DEVICETREE),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb -else -QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -endif 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 @@ -168,7 +164,6 @@ ifeq ($(ADK_TARGET_FS),squashfs) endif dtb-install: -ifeq ($(ADK_TARGET_WITH_DEVICETREE),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ dtbs $(MAKE_TRACE) @@ -179,7 +174,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ - dtbs $(MAKE_TRACE) + versatile-pb.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_PHYTEC_WEGA),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ @@ -224,7 +219,6 @@ endif [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/*.dtb $(FW_DIR); \ break; \ done -endif # filesystem specific targets ifeq ($(ADK_TARGET_FS),archive) diff --git a/target/arm/kernel/qemu-arm-versatilepb-nommu b/target/arm/kernel/qemu-arm-versatilepb-nommu index 3d7b851e4..74717d283 100644 --- a/target/arm/kernel/qemu-arm-versatilepb-nommu +++ b/target/arm/kernel/qemu-arm-versatilepb-nommu @@ -1,4 +1,5 @@ CONFIG_ARM=y +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE=y CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y @@ -8,7 +9,6 @@ CONFIG_DRAM_BASE=0x00000000 CONFIG_DRAM_SIZE=0x08000000 CONFIG_ARCH_VERSATILE_PB=y CONFIG_MACH_VERSATILE_AB=y -# CONFIG_MACH_VERSATILE_DT is not set CONFIG_PLAT_VERSATILE_CLOCK=y CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y CONFIG_PLAT_VERSATILE=y |