From patchwork Tue Mar 10 15:31:03 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 45586 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-we0-f199.google.com (mail-we0-f199.google.com [74.125.82.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C50DD214BF for ; Tue, 10 Mar 2015 15:32:01 +0000 (UTC) Received: by wesq59 with SMTP id q59sf2046682wes.1 for ; Tue, 10 Mar 2015 08:32:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:from:to:date:message-id:in-reply-to :references:cc:subject:precedence:list-id:list-unsubscribe :list-archive:list-post:list-help:list-subscribe:mime-version :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=j4O4gE6XYSInKr2kBHw2/LrjSFU7YpejQFJItH2RxXQ=; b=VlNatONqkZ+unh8Q+40vlHsZIFTQyrGN4vUemyvupoJE/Pg1kT/Ha5R6R5paXKnwJd YaN/KQ6uUQzCvY+KANy2vN7vnLGNNUold73KyoRkUkMPrlz9qEe+Bv5DrMC6B3JzPNYe +ZA2fFf/NtSbUrXdjLAEZSOlyhTnjP5KfrdvMqb7W/4gRNigzJ0MU67YqU39g5j0sPpK MhUaTKXKMm+mvgXU586jQM22TdxpBKy8KloiVnUY5eba68hSl8BN2toMdVpxiN6swwZy D7Lg8xxTPrxnmzenSpUjqA1pqLxAgyPu+Nld3hyPYKHMYLO1PBptpY9KnhJvjeLrgzDi 5FVw== X-Gm-Message-State: ALoCoQmmIu3bmd3q7x70r+QQb9xteJ9/iFBvgadrpHs6JRL+oVfX3EjUBEszBhmn+AN6E9BLtRRq X-Received: by 10.112.44.167 with SMTP id f7mr2272082lbm.9.1426001520759; Tue, 10 Mar 2015 08:32:00 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.204.134 with SMTP id ky6ls36656lac.76.gmail; Tue, 10 Mar 2015 08:32:00 -0700 (PDT) X-Received: by 10.152.37.97 with SMTP id x1mr28461539laj.2.1426001520314; Tue, 10 Mar 2015 08:32:00 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id di8si566469lac.62.2015.03.10.08.32.00 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 08:32:00 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbiw7 with SMTP id w7so2562220lbi.7 for ; Tue, 10 Mar 2015 08:32:00 -0700 (PDT) X-Received: by 10.112.130.100 with SMTP id od4mr8194918lbb.86.1426001520160; Tue, 10 Mar 2015 08:32:00 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.35.133 with SMTP id h5csp2206658lbj; Tue, 10 Mar 2015 08:31:59 -0700 (PDT) X-Received: by 10.140.28.203 with SMTP id 69mr41821668qgz.5.1426001515456; Tue, 10 Mar 2015 08:31:55 -0700 (PDT) Received: from ip-10-35-177-41.ec2.internal (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTPS id w7si767989qha.66.2015.03.10.08.31.53 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Mar 2015 08:31:55 -0700 (PDT) Received-SPF: none (google.com: lng-odp-bounces@lists.linaro.org does not designate permitted sender hosts) client-ip=54.225.227.206; Received: from localhost ([127.0.0.1] helo=ip-10-35-177-41.ec2.internal) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YVM8O-0003rl-7X; Tue, 10 Mar 2015 15:31:52 +0000 Received: from mail-lb0-f171.google.com ([209.85.217.171]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YVM82-0003ox-6a for lng-odp@lists.linaro.org; Tue, 10 Mar 2015 15:31:30 +0000 Received: by lbvp9 with SMTP id p9so2533532lbv.10 for ; Tue, 10 Mar 2015 08:31:24 -0700 (PDT) X-Received: by 10.112.159.195 with SMTP id xe3mr31259961lbb.64.1426001484612; Tue, 10 Mar 2015 08:31:24 -0700 (PDT) Received: from uglx0153363.synapse.com ([195.238.92.128]) by mx.google.com with ESMTPSA id a2sm106609lbm.32.2015.03.10.08.31.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Mar 2015 08:31:24 -0700 (PDT) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Tue, 10 Mar 2015 17:31:03 +0200 Message-Id: <1426001473-14618-6-git-send-email-taras.kondratiuk@linaro.org> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1426001473-14618-1-git-send-email-taras.kondratiuk@linaro.org> References: <1426001473-14618-1-git-send-email-taras.kondratiuk@linaro.org> X-Topics: patch Cc: Taras Kondratiuk Subject: [lng-odp] [KEYSTONE2 PATCH 05/15] linux-ks2: build only init part X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , MIME-Version: 1.0 Errors-To: lng-odp-bounces@lists.linaro.org Sender: lng-odp-bounces@lists.linaro.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: taras.kondratiuk@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 Signed-off-by: Taras Kondratiuk Signed-off-by: Taras Kondratiuk --- platform/linux-keystone2/Makefile.am | 15 ++----- platform/linux-keystone2/include/odp.h | 47 ++++++++++++++++++++++ platform/linux-keystone2/include/odp/plat/state.h | 2 +- .../linux-keystone2/include/odp/plat/ti_mcsdk.h | 2 +- platform/linux-keystone2/include/odp_internal.h | 4 +- platform/linux-keystone2/odp_init.c | 14 +++---- 6 files changed, 61 insertions(+), 23 deletions(-) create mode 100644 platform/linux-keystone2/include/odp.h diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index 505cb97..e302414 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -18,7 +18,7 @@ LIBS += $(KS2_LIBS) linux_generic_srcdir = $(top_srcdir)/platform/linux-generic include_HEADERS = \ - $(top_srcdir)/include/odp.h + $(srcdir)/include/odp.h odpincludedir= $(includedir)/odp odpinclude_HEADERS = \ @@ -130,28 +130,19 @@ subdirheaders_HEADERS = \ $(top_srcdir)/helper/include/odp/helper/udp.h __LIB__libodp_la_SOURCES = \ - odp_buffer.c \ - odp_buffer_pool.c \ - odp_crypto.c \ odp_init.c \ - odp_packet.c \ - odp_packet_io.c \ - odp_queue.c \ mcsdk/mcsdk_init.c \ mcsdk/mcsdk_navig.c \ mcsdk/mcsdk_rmclient.c \ mcsdk/sockutils.c \ ../linux-generic/odp_barrier.c \ - ../linux-generic/odp_coremask.c \ + ../linux-generic/odp_cpumask.c \ ../linux-generic/odp_linux.c \ - ../linux-generic/odp_packet_flags.c \ ../linux-generic/odp_ring.c \ ../linux-generic/odp_rwlock.c \ - ../linux-generic/odp_schedule.c \ ../linux-generic/odp_shared_memory.c \ ../linux-generic/odp_spinlock.c \ ../linux-generic/odp_system_info.c \ ../linux-generic/odp_thread.c \ ../linux-generic/odp_ticketlock.c \ - ../linux-generic/odp_time.c \ - ../linux-generic/odp_timer.c + ../linux-generic/odp_time.c diff --git a/platform/linux-keystone2/include/odp.h b/platform/linux-keystone2/include/odp.h new file mode 100644 index 0000000..6ab30a9 --- /dev/null +++ b/platform/linux-keystone2/include/odp.h @@ -0,0 +1,47 @@ +/* Copyright (c) 2013, Linaro Limited + * All rights reserved + * + * SPDX-License-Identifier: BSD-3-Clause + */ + +/** + * @file + * + * The OpenDataPlane API + * + */ + +#ifndef ODP_H_ +#define ODP_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#ifdef __cplusplus +} +#endif +#endif diff --git a/platform/linux-keystone2/include/odp/plat/state.h b/platform/linux-keystone2/include/odp/plat/state.h index 2406245..0b4b07f 100644 --- a/platform/linux-keystone2/include/odp/plat/state.h +++ b/platform/linux-keystone2/include/odp/plat/state.h @@ -13,7 +13,7 @@ extern "C" { #endif -#include +#include /** * @internal Global ODP state diff --git a/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h b/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h index aa7e64f..5ccc9e0 100644 --- a/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h +++ b/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h @@ -19,7 +19,7 @@ extern "C" { #include #include #include -#include +#include /** @internal McSDK initialization configuration */ struct mcsdk_cfg_s { diff --git a/platform/linux-keystone2/include/odp_internal.h b/platform/linux-keystone2/include/odp_internal.h index 6cce2b5..7ebf567 100644 --- a/platform/linux-keystone2/include/odp_internal.h +++ b/platform/linux-keystone2/include/odp_internal.h @@ -19,8 +19,8 @@ extern "C" { #endif -#include -#include +#include +#include int odp_system_info_init(void); diff --git a/platform/linux-keystone2/odp_init.c b/platform/linux-keystone2/odp_init.c index 896ff11..4e9783d 100644 --- a/platform/linux-keystone2/odp_init.c +++ b/platform/linux-keystone2/odp_init.c @@ -6,11 +6,10 @@ * SPDX-License-Identifier: BSD-3-Clause */ -#include +#include +#include +#include #include -#include -#include -#include struct odp_global_s *odp_global; struct odp_proc_s odp_proc; @@ -35,7 +34,7 @@ int odp_init_global(odp_init_t *params ODP_UNUSED, odp_pr_err("ODP McSDK init failed.\n"); return -1; } - +#if 0 if (odp_buffer_pool_init_global()) { odp_pr_err("ODP buffer pool init failed.\n"); return -1; @@ -65,7 +64,7 @@ int odp_init_global(odp_init_t *params ODP_UNUSED, odp_pr_err("ODP timer init failed.\n"); return -1; } - +#endif return 0; } @@ -95,11 +94,12 @@ int odp_init_local(void) odp_pr_dbg("Skipping local init McSDK\n"); return 0; } - +#if 0 if (odp_schedule_init_local()) { odp_pr_err("ODP schedule local init failed.\n"); return -1; } +#endif return 0; }