From patchwork Tue Apr 24 17:44:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bryan O'Donoghue X-Patchwork-Id: 903725 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="b0PpHEvR"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 40VrLg26f5z9s0v for ; Wed, 25 Apr 2018 03:44:43 +1000 (AEST) Received: by lists.denx.de (Postfix, from userid 105) id 0714EC21EFF; Tue, 24 Apr 2018 17:44:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id DC50EC21E42; Tue, 24 Apr 2018 17:44:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id AE17DC21E2B; Tue, 24 Apr 2018 17:44:36 +0000 (UTC) Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by lists.denx.de (Postfix) with ESMTPS id 5B19AC21E0D for ; Tue, 24 Apr 2018 17:44:36 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id f6so2665857wmc.4 for ; Tue, 24 Apr 2018 10:44:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id; bh=NodFOMleAwv+TB0/mmjONmzOJi6k4x6TtS+jmbAr05A=; b=b0PpHEvRmcoLRzTqBtcNmEEZhwY2GUUulZJ8tAvdZ8ZRhIcSWWMYB7/DnqOX/mlnYG M/ZfWHoIvA/2G2xxGCBLSDXvBtOfdj98Jo3LCNnebL7li62uTN4ns6Q7Bt/9v5rJrgSK EY6zqQMr8BDYHCkCtIALhYwbwi3tk61t3iwIM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=NodFOMleAwv+TB0/mmjONmzOJi6k4x6TtS+jmbAr05A=; b=UkygrTUuORoJeLLM/t+yQZFXIr2jzaGTOVUvwkLY60bzUc9KzLQJb4clbPl9HyJ915 AgiCIFByoNAyB5tE0JfebXpKE/35hUU+lZ0mLWbN0yn2WsTBurnaDuFn3JeIM8EyeCoj 2mn/pwoY3szM3+1GsiXqJaGxC6l74BeuUrhU7KCmFi2uKh0ANrUCdKp4QUvIz0/MeIml YcLlrm+V6KzmRtZgZV9XKVHJCLKqWWvksOPD4AipBwNNZtM7PgcDMDS3ID/kFInlOOu+ I37pok2NNXjFVA/Vq0nfHiYe7izcKjUc4kBrH95sRrNYkok/peBUSIRWVLpN+mpBXh+y rl4Q== X-Gm-Message-State: ALQs6tDrvOesjfS2YLuLv1U7wEixhkRf74J2S/PoOUR/LPP1WVmE4sMV 0Lv02hHBhqmisQ4Apgk38qzdUukAr24= X-Google-Smtp-Source: AIpwx4/bKKWGro+jzxzwRpTjFmcGm4nuDO2bQyoQ5we4uzPz/mgJorEZrx/ryzMtUC8uCiKnIPGO9w== X-Received: by 10.80.232.136 with SMTP id f8mr34587966edn.8.1524591875696; Tue, 24 Apr 2018 10:44:35 -0700 (PDT) Received: from event-horizon.net ([109.255.42.2]) by smtp.gmail.com with ESMTPSA id l9sm9686327edk.9.2018.04.24.10.44.34 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 24 Apr 2018 10:44:34 -0700 (PDT) From: Bryan O'Donoghue To: u-boot@lists.denx.de, sbabic@denx.de, fabio.estevam@nxp.com, breno.lima@nxp.com Date: Tue, 24 Apr 2018 18:44:29 +0100 Message-Id: <20180424174432.11757-1-bryan.odonoghue@linaro.org> X-Mailer: git-send-email 2.17.0 Subject: [U-Boot] [PATCH v5 0/3] WaRP7 unify secure and non-secure defconfigs X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This tree here is pullable http://git.linaro.org/landing-teams/working/mbl/u-boot.git/log/?h=linaro-mbl%2bbod-nouart v5: - Fixes broken merge conflict missed in last patch resend V4: - Adds Tested-by/Reviewed-by from Beno and Fabio as indicated for my patches - Resends Pierre-Jean's patch Since my parallel patchset relies on this patch I'm sending it again with my own series to make sure it doesn't get lost. To Pierre-Jean's patch I've added - Reviewed-by as Fabio indicated - Signed-off-by from me too V3: - Remove warp7_secure_defconfig from board/warp7/MAINTAINERS - Add RB-tag from Fabio as indicated V2: Maintaining a secure and non-secure defconfig is a PITA. Having discussed an observed bug with the non-secure boot-path with Fabio and undertaken to ensure both upstream and NXP BSP kernels would work - this patchset does two things. 1. Switches on CONFIG_ARMV7_BOOT_SEC_DEFAULT for warp7_defconfig 2. Removes warp7_secure_defconfig in its entirety I have an upcoming set of patches that uses the secure defconfig which I've already verified can simply be merged into mainline WaRP7 as-is so, in this context there appears to be no justification for keeping separate configuration files. Fix the bug and zap the fat ! Bryan O'Donoghue (2): warp7: defconfig: Fix CAAM on boot with tip-of-tree warp7: secure_defconfig: Remove secure_defconfig Pierre-Jean TEXIER (1): warp7: configs: enable CONFIG_CMD_FS_GENERIC board/warp7/MAINTAINERS | 1 - configs/warp7_defconfig | 2 ++ configs/warp7_secure_defconfig | 43 ---------------------------------- 3 files changed, 2 insertions(+), 44 deletions(-) delete mode 100644 configs/warp7_secure_defconfig