summaryrefslogtreecommitdiff
path: root/target/xtensa
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-03-05 12:51:42 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-03-07 06:42:57 +0100
commitc384dc577bd32f3315bacb410fc31610b41f742c (patch)
tree903aaed00f4b82d5e1eada2bd4fea8a7f3387ded /target/xtensa
parent68d4e79f35039b31ae835e82241a567b0ad66aa8 (diff)
rework menu based config system
After the addition of bare metal toolchains the menu system allowed to create non-valid configurations. I reworked it so we can also add other operating system support if we wish. So first you choose your operating system, then your architecture and endianess, after that your embedded system, emulator or generic device and then you choose your task you want to run. Tasks may be toolchain, a new appliance/application or some preconfigured sets of packages and configurations as kodi, mpd, firefox and more. The tasks are limited to a plausible choice of hardware and software. Deduplicate CPU configuration. You don't wanna compile Kodi for a H8/300 microcontroller ;)
Diffstat (limited to 'target/xtensa')
-rw-r--r--target/xtensa/Makefile8
-rw-r--r--target/xtensa/systems/qemu-xtensa1
-rw-r--r--target/xtensa/systems/toolchain-xtensa8
-rw-r--r--target/xtensa/systems/xilinx-kintex71
4 files changed, 4 insertions, 14 deletions
diff --git a/target/xtensa/Makefile b/target/xtensa/Makefile
index 4643854d4..b5db1376d 100644
--- a/target/xtensa/Makefile
+++ b/target/xtensa/Makefile
@@ -5,7 +5,7 @@ include $(ADK_TOPDIR)/rules.mk
include $(ADK_TOPDIR)/mk/kernel-build.mk
include $(ADK_TOPDIR)/mk/image.mk
-ifeq ($(ADK_TARGET_XTENSA_DE212),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y)
KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/Image.elf
else
KERNEL:=$(LINUX_DIR)/arch/xtensa/boot/uImage
@@ -13,13 +13,13 @@ endif
QEMU_ARGS:=-M ml605 -monitor null
QEMU_ARGS+=${ADK_QEMU_ARGS}
-ifeq ($(ADK_TARGET_XTENSA_DC233C),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DC233C),y)
QEMU_ARGS+=-cpu dc233c
endif
-ifeq ($(ADK_TARGET_XTENSA_DC232B),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DC232B),y)
QEMU_ARGS+=-cpu dc232b
endif
-ifeq ($(ADK_TARGET_XTENSA_DE212),y)
+ifeq ($(ADK_TARGET_CPU_XTENSA_DE212),y)
QEMU_ARGS+=-cpu de212
endif
diff --git a/target/xtensa/systems/qemu-xtensa b/target/xtensa/systems/qemu-xtensa
index 1ae3cd111..53d6daba7 100644
--- a/target/xtensa/systems/qemu-xtensa
+++ b/target/xtensa/systems/qemu-xtensa
@@ -1,6 +1,5 @@
config ADK_TARGET_SYSTEM_QEMU_XTENSA
bool "Qemu Emulator"
- select ADK_CPU_XTENSA
select ADK_TARGET_QEMU
select ADK_TARGET_KERNEL_WITH_COMPRESSION
select ADK_HOST_BUILD_U_BOOT
diff --git a/target/xtensa/systems/toolchain-xtensa b/target/xtensa/systems/toolchain-xtensa
deleted file mode 100644
index 1109bc60e..000000000
--- a/target/xtensa/systems/toolchain-xtensa
+++ /dev/null
@@ -1,8 +0,0 @@
-config ADK_TARGET_SYSTEM_TOOLCHAIN_XTENSA
- bool "Toolchain only"
- select ADK_CPU_XTENSA
- select ADK_TARGET_TOOLCHAIN
- select ADK_TARGET_PACKAGE_TXZ
- help
- XTENSA toolchain.
-
diff --git a/target/xtensa/systems/xilinx-kintex7 b/target/xtensa/systems/xilinx-kintex7
index 4476e5230..341153efe 100644
--- a/target/xtensa/systems/xilinx-kintex7
+++ b/target/xtensa/systems/xilinx-kintex7
@@ -1,6 +1,5 @@
config ADK_TARGET_SYSTEM_XILINX_KINTEX7
bool "Xilinx Kintex 7"
- select ADK_CPU_XTENSA
select ADK_TARGET_KERNEL_ZIMAGE
select ADK_TARGET_KERNEL_WITH_COMPRESSION
select ADK_TARGET_WITH_SERIAL