From patchwork Wed Aug 17 05:32:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Oliver O'Halloran X-Patchwork-Id: 659901 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3sDdDz6zn9z9sD5 for ; Wed, 17 Aug 2016 15:33:39 +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=SDBD9AaK; dkim-atps=neutral Received: from ozlabs.org (lists.ozlabs.org [IPv6:2401:3900:2:1::3]) by lists.ozlabs.org (Postfix) with ESMTP id 3sDdDz66tfzDr4d for ; Wed, 17 Aug 2016 15:33:39 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=SDBD9AaK; dkim-atps=neutral X-Original-To: skiboot@lists.ozlabs.org Delivered-To: skiboot@lists.ozlabs.org Received: from mail-pf0-x241.google.com (mail-pf0-x241.google.com [IPv6:2607:f8b0:400e:c00::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by lists.ozlabs.org (Postfix) with ESMTPS id 3sDdDh1nrdzDr4d for ; Wed, 17 Aug 2016 15:33:24 +1000 (AEST) Authentication-Results: lists.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=SDBD9AaK; dkim-atps=neutral Received: by mail-pf0-x241.google.com with SMTP id h186so6879205pfg.2 for ; Tue, 16 Aug 2016 22:33:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=0O4GkeBZAU7L4vZ/jWCHtMLqcocjcOIsGsHO2lih4Mk=; b=SDBD9AaKDOqqUikOv9nsUkOg7IqY23mAUt5r+raNXrCNo7q+ArfZ/iSEZap4suHYzk Z63rzHRoqKDZzOYDQ7Sa4bKDzoalulN0O6bP9Drd1S+M8zcVP06qwBYoqVQKDgSzSaLE 6Nxo6bWft+Yf4T4tA0DxEKEeixdaVe8QSED0m7xEnRRxX/WDEG0AJmh7UxLBYfk9lBG7 vJXQUaLlBCEA8JV1RBDeZ75XndmNXQx6MvFCcdc8A5+EoEenAavG/9lg71l4b8Rnoh8O VPp4puf99JOv/Fm0YjFsrFX0UrZOvqMQTqrVU306sN+hfPNEIJJmJiV5jzxC3idb7U3P LoqA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=0O4GkeBZAU7L4vZ/jWCHtMLqcocjcOIsGsHO2lih4Mk=; b=G4ljrxuCtQ2nZcVr3P+JzWf1EL87Vp38drQJsXGmeg+IM0HPFYjdSc/7LhRMFbxXOh s+SwTNdAg166YApGPHt9waSQ2RuRWdxAs5c8N+TXH0rFJ2q4emhjmAtJLLEmwlcdT7oP yJYRwpeFWtxHBEdmXk/Oz6+P2hUvlbHj4k+3WZVsoORCEm+DQHZoJUE8pK4FpG8j0LMN UaLjbJ30OxzXm6JXag+hJj1XvyI05pai7BHC31iAgvXOzI4E0pHF/NKhLs0iJtJmgb8Q 0iC5+dUCLEm/D0XbmGba8bBYHoD0pKLXf3x7Q5h8rZLB9Yif9UH7UtQDkPoYgZMSx+ga 5uzA== X-Gm-Message-State: AEkoouvS1Vkr+BpIH1W04d9pU6KhQPk/aWb2gQfPVUJmtd72/A3ZBjEMDx7GVxDIet7iug== X-Received: by 10.98.64.93 with SMTP id n90mr16883658pfa.29.1471412002042; Tue, 16 Aug 2016 22:33:22 -0700 (PDT) Received: from canetoad.ozlabs.ibm.com ([122.99.82.10]) by smtp.gmail.com with ESMTPSA id p75sm43376027pfa.71.2016.08.16.22.33.19 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Aug 2016 22:33:21 -0700 (PDT) From: Oliver O'Halloran To: skiboot@lists.ozlabs.org Date: Wed, 17 Aug 2016 15:32:48 +1000 Message-Id: <1471411974-8179-2-git-send-email-oohall@gmail.com> X-Mailer: git-send-email 2.5.5 In-Reply-To: <1471411974-8179-1-git-send-email-oohall@gmail.com> References: <1471411974-8179-1-git-send-email-oohall@gmail.com> Subject: [Skiboot] [PATCH v2 1/7] nvram: rename nvram-format.h to nvram.h X-BeenThere: skiboot@lists.ozlabs.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: Mailing list for skiboot development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: skiboot-bounces+incoming=patchwork.ozlabs.org@lists.ozlabs.org Sender: "Skiboot" The NVRAM handling code was split into two files so that the partition parsing could be separately tested. Currently there is no nvram.h and the tests #include nvram-format.c directly. This patch renames nvram-format.h to something more sensible. Signed-off-by: Oliver O'Halloran --- core/nvram-format.c | 2 +- core/nvram.c | 2 +- include/nvram-format.h | 23 ----------------------- include/nvram.h | 23 +++++++++++++++++++++++ 4 files changed, 25 insertions(+), 25 deletions(-) delete mode 100644 include/nvram-format.h create mode 100644 include/nvram.h diff --git a/core/nvram-format.c b/core/nvram-format.c index 5a16fd3de5e6..a81663ceb35f 100644 --- a/core/nvram-format.c +++ b/core/nvram-format.c @@ -15,7 +15,7 @@ */ #include -#include +#include /* * NVRAM Format as specified in PAPR diff --git a/core/nvram.c b/core/nvram.c index 38babcc7c7e2..9e860d983768 100644 --- a/core/nvram.c +++ b/core/nvram.c @@ -20,7 +20,7 @@ #include #include #include -#include +#include static void *nvram_image; static uint32_t nvram_size; diff --git a/include/nvram-format.h b/include/nvram-format.h deleted file mode 100644 index d7432a7fe720..000000000000 --- a/include/nvram-format.h +++ /dev/null @@ -1,23 +0,0 @@ -/* Copyright 2013-2014 IBM Corp. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - * implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -#ifndef __NVRAM_FORMAT_H -#define __NVRAM_FORMAT_H - -int nvram_format(void *nvram_image, uint32_t nvram_size); -int nvram_check(void *nvram_image, uint32_t nvram_size); - -#endif /* __NVRAM_FORMAT_H */ diff --git a/include/nvram.h b/include/nvram.h new file mode 100644 index 000000000000..ce33d2fc2d80 --- /dev/null +++ b/include/nvram.h @@ -0,0 +1,23 @@ +/* Copyright 2013-2014 IBM Corp. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + * implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef __NVRAM_H +#define __NVRAM_H + +int nvram_format(void *nvram_image, uint32_t nvram_size); +int nvram_check(void *nvram_image, uint32_t nvram_size); + +#endif /* __NVRAM_H */