From patchwork Tue Mar 10 15:30:59 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Taras Kondratiuk X-Patchwork-Id: 45582 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id E04A6214BF for ; Tue, 10 Mar 2015 15:31:42 +0000 (UTC) Received: by lbvn10 with SMTP id n10sf2072791lbv.1 for ; Tue, 10 Mar 2015 08:31:41 -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=0OJ5eI2zgg5PdlNNQ5ZcYlrH781I/Tg197n64xyi4pc=; b=STDucliaLPVDU5cTajDhhFiULijt39LaZ+WmoF2zKd7Qv8gi7tcS5H6YGYg0XjQ9FO CXlIgFzFjP9G5jnnr5e38Zs9t7AMCf9jVzojxx5KLnqn5fVDV0c98FAEwDCX72+chJaI iaH/cM3uML990GZH0fCqhIBTvSQ0LoWsvQeLmOTwfj8WJBC2WbTvrjb0nX0oW2txdFYd B6VFzbxxAyS0RvJp9YdegMHSjXlhv7B5j+Dv5gS6RdHr7kQWDrfIhGCQ2yeVoOwNXFkD Q+vUrRCfFtIgg1cIjRZjkQhmCq4r85S4E/SkpL8EOsc/L+9a536myLcPpbFzakTYcAmU RDBQ== X-Gm-Message-State: ALoCoQmQpYVPIPp3OW6FRLVKHq3co+kah2v7Mb+tKMsAcOq16+m7vQ0e1WQNqaQ33USf7ch4MFYZ X-Received: by 10.180.182.201 with SMTP id eg9mr940737wic.3.1426001501913; Tue, 10 Mar 2015 08:31:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.1.3 with SMTP id 3ls39602lai.36.gmail; Tue, 10 Mar 2015 08:31:41 -0700 (PDT) X-Received: by 10.112.154.163 with SMTP id vp3mr6699205lbb.93.1426001501739; Tue, 10 Mar 2015 08:31:41 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id i6si559305lbc.75.2015.03.10.08.31.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Mar 2015 08:31:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by labmn12 with SMTP id mn12so2594509lab.0 for ; Tue, 10 Mar 2015 08:31:41 -0700 (PDT) X-Received: by 10.152.30.103 with SMTP id r7mr27934667lah.76.1426001501627; Tue, 10 Mar 2015 08:31:41 -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 h5csp2206456lbj; Tue, 10 Mar 2015 08:31:40 -0700 (PDT) X-Received: by 10.55.31.71 with SMTP id f68mr61017817qkf.7.1426001499983; Tue, 10 Mar 2015 08:31:39 -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 98si741806qkt.95.2015.03.10.08.31.38 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 10 Mar 2015 08:31:39 -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 1YVM88-0003q2-CJ; Tue, 10 Mar 2015 15:31:36 +0000 Received: from mail-lb0-f182.google.com ([209.85.217.182]) by ip-10-35-177-41.ec2.internal with esmtp (Exim 4.76) (envelope-from ) id 1YVM7x-0003or-QP for lng-odp@lists.linaro.org; Tue, 10 Mar 2015 15:31:26 +0000 Received: by lbvn10 with SMTP id n10so2613608lbv.1 for ; Tue, 10 Mar 2015 08:31:20 -0700 (PDT) X-Received: by 10.152.25.132 with SMTP id c4mr31212438lag.101.1426001480173; Tue, 10 Mar 2015 08:31:20 -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.19 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 10 Mar 2015 08:31:19 -0700 (PDT) From: Taras Kondratiuk To: lng-odp@lists.linaro.org Date: Tue, 10 Mar 2015 17:30:59 +0200 Message-Id: <1426001473-14618-2-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 01/15] linux-ks2: update include structure 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.215.51 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 | 152 +++++++++++++++------ .../include/{api/odp_buffer.h => odp/buffer.h} | 0 .../{api/odp_buffer_pool.h => odp/buffer_pool.h} | 0 .../include/{api/odp_crypto.h => odp/crypto.h} | 0 .../include/{api/odp_packet.h => odp/packet.h} | 0 .../{api/odp_packet_io.h => odp/packet_io.h} | 0 .../include/{api => odp/plat}/mcsdk_tune.h | 0 .../include/{api/odp_state.h => odp/plat/state.h} | 0 .../{api/odp_ti_mcsdk.h => odp/plat/ti_mcsdk.h} | 1 + 9 files changed, 110 insertions(+), 43 deletions(-) rename platform/linux-keystone2/include/{api/odp_buffer.h => odp/buffer.h} (100%) rename platform/linux-keystone2/include/{api/odp_buffer_pool.h => odp/buffer_pool.h} (100%) rename platform/linux-keystone2/include/{api/odp_crypto.h => odp/crypto.h} (100%) rename platform/linux-keystone2/include/{api/odp_packet.h => odp/packet.h} (100%) rename platform/linux-keystone2/include/{api/odp_packet_io.h => odp/packet_io.h} (100%) rename platform/linux-keystone2/include/{api => odp/plat}/mcsdk_tune.h (100%) rename platform/linux-keystone2/include/{api/odp_state.h => odp/plat/state.h} (100%) rename platform/linux-keystone2/include/{api/odp_ti_mcsdk.h => odp/plat/ti_mcsdk.h} (98%) diff --git a/platform/linux-keystone2/Makefile.am b/platform/linux-keystone2/Makefile.am index f72b350..638b903 100644 --- a/platform/linux-keystone2/Makefile.am +++ b/platform/linux-keystone2/Makefile.am @@ -9,57 +9,123 @@ include $(top_srcdir)/platform/Makefile.inc include Makefile.inc AM_CFLAGS += -I$(srcdir)/include -AM_CFLAGS += -I$(srcdir)/include/api +AM_CFLAGS += -I$(top_srcdir)/include AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include -AM_CFLAGS += -I$(top_srcdir)/platform/linux-generic/include/api AM_CFLAGS += -I$(top_srcdir)/helper/include + KS2_LIBS = -lnwalsa_$(KS2_DEVICE) -lpktlib -lpa -lsa -lcppi_$(KS2_DEVICE) -lqmss_$(KS2_DEVICE) -lrm -lhplib_$(KS2_DEVICE) LIBS += $(KS2_LIBS) +linux_generic_srcdir = $(top_srcdir)/platform/linux-generic include_HEADERS = \ - $(srcdir)/include/api/odp_buffer.h \ - $(srcdir)/include/api/odp_buffer_pool.h \ - $(srcdir)/include/api/odp_crypto.h \ - $(srcdir)/include/api/odp_packet.h \ - $(srcdir)/include/api/odp_packet_io.h \ - $(srcdir)/include/api/odp_state.h \ - $(srcdir)/include/api/odp_ti_mcsdk.h \ - $(srcdir)/include/api/mcsdk_tune.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_align.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_atomic.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_barrier.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_byteorder.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_compiler.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_config.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_coremask.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_debug.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_hints.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_init.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_packet_flags.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_queue.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_rwlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_schedule.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_shared_memory.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_spinlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_std_types.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_sync.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_system_info.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_thread.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_ticketlock.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_time.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_timer.h \ - $(top_srcdir)/platform/linux-generic/include/api/odp_version.h + $(top_srcdir)/include/odp.h + +odpincludedir= $(includedir)/odp +odpinclude_HEADERS = \ + $(srcdir)/include/odp/buffer.h \ + $(srcdir)/include/odp/buffer_pool.h \ + $(srcdir)/include/odp/crypto.h \ + $(srcdir)/include/odp/packet_io.h \ + $(srcdir)/include/odp/packet.h \ + $(linux_generic_srcdir)/include/odp/align.h \ + $(linux_generic_srcdir)/include/odp/atomic.h \ + $(linux_generic_srcdir)/include/odp/barrier.h \ + $(linux_generic_srcdir)/include/odp/byteorder.h \ + $(linux_generic_srcdir)/include/odp/compiler.h \ + $(linux_generic_srcdir)/include/odp/config.h \ + $(linux_generic_srcdir)/include/odp/cpu.h \ + $(linux_generic_srcdir)/include/odp/cpumask.h \ + $(linux_generic_srcdir)/include/odp/debug.h \ + $(linux_generic_srcdir)/include/odp/errno.h \ + $(linux_generic_srcdir)/include/odp/event.h \ + $(linux_generic_srcdir)/include/odp/hints.h \ + $(linux_generic_srcdir)/include/odp/init.h \ + $(linux_generic_srcdir)/include/odp/random.h \ + $(linux_generic_srcdir)/include/odp/packet_flags.h \ + $(linux_generic_srcdir)/include/odp/queue.h \ + $(linux_generic_srcdir)/include/odp/rwlock.h \ + $(linux_generic_srcdir)/include/odp/schedule.h \ + $(linux_generic_srcdir)/include/odp/shared_memory.h \ + $(linux_generic_srcdir)/include/odp/spinlock.h \ + $(linux_generic_srcdir)/include/odp/std_types.h \ + $(linux_generic_srcdir)/include/odp/sync.h \ + $(linux_generic_srcdir)/include/odp/system_info.h \ + $(linux_generic_srcdir)/include/odp/thread.h \ + $(linux_generic_srcdir)/include/odp/ticketlock.h \ + $(linux_generic_srcdir)/include/odp/time.h \ + $(linux_generic_srcdir)/include/odp/timer.h \ + $(linux_generic_srcdir)/include/odp/version.h + +odpplatincludedir = $(includedir)/odp/plat +odpplatinclude_HEADERS = \ + $(srcdir)/include/odp/plat/mcsdk_tune.h \ + $(srcdir)/include/odp/plat/state.h \ + $(srcdir)/include/odp/plat/ti_mcsdk.h \ + $(linux_generic_srcdir)/include/odp/plat/atomic_types.h \ + $(linux_generic_srcdir)/include/odp/plat/buffer_types.h \ + $(linux_generic_srcdir)/include/odp/plat/byteorder_types.h \ + $(linux_generic_srcdir)/include/odp/plat/classification_types.h \ + $(linux_generic_srcdir)/include/odp/plat/cpumask_types.h \ + $(linux_generic_srcdir)/include/odp/plat/crypto_types.h \ + $(linux_generic_srcdir)/include/odp/plat/event_types.h \ + $(linux_generic_srcdir)/include/odp/plat/packet_types.h \ + $(linux_generic_srcdir)/include/odp/plat/packet_io_types.h \ + $(linux_generic_srcdir)/include/odp/plat/pool_types.h \ + $(linux_generic_srcdir)/include/odp/plat/queue_types.h \ + $(linux_generic_srcdir)/include/odp/plat/schedule_types.h \ + $(linux_generic_srcdir)/include/odp/plat/shared_memory_types.h \ + $(linux_generic_srcdir)/include/odp/plat/strong_types.h \ + $(linux_generic_srcdir)/include/odp/plat/timer_types.h \ + $(linux_generic_srcdir)/include/odp/plat/version_types.h + +odpapiincludedir= $(includedir)/odp/api +odpapiinclude_HEADERS = \ + $(top_srcdir)/include/odp/api/align.h \ + $(top_srcdir)/include/odp/api/atomic.h \ + $(top_srcdir)/include/odp/api/barrier.h \ + $(top_srcdir)/include/odp/api/buffer.h \ + $(top_srcdir)/include/odp/api/byteorder.h \ + $(top_srcdir)/include/odp/api/classification.h \ + $(top_srcdir)/include/odp/api/compiler.h \ + $(top_srcdir)/include/odp/api/config.h \ + $(top_srcdir)/include/odp/api/cpu.h \ + $(top_srcdir)/include/odp/api/cpumask.h \ + $(top_srcdir)/include/odp/api/crypto.h \ + $(top_srcdir)/include/odp/api/debug.h \ + $(top_srcdir)/include/odp/api/errno.h \ + $(top_srcdir)/include/odp/api/event.h \ + $(top_srcdir)/include/odp/api/hints.h \ + $(top_srcdir)/include/odp/api/init.h \ + $(top_srcdir)/include/odp/api/packet.h \ + $(top_srcdir)/include/odp/api/packet_flags.h \ + $(top_srcdir)/include/odp/api/packet_io.h \ + $(top_srcdir)/include/odp/api/pool.h \ + $(top_srcdir)/include/odp/api/queue.h \ + $(top_srcdir)/include/odp/api/random.h \ + $(top_srcdir)/include/odp/api/rwlock.h \ + $(top_srcdir)/include/odp/api/schedule.h \ + $(top_srcdir)/include/odp/api/shared_memory.h \ + $(top_srcdir)/include/odp/api/spinlock.h \ + $(top_srcdir)/include/odp/api/std_types.h \ + $(top_srcdir)/include/odp/api/sync.h \ + $(top_srcdir)/include/odp/api/system_info.h \ + $(top_srcdir)/include/odp/api/thread.h \ + $(top_srcdir)/include/odp/api/ticketlock.h \ + $(top_srcdir)/include/odp/api/time.h \ + $(top_srcdir)/include/odp/api/timer.h \ + $(top_srcdir)/include/odp/api/version.h -subdirheadersdir = $(includedir)/helper +subdirheadersdir = $(includedir)/odp/helper subdirheaders_HEADERS = \ - $(top_srcdir)/helper/include/odph_chksum.h \ - $(top_srcdir)/helper/include/odph_eth.h \ - $(top_srcdir)/helper/include/odph_ip.h \ - $(top_srcdir)/helper/include/odph_linux.h \ - $(top_srcdir)/helper/include/odph_packet.h \ - $(top_srcdir)/helper/include/odph_ring.h \ - $(top_srcdir)/helper/include/odph_udp.h + $(top_srcdir)/helper/include/odp/helper/chksum.h \ + $(top_srcdir)/helper/include/odp/helper/eth.h \ + $(top_srcdir)/helper/include/odp/helper/icmp.h \ + $(top_srcdir)/helper/include/odp/helper/ip.h \ + $(top_srcdir)/helper/include/odp/helper/ipsec.h \ + $(top_srcdir)/helper/include/odp/helper/linux.h \ + $(top_srcdir)/helper/include/odp/helper/ring.h \ + $(top_srcdir)/helper/include/odp/helper/tcp.h \ + $(top_srcdir)/helper/include/odp/helper/udp.h __LIB__libodp_la_SOURCES = \ odp_buffer.c \ diff --git a/platform/linux-keystone2/include/api/odp_buffer.h b/platform/linux-keystone2/include/odp/buffer.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_buffer.h rename to platform/linux-keystone2/include/odp/buffer.h diff --git a/platform/linux-keystone2/include/api/odp_buffer_pool.h b/platform/linux-keystone2/include/odp/buffer_pool.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_buffer_pool.h rename to platform/linux-keystone2/include/odp/buffer_pool.h diff --git a/platform/linux-keystone2/include/api/odp_crypto.h b/platform/linux-keystone2/include/odp/crypto.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_crypto.h rename to platform/linux-keystone2/include/odp/crypto.h diff --git a/platform/linux-keystone2/include/api/odp_packet.h b/platform/linux-keystone2/include/odp/packet.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_packet.h rename to platform/linux-keystone2/include/odp/packet.h diff --git a/platform/linux-keystone2/include/api/odp_packet_io.h b/platform/linux-keystone2/include/odp/packet_io.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_packet_io.h rename to platform/linux-keystone2/include/odp/packet_io.h diff --git a/platform/linux-keystone2/include/api/mcsdk_tune.h b/platform/linux-keystone2/include/odp/plat/mcsdk_tune.h similarity index 100% rename from platform/linux-keystone2/include/api/mcsdk_tune.h rename to platform/linux-keystone2/include/odp/plat/mcsdk_tune.h diff --git a/platform/linux-keystone2/include/api/odp_state.h b/platform/linux-keystone2/include/odp/plat/state.h similarity index 100% rename from platform/linux-keystone2/include/api/odp_state.h rename to platform/linux-keystone2/include/odp/plat/state.h diff --git a/platform/linux-keystone2/include/api/odp_ti_mcsdk.h b/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h similarity index 98% rename from platform/linux-keystone2/include/api/odp_ti_mcsdk.h rename to platform/linux-keystone2/include/odp/plat/ti_mcsdk.h index 6dd0dd1..aa7e64f 100644 --- a/platform/linux-keystone2/include/api/odp_ti_mcsdk.h +++ b/platform/linux-keystone2/include/odp/plat/ti_mcsdk.h @@ -17,6 +17,7 @@ extern "C" { #include #include #include +#include #include #include