From patchwork Sun Apr 24 21:15:23 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pieter Smith X-Patchwork-Id: 614224 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 3qtMbF6kGVz9sC4 for ; Mon, 25 Apr 2016 07:15:53 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=Rzq4ChiH; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0EA698B235; Sun, 24 Apr 2016 21:15:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gq7DFfgQVaoJ; Sun, 24 Apr 2016 21:15:48 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id B379E8B0C2; Sun, 24 Apr 2016 21:15:47 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 773E01C0CB7 for ; Sun, 24 Apr 2016 21:15:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 72227953A8 for ; Sun, 24 Apr 2016 21:15:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "References" Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 96rCiiEMTSpX for ; Sun, 24 Apr 2016 21:15:42 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) by hemlock.osuosl.org (Postfix) with ESMTPS id 035A19538F for ; Sun, 24 Apr 2016 21:15:42 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id n3so20050456wmn.1 for ; Sun, 24 Apr 2016 14:15:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=7YovnBOCgOanP2JB4+xo148Fpwr8HHVpNDnCOvOrRVI=; b=Rzq4ChiHnISBRaB36q8KzPjeDy9/Gdzhk2vy9VbBmxGgPabZuFuyTIGavFmeYgiQRB tPTzjo8X0YiP2jefVepX5Qw7Qwxo+mNTB6siH93SRj5YOQV4CiuwD7B3+NXsESokWJaF E8okLHwjc3k7L927nK1faP0oscPUM1VojtLV2oPBvMBrfuvBpM+WdPBSaYcsTs77c7b5 BAKtwGJ38s/siw4HUZFsNDQ4qHGa9SbsrRTYyrrz3eEjEmtvAGbCKvqjFncXnAQRDRSG 3rcOjV/FcIqYYopImvPwbLuLfAjb9DpJd8SDj1D1Rdx5HHJxRhJ1N5c6dv79qiLzj2CI bheQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:in-reply-to:references; bh=7YovnBOCgOanP2JB4+xo148Fpwr8HHVpNDnCOvOrRVI=; b=m8i/PgoDO955zSUf0SkQRwY6YoFVC4qJgiNuz6Hiu349AbwnWXSB/Ml6Ah8pf+5fw5 iDLDnszH9a9U6j93X2ikEUrrLhBITPmo5EsnppIUl80fEFwMhdcNDhUsM5T3xc6JiqEN vVFatUL3Wx89eoVU8jPKx2gmWQC7preu53t216Ma3WPYS8zEI7hrzndg5F7jFZTq/HIO hoGASjBAJzyRriMZ4NbIvQdMSQZtPs/Uq8PtGi/O/TVfJ33dN5lMqJHkt/aXWCeZrIRQ BxILXj7XB5NESxrq7tHqWrZVi2jzAWcrjWl91APfhD2NUmUPXCuner9gTvVph4ghNHSP OjEQ== X-Gm-Message-State: AOPr4FXCFL40QPtuC/ccwyZRHtDWvob1LgKI1/W3Vj8USk4y38Vc2T/c44iG1OISYs801A== X-Received: by 10.194.158.226 with SMTP id wx2mr29785001wjb.91.1461532540634; Sun, 24 Apr 2016 14:15:40 -0700 (PDT) Received: from localhost.localdomain ([31.161.172.8]) by smtp.gmail.com with ESMTPSA id da5sm20265864wjb.25.2016.04.24.14.15.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 24 Apr 2016 14:15:39 -0700 (PDT) From: Pieter Smith To: buildroot@buildroot.org, Yegor Yefremov , Arnout Vandecappelle , Thomas Petazzoni Date: Sun, 24 Apr 2016 23:15:23 +0200 Message-Id: X-Mailer: git-send-email 2.5.0 In-Reply-To: References: In-Reply-To: References: Cc: Pieter Smith , "Yann E. MORIN" , Peter Korsgaard Subject: [Buildroot] [PATCH v6 1/3] barebox: prepare for auxiliarry build X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" No functional changes. In preparation for the auxiliary barebox build, boot/barebox is split into two parts: 1. boot/barebox: - The source and patch specification which are to be shared between the barebox and barebox-aux packages. - The barebox-package function and build logic. 2. boot/barebox/barebox: - The package configuration, fragments, barebox env, etc. - The actual barebox package make instantiation. Signed-off-by: Pieter Smith --- boot/barebox/Config.in | 67 +-------------------------------------- boot/barebox/barebox.mk | 3 +- boot/barebox/barebox/Config.in | 65 +++++++++++++++++++++++++++++++++++++ boot/barebox/barebox/barebox.hash | 1 + boot/barebox/barebox/barebox.mk | 8 +++++ 5 files changed, 76 insertions(+), 68 deletions(-) create mode 100644 boot/barebox/barebox/Config.in create mode 120000 boot/barebox/barebox/barebox.hash create mode 100644 boot/barebox/barebox/barebox.mk diff --git a/boot/barebox/Config.in b/boot/barebox/Config.in index 0729586..e25b14b 100644 --- a/boot/barebox/Config.in +++ b/boot/barebox/Config.in @@ -64,71 +64,6 @@ config BR2_TARGET_BAREBOX_CUSTOM_GIT_VERSION endif - -choice - prompt "Barebox configuration" - default BR2_TARGET_BAREBOX_USE_DEFCONFIG - -config BR2_TARGET_BAREBOX_USE_DEFCONFIG - bool "Using a defconfig" - -config BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG - bool "Using a custom config file" - -endchoice - -config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG - string "board defconfig" - depends on BR2_TARGET_BAREBOX_USE_DEFCONFIG - help - Name of the board for which Barebox should be built, without - the _defconfig suffix. - - -config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE - string "Configuration file path" - depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG - help - Path to the barebox configuration file - -config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES - string "Additional configuration fragment files" - help - A space-separated list of configuration fragment files, - that will be merged to the main Barebox configuration file. - -config BR2_TARGET_BAREBOX_IMAGE_FILE - string "Image filename" - help - Name of the generated barebox image, which will be copied to - the images directory. - - If left empty, defaults to: - - barebox.bin for barebox versions older than 2012.10. - - barebox-flash-image for later versions. - -config BR2_TARGET_BAREBOX_BAREBOXENV - bool "bareboxenv tool in target" - help - Install bareboxenv tool in target. - -config BR2_TARGET_BAREBOX_CUSTOM_ENV - bool "Generate an environment image" - help - Generate a custom environment image. This environment will - contain the variables and scripts to be used at boot by - barebox. - -config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH - string "Environment path" - depends on BR2_TARGET_BAREBOX_CUSTOM_ENV - help - Path to the directory containing the custom barebox - environment. Depending on your setup, it will probably be - based on either the content of the defaultenv or - defaultenv-2 directories in the barebox source code, plus - the additions needed. The output will be an image in the - barebox devfs format, stored in the images directory, with - the same name as the directory name given here. +source boot/barebox/barebox/Config.in endif diff --git a/boot/barebox/barebox.mk b/boot/barebox/barebox.mk index a5b1b1e..8b83bf2 100644 --- a/boot/barebox/barebox.mk +++ b/boot/barebox/barebox.mk @@ -142,5 +142,4 @@ endef barebox-package=$(call inner-barebox-package,$(call UPPERCASE,$(pkgname))) -# instantiate this barebox package -$(eval $(barebox-package)) +include boot/barebox/barebox/barebox.mk diff --git a/boot/barebox/barebox/Config.in b/boot/barebox/barebox/Config.in new file mode 100644 index 0000000..bf13ea5 --- /dev/null +++ b/boot/barebox/barebox/Config.in @@ -0,0 +1,65 @@ +choice + prompt "Barebox configuration" + default BR2_TARGET_BAREBOX_USE_DEFCONFIG + +config BR2_TARGET_BAREBOX_USE_DEFCONFIG + bool "Using a defconfig" + +config BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG + bool "Using a custom config file" + +endchoice + +config BR2_TARGET_BAREBOX_BOARD_DEFCONFIG + string "board defconfig" + depends on BR2_TARGET_BAREBOX_USE_DEFCONFIG + help + Name of the board for which Barebox should be built, without + the _defconfig suffix. + + +config BR2_TARGET_BAREBOX_CUSTOM_CONFIG_FILE + string "Configuration file path" + depends on BR2_TARGET_BAREBOX_USE_CUSTOM_CONFIG + help + Path to the barebox configuration file + +config BR2_TARGET_BAREBOX_CONFIG_FRAGMENT_FILES + string "Additional configuration fragment files" + help + A space-separated list of configuration fragment files, + that will be merged to the main Barebox configuration file. + +config BR2_TARGET_BAREBOX_IMAGE_FILE + string "Image filename" + help + Name of the generated barebox image, which will be copied to + the images directory. + + If left empty, defaults to: + - barebox.bin for barebox versions older than 2012.10. + - barebox-flash-image for later versions. + +config BR2_TARGET_BAREBOX_BAREBOXENV + bool "bareboxenv tool in target" + help + Install bareboxenv tool in target. + +config BR2_TARGET_BAREBOX_CUSTOM_ENV + bool "Generate an environment image" + help + Generate a custom environment image. This environment will + contain the variables and scripts to be used at boot by + barebox. + +config BR2_TARGET_BAREBOX_CUSTOM_ENV_PATH + string "Environment path" + depends on BR2_TARGET_BAREBOX_CUSTOM_ENV + help + Path to the directory containing the custom barebox + environment. Depending on your setup, it will probably be + based on either the content of the defaultenv or + defaultenv-2 directories in the barebox source code, plus + the additions needed. The output will be an image in the + barebox devfs format, stored in the images directory, with + the same name as the directory name given here. diff --git a/boot/barebox/barebox/barebox.hash b/boot/barebox/barebox/barebox.hash new file mode 120000 index 0000000..b6462b8 --- /dev/null +++ b/boot/barebox/barebox/barebox.hash @@ -0,0 +1 @@ +../barebox.hash \ No newline at end of file diff --git a/boot/barebox/barebox/barebox.mk b/boot/barebox/barebox/barebox.mk new file mode 100644 index 0000000..6a5a80d --- /dev/null +++ b/boot/barebox/barebox/barebox.mk @@ -0,0 +1,8 @@ +################################################################################ +# +# barebox +# +################################################################################ + +# Instantiate the barebox package +$(eval $(barebox-package))