diff options
Diffstat (limited to 'target/arm')
28 files changed, 38 insertions, 55 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index 44eedd2cc..59b457d12 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -32,7 +32,7 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) QEMU_ARGS+=-M realview-eb-mpcore -net user -net nic -dtb $(FW_DIR)/arm-realview-eb-11mp-ctrevb.dtb endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) QEMU_ARGS+=-M versatilepb -net user -net nic,model=smc91c111 -dtb $(FW_DIR)/versatile-pb.dtb endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9),y) @@ -176,7 +176,7 @@ ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ arm-realview-eb-11mp-ctrevb.dtb $(MAKE_TRACE) endif -ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB)$(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU),y) +ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) env $(KERNEL_MAKE_ENV) $(MAKE) -C "${LINUX_DIR}" $(KERNEL_MAKE_OPTS) \ versatile-pb.dtb $(MAKE_TRACE) endif diff --git a/target/arm/kernel/qemu-arm-versatilepb b/target/arm/kernel/qemu-arm-versatilepb index 43e9620df..74717d283 100644 --- a/target/arm/kernel/qemu-arm-versatilepb +++ b/target/arm/kernel/qemu-arm-versatilepb @@ -1,6 +1,16 @@ CONFIG_ARM=y +CONFIG_ARM_SINGLE_ARCH_VERSATILE=y CONFIG_ARCH_VERSATILE=y -CONFIG_PCI_VERSATILE=y CONFIG_KUSER_HELPERS=y CONFIG_ATAGS=y CONFIG_USE_OF=y +CONFIG_SET_MEM_PARAM=y +CONFIG_DRAM_BASE=0x00000000 +CONFIG_DRAM_SIZE=0x08000000 +CONFIG_ARCH_VERSATILE_PB=y +CONFIG_MACH_VERSATILE_AB=y +CONFIG_PLAT_VERSATILE_CLOCK=y +CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y +CONFIG_PLAT_VERSATILE=y +CONFIG_VECTORS_BASE=0x00000000 +CONFIG_PHYS_OFFSET=0x00000000 diff --git a/target/arm/kernel/qemu-arm-versatilepb-nommu b/target/arm/kernel/qemu-arm-versatilepb-nommu deleted file mode 100644 index 74717d283..000000000 --- a/target/arm/kernel/qemu-arm-versatilepb-nommu +++ /dev/null @@ -1,16 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARM_SINGLE_ARCH_VERSATILE=y -CONFIG_ARCH_VERSATILE=y -CONFIG_KUSER_HELPERS=y -CONFIG_ATAGS=y -CONFIG_USE_OF=y -CONFIG_SET_MEM_PARAM=y -CONFIG_DRAM_BASE=0x00000000 -CONFIG_DRAM_SIZE=0x08000000 -CONFIG_ARCH_VERSATILE_PB=y -CONFIG_MACH_VERSATILE_AB=y -CONFIG_PLAT_VERSATILE_CLOCK=y -CONFIG_PLAT_VERSATILE_SCHED_CLOCK=y -CONFIG_PLAT_VERSATILE=y -CONFIG_VECTORS_BASE=0x00000000 -CONFIG_PHYS_OFFSET=0x00000000 diff --git a/target/arm/systems/banana-pro b/target/arm/systems/banana-pro index a29da767f..9af9ba68f 100644 --- a/target/arm/systems/banana-pro +++ b/target/arm/systems/banana-pro @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BANANA_PRO bool "Banana Pro" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/beaglebone-black b/target/arm/systems/beaglebone-black index 222836b14..28102411f 100644 --- a/target/arm/systems/beaglebone-black +++ b/target/arm/systems/beaglebone-black @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK bool "BeagleBone Black" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/kinetis-k70 b/target/arm/systems/kinetis-k70 index 8eee07c39..419bf6b23 100644 --- a/target/arm/systems/kinetis-k70 +++ b/target/arm/systems/kinetis-k70 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_KINETIS_K70 bool "Kinetis K70" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/linksys-nslu2 b/target/arm/systems/linksys-nslu2 index 32e3b6ddb..65d9b1420 100644 --- a/target/arm/systems/linksys-nslu2 +++ b/target/arm/systems/linksys-nslu2 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_LINKSYS_NSLU2 bool "Linksys NSLU2" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_BIG_ENDIAN + select ADK_TARGET_BIG_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_WITH_USB select ADK_TARGET_WITH_PCI diff --git a/target/arm/systems/orange-pi0 b/target/arm/systems/orange-pi0 index f4b8cdc30..1ec19ecb4 100644 --- a/target/arm/systems/orange-pi0 +++ b/target/arm/systems/orange-pi0 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ORANGE_PI0 bool "Orange PI Zero" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_CPU_WITH_NEON select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/phytec-wega b/target/arm/systems/phytec-wega index 924f1f481..29b41a034 100644 --- a/target/arm/systems/phytec-wega +++ b/target/arm/systems/phytec-wega @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_PHYTEC_WEGA bool "Phytec Wega" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A8 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/qemu-arm-lm3s6965evb b/target/arm/systems/qemu-arm-lm3s6965evb index c204006b5..a567034cd 100644 --- a/target/arm/systems/qemu-arm-lm3s6965evb +++ b/target/arm/systems/qemu-arm-lm3s6965evb @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_LM3S6965EVB bool "Qemu Emulator (lm3s6965evb)" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M3 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_QEMU diff --git a/target/arm/systems/qemu-arm-realview-eb-mpcore b/target/arm/systems/qemu-arm-realview-eb-mpcore index 0633ef43d..abf23cab6 100644 --- a/target/arm/systems/qemu-arm-realview-eb-mpcore +++ b/target/arm/systems/qemu-arm-realview-eb-mpcore @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_REALVIEW_EB_MPCORE bool "Qemu Emulator (Realview/EB-Mpcore)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM11MPCORE select ADK_TARGET_QEMU select ADK_TARGET_WITH_SMP diff --git a/target/arm/systems/qemu-arm-spitz b/target/arm/systems/qemu-arm-spitz index 8d19c66d3..3eb9564de 100644 --- a/target/arm/systems/qemu-arm-spitz +++ b/target/arm/systems/qemu-arm-spitz @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_SPITZ bool "Qemu Emulator (Spitz PDA)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-terrier b/target/arm/systems/qemu-arm-terrier index 1c8ef995d..135b9e7e8 100644 --- a/target/arm/systems/qemu-arm-terrier +++ b/target/arm/systems/qemu-arm-terrier @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_TERRIER bool "Qemu Emulator (Terrier PDA)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-versatilepb b/target/arm/systems/qemu-arm-versatilepb index bc4afb25b..95347eabc 100644 --- a/target/arm/systems/qemu-arm-versatilepb +++ b/target/arm/systems/qemu-arm-versatilepb @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB bool "Qemu Emulator (Versatile/PB)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM926EJ_S select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/qemu-arm-versatilepb-nommu b/target/arm/systems/qemu-arm-versatilepb-nommu deleted file mode 100644 index c3a9a4035..000000000 --- a/target/arm/systems/qemu-arm-versatilepb-nommu +++ /dev/null @@ -1,11 +0,0 @@ -config ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB_NOMMU - bool "Qemu Emulator (Versatile/PB) no MMU" - depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN - select ADK_TARGET_CPU_ARM_ARM926EJ_S_NOMMU - select ADK_TARGET_QEMU - select ADK_TARGET_KERNEL_ZIMAGE - select ADK_TARGET_KERNEL_WITH_COMPRESSION - help - Qemu Emulator for ARM architecture (Versatile/PB) without MMU. - diff --git a/target/arm/systems/qemu-arm-vexpress-a9 b/target/arm/systems/qemu-arm-vexpress-a9 index c384419d2..2f6f173d3 100644 --- a/target/arm/systems/qemu-arm-vexpress-a9 +++ b/target/arm/systems/qemu-arm-vexpress-a9 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_QEMU_ARM_VEXPRESS_A9 bool "Qemu Emulator (Vexpress A9)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_QEMU select ADK_TARGET_KERNEL_ZIMAGE diff --git a/target/arm/systems/raspberry-pi b/target/arm/systems/raspberry-pi index 41a6bee17..35eb2f1ef 100644 --- a/target/arm/systems/raspberry-pi +++ b/target/arm/systems/raspberry-pi @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI bool "Raspberry PI" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi0 b/target/arm/systems/raspberry-pi0 index dbca5db33..255825294 100644 --- a/target/arm/systems/raspberry-pi0 +++ b/target/arm/systems/raspberry-pi0 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI0 bool "Raspberry PI Zero W" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_ARM1176JZF_S select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi2 b/target/arm/systems/raspberry-pi2 index 375eafb96..38a8738a5 100644 --- a/target/arm/systems/raspberry-pi2 +++ b/target/arm/systems/raspberry-pi2 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI2 bool "Raspberry PI 2" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A7 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi3 b/target/arm/systems/raspberry-pi3 index 26b7e402b..f11459c66 100644 --- a/target/arm/systems/raspberry-pi3 +++ b/target/arm/systems/raspberry-pi3 @@ -1,7 +1,8 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3 bool "Raspberry PI 3" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_MMU select ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/raspberry-pi3p b/target/arm/systems/raspberry-pi3p index ca2562355..98539ce2e 100644 --- a/target/arm/systems/raspberry-pi3p +++ b/target/arm/systems/raspberry-pi3p @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_RASPBERRY_PI3P bool "Raspberry PI 3 Model B+" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A53 select ADK_TARGET_BOARD_BCM28XX select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/sharp-zaurus b/target/arm/systems/sharp-zaurus index e452c8e7b..b791767ef 100644 --- a/target/arm/systems/sharp-zaurus +++ b/target/arm/systems/sharp-zaurus @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SHARP_ZAURUS bool "Sharp Zaurus CL3200 (Terrier)" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_XSCALE select ADK_TARGET_CPU_WITH_IWMMXT select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/solidrun-clearfog b/target/arm/systems/solidrun-clearfog index d57dbc774..2dc20a1d7 100644 --- a/target/arm/systems/solidrun-clearfog +++ b/target/arm/systems/solidrun-clearfog @@ -1,8 +1,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG bool "Solidrun Clearfog Embedded Systems" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_EXPERIMENTAL - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_SMP select ADK_TARGET_WITH_VGA diff --git a/target/arm/systems/solidrun-imx6 b/target/arm/systems/solidrun-imx6 index e15721a40..edc3b4b98 100644 --- a/target/arm/systems/solidrun-imx6 +++ b/target/arm/systems/solidrun-imx6 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_SOLIDRUN_IMX6 bool "Solidrun IMX6 Embedded Systems" depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_A9 select ADK_TARGET_WITH_VGA select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f407-discovery b/target/arm/systems/st-stm32f407-discovery index d2b269258..44ff39904 100644 --- a/target/arm/systems/st-stm32f407-discovery +++ b/target/arm/systems/st-stm32f407-discovery @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F407_DISCOVERY bool "STMicroelectronics STM32F407 Discovery" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f429 b/target/arm/systems/st-stm32f429 index 97c445e6b..d13b1150b 100644 --- a/target/arm/systems/st-stm32f429 +++ b/target/arm/systems/st-stm32f429 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F429 bool "STMicroelectronics STM32F429" - depends on ADK_TARGET_LITTLE_ENDIAN depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f429-discovery b/target/arm/systems/st-stm32f429-discovery index 6a8a7a225..57b5c0220 100644 --- a/target/arm/systems/st-stm32f429-discovery +++ b/target/arm/systems/st-stm32f429-discovery @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F429_DISCOVERY bool "STMicroelectronics STM32F429 Discovery" depends on ADK_TARGET_OS_FROSTED - depends on ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M4 select ADK_TARGET_ARCH_ARM_WITH_THUMB select ADK_TARGET_WITH_SERIAL diff --git a/target/arm/systems/st-stm32f769 b/target/arm/systems/st-stm32f769 index 224995444..11dad65c3 100644 --- a/target/arm/systems/st-stm32f769 +++ b/target/arm/systems/st-stm32f769 @@ -1,7 +1,7 @@ config ADK_TARGET_SYSTEM_ST_STM32F769 bool "STMicroelectronics STM32F769" - depends on ADK_TARGET_LITTLE_ENDIAN depends on ADK_TARGET_OS_LINUX || ADK_TARGET_OS_WALDUX + select ADK_TARGET_LITTLE_ENDIAN select ADK_TARGET_CPU_ARM_CORTEX_M7 select ADK_TARGET_HARD_FLOAT_DP select ADK_TARGET_ARCH_ARM_WITH_THUMB |