From patchwork Tue Nov 20 18:31:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Zankel X-Patchwork-Id: 200604 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id C4F622C007E for ; Wed, 21 Nov 2012 19:29:05 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 90C2F80BF0; Wed, 21 Nov 2012 08:29:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id bWUXTIfw-+29; Wed, 21 Nov 2012 08:29:00 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 804D58CDC1; Wed, 21 Nov 2012 08:28:59 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 2332B8F74A for ; Wed, 21 Nov 2012 08:29:03 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 71A8D8CD4D for ; Wed, 21 Nov 2012 08:28:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DraYNP8VVDAa for ; Wed, 21 Nov 2012 08:28:56 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pa0-f43.google.com (mail-pa0-f43.google.com [209.85.220.43]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0F9F28CDC1 for ; Wed, 21 Nov 2012 08:28:56 +0000 (UTC) Received: by mail-pa0-f43.google.com with SMTP id fb10so2660563pad.16 for ; Wed, 21 Nov 2012 00:28:56 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:from:date:subject:to:x-gm-message-state; bh=uYt5LsKQf9B6/vrxaGH0gBgGaDhKHtyvHAvTE71EdnA=; b=Wsv0el/NxKW0IzTxdbCu4a8zVmW5/fGzwmoCwFZElzcVJ1ubFbWObnup9cyPUbIrPI r8VZt8SvHkqBABEZ/c5F2PvF3u0s3eG2tCHJGRRyyBmb6TExCX70HNoCtGPXn9Qn/bAM ZFGN46Agl34Nxx9cPvmOAzN4ixtfbmfUqOkuMReH49b/nM3D8xyoHQ29iOGNW93s0Tqd h9yGlh+HgZjMNs39LczW8nK0uRtdComhSFEDAL7aZNAXCGF60gMvHGpYXN6FfxsZCLaT Ntldti6Fdz1GnObe7KK13232mkodK52wQB/UWfEuMKdBsT6tmwNMHQXIn64TSZWS2mnu zbtg== Received: by 10.66.82.68 with SMTP id g4mr15732790pay.9.1353486129693; Wed, 21 Nov 2012 00:22:09 -0800 (PST) Received: from localhost (c-67-161-9-61.hsd1.ca.comcast.net. [67.161.9.61]) by mx.google.com with ESMTPS id o11sm9553100pby.8.2012.11.21.00.22.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 21 Nov 2012 00:22:09 -0800 (PST) Message-ID: <50ac8f31.4b53440a.7e28.05ed@mx.google.com> Received: by localhost (sSMTP sendmail emulation); Wed, 21 Nov 2012 00:22:07 -0800 From: Chris Zankel Date: Tue, 20 Nov 2012 10:31:36 -0800 To: buildroot@busybox.net X-Gm-Message-State: ALoCoQlPtnpQ7Nj82rRNCZ70fSm8eP3vT0Q/UkkkhBbjkvvJAVNiEhj0qD+qJY8wyoWW3KkFjobf Subject: [Buildroot] [PATCH 1/3] xtensa: use uppercase for configurations and modofied overlay structure X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net 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 --- arch/Config.in.xtensa | 26 +++++++++++++++----------- package/binutils/binutils.mk | 6 +++--- toolchain/gcc/gcc-uclibc-4.x.mk | 6 +++--- toolchain/gdb/gdb.mk | 6 +++--- 4 files changed, 24 insertions(+), 20 deletions(-) diff --git a/arch/Config.in.xtensa b/arch/Config.in.xtensa index af66125..60c03f5 100644 --- a/arch/Config.in.xtensa +++ b/arch/Config.in.xtensa @@ -2,32 +2,36 @@ choice prompt "Target Architecture Variant" depends on BR2_xtensa default BR2_xtensa_fsf -config BR2_xtensa_custom +config BR2_XTENSA_CUSTOM bool "Custom Xtensa processor configuration" config BR2_xtensa_fsf bool "fsf - Default configuration" endchoice -config BR2_xtensa_custom_name - string "Custom Xtensa processor configuration anme" - depends on BR2_xtensa_custom +config BR2_XTENSA_CUSTOM_NAME + string "Custom Xtensa processor configuration name" + depends on BR2_XTENSA_CUSTOM default "" help Name given to a custom Xtensa processor configuration. -config BR2_xtensa_core_name +config BR2_XTENSA_CORE_NAME string - default BR2_xtensa_custom_name if BR2_xtensa_custom + default BR2_XTENSA_CUSTOM_NAME if BR2_XTENSA_CUSTOM default "" if BR2_xtensa_fsf -config BR2_xtensa_overlay_dir +config BR2_XTENSA_OVERLAY_DIR string "Overlay directory for custom configuration" - depends on BR2_xtensa_custom + depends on BR2_XTENSA_CUSTOM default "" help - Provide a directory path that contains the overlay files - for the custom configuration. The path is based on the - buildroot top directory. + Provide the directory path that contains the overlay file + for a custom processor configuration. The path is relative + 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 default "xtensa" if BR2_xtensa diff --git a/package/binutils/binutils.mk b/package/binutils/binutils.mk index 82f8fd2..92e0a74 100644 --- a/package/binutils/binutils.mk +++ b/package/binutils/binutils.mk @@ -68,11 +68,11 @@ define BINUTILS_INSTALL_TARGET_CMDS endef endif -XTENSA_CORE_NAME = $(call qstrip, $(BR2_xtensa_core_name)) +XTENSA_CORE_NAME = $(call qstrip, $(BR2_XTENSA_CORE_NAME)) ifneq ($(XTENSA_CORE_NAME),) define BINUTILS_XTENSA_PRE_PATCH - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(XTENSA_CORE_NAME).tar \ - -C $(@D) bfd include ld + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(XTENSA_CORE_NAME).tar \ + -C $(@D) --strip-components=1 binutils endef HOST_BINUTILS_PRE_PATCH_HOOKS += BINUTILS_XTENSA_PRE_PATCH endif diff --git a/toolchain/gcc/gcc-uclibc-4.x.mk b/toolchain/gcc/gcc-uclibc-4.x.mk index 1710070..7a0b4ca 100644 --- a/toolchain/gcc/gcc-uclibc-4.x.mk +++ b/toolchain/gcc/gcc-uclibc-4.x.mk @@ -251,9 +251,9 @@ $(GCC_DIR)/.unpacked: $(DL_DIR)/$(GCC_SOURCE) rm -rf $(GCC_DIR) $(GCC_CAT) $(DL_DIR)/$(GCC_SOURCE) | tar -C $(TOOLCHAIN_DIR) $(TAR_OPTIONS) - $(call CONFIG_UPDATE,$(@D)) -ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip,\ - $(BR2_xtensa_core_name)).tar -C $(@D) include +ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip,\ + $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gcc endif touch $@ diff --git a/toolchain/gdb/gdb.mk b/toolchain/gdb/gdb.mk index dc305a6..c42c755 100644 --- a/toolchain/gdb/gdb.mk +++ b/toolchain/gdb/gdb.mk @@ -25,9 +25,9 @@ gdb-unpacked: $(GDB_DIR)/.unpacked $(GDB_DIR)/.unpacked: $(DL_DIR)/$(GDB_SOURCE) mkdir -p $(GDB_DIR) $(GDB_CAT) $(DL_DIR)/$(GDB_SOURCE) | tar -C $(GDB_DIR) $(TAR_STRIP_COMPONENTS)=1 $(TAR_OPTIONS) - -ifneq ($(call qstrip, $(BR2_xtensa_core_name)),) - tar xf $(BR2_xtensa_overlay_dir)/xtensa_$(call qstrip, \ - $(BR2_xtensa_core_name)).tar -C $(@D) bfd include gdb +ifneq ($(call qstrip, $(BR2_XTENSA_CORE_NAME)),) + tar xf $(BR2_XTENSA_OVERLAY_DIR)/xtensa_$(call qstrip, \ + $(BR2_XTENSA_CORE_NAME)).tar -C $(@D) --strip-components=1 gdb endif ifneq ($(wildcard $(GDB_PATCH_DIR)),) support/scripts/apply-patches.sh $(GDB_DIR) $(GDB_PATCH_DIR) \*.patch