jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-28 13:46:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

xtensa: use uppercase for configurations and modified overlay structure

Browse Source 
Except for architecture and processor names, buildroot uses capitalized
configuration names, so change the macro names for xtensa to follow that
standard.
Change the overlay file to have a subdirectory for each component
(gdb, binutils, gcc, etc.) to make it more future-prove.

Signed-off-by: Chris Zankel <chris@zankel.net>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Chris Zankel 2012-11-20 08:31:36 +00:00 committed by Peter Korsgaard
parent 5e0f1e1fcf
commit fdd5bc948e
4 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
arch/Config.in.xtensa
View File

@ -2,32 +2,36 @@ choice
prompt "Target Architecture Variant" prompt "Target Architecture Variant"
depends on BR2_xtensa depends on BR2_xtensa
default BR2_xtensa_fsf default BR2_xtensa_fsf
config BR2_xtensa_custom config BR2_XTENSA_CUSTOM
bool "Custom Xtensa processor configuration" bool "Custom Xtensa processor configuration"
config BR2_xtensa_fsf config BR2_xtensa_fsf
bool "fsf - Default configuration" bool "fsf - Default configuration"
endchoice endchoice
config BR2_xtensa_custom_name config BR2_XTENSA_CUSTOM_NAME
string "Custom Xtensa processor configuration anme" string "Custom Xtensa processor configuration name"
depends on BR2_xtensa_custom depends on BR2_XTENSA_CUSTOM
default "" default ""
help help
Name given to a custom Xtensa processor configuration. Name given to a custom Xtensa processor configuration.
config BR2_xtensa_core_name config BR2_XTENSA_CORE_NAME
string string
default BR2_xtensa_custom_name if BR2_xtensa_custom default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM
default "" if BR2_xtensa_fsf default "" if BR2_xtensa_fsf
config BR2_xtensa_overlay_dir config BR2_XTENSA_OVERLAY_DIR
string "Overlay directory for custom configuration" string "Overlay directory for custom configuration"
depends on BR2_xtensa_custom depends on BR2_XTENSA_CUSTOM
default "" default ""
help help
Provide a directory path that contains the overlay files Provide the directory path that contains the overlay file
for the custom configuration. The path is based on the for a custom processor configuration. The path is relative
buildroot top directory. to the top directory of buildroot.
These overlay files are tar packages with updated configuration
files for various toolchain packages and Xtensa processor
configurations. They are provided by the processor vendor or
directly from Tensilica.
config BR2_ARCH config BR2_ARCH
default "xtensa" if BR2_xtensa default "xtensa" if BR2_xtensa

6
package/binutils/binutils.mk
View File

@ -68,11 +68,11 @@ define BINUTILS_INSTALL_TARGET_CMDS
endef endef
endif endif
XTENSA_CORE_NAME = $(call qstrip, $(BR2_xtensa_core_name)) XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME))
ifneq ($(XTENSA_CORE_NAME),) ifneq ($(XTENSA_CORE_NAME),)
define BINUTILS_XTENSA_PRE_PATCH define BINUTILS_XTENSA_PRE_PATCH
tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(XTENSA_CORE_NAME).tar \ tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \
-C $(@D) bfd include ld -C $(@D) --strip-components=1 binutils
endef endef
HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH
endif endif

6
toolchain/gcc/gcc-uclibc-4.x.mk
View File

@ -251,9 +251,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE)
rm -rf $(GCC_DIR) rm -rf $(GCC_DIR)
$(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) -
$(call CONFIG_UPDATE,$(@D)) $(call CONFIG_UPDATE,$(@D))
ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip,\ tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\
$(BR2_xtensa_core_name)).tar -C $(@D) include $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc
endif endif
touch $@ touch $@

6
toolchain/gdb/gdb.mk
View File

@ -25,9 +25,9 @@ gdb-unpacked: $(GDB_DIR)/.unpacked
$(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE)
mkdir -p $(GDB_DIR) mkdir -p $(GDB_DIR)
$(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) - $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) -
ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),)
tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \ tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \
$(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb
endif endif
ifneq ($(wildcard $(GDB_PATCH_DIR)),) ifneq ($(wildcard $(GDB_PATCH_DIR)),)
support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch