summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruce Beare <bruce.j.beare@intel.com>2016-05-06 22:12:54 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-05-06 22:12:54 +0000
commitfb63db80673a7672564b68ea1feb9592cb36d066 (patch)
treecaeef051744ecee26f61ea8cac9408eda32d8438
parent8681186a5565f9fb2576e85af45129a5af1c965d (diff)
parent125dc13d9b7447390b81347124b0f4e8ee0c270a (diff)
downloadintel-fb63db80673a7672564b68ea1feb9592cb36d066.tar.gz
Move the bootctl HAL to peripheral directory
am: 125dc13d9b * commit '125dc13d9b7447390b81347124b0f4e8ee0c270a': Move the bootctl HAL to peripheral directory Change-Id: I81e4fd648186a92b53d0b4a8f55ee37ad9977bc5
-rw-r--r--peripheral/bootctrl/bootctrl.c (renamed from soc/common/bootctrl/bootctrl.c)0
-rw-r--r--peripheral/bootctrl/bootctrl.h (renamed from soc/common/bootctrl/bootctrl.h)0
-rw-r--r--peripheral/bootctrl/hal.mk (renamed from soc/common/bootctrl/Android.mk)3
-rw-r--r--peripheral/bootctrl/peripheral.mk18
4 files changed, 18 insertions, 3 deletions
diff --git a/soc/common/bootctrl/bootctrl.c b/peripheral/bootctrl/bootctrl.c
index 9e8626b..9e8626b 100644
--- a/soc/common/bootctrl/bootctrl.c
+++ b/peripheral/bootctrl/bootctrl.c
diff --git a/soc/common/bootctrl/bootctrl.h b/peripheral/bootctrl/bootctrl.h
index 8febd4f..8febd4f 100644
--- a/soc/common/bootctrl/bootctrl.h
+++ b/peripheral/bootctrl/bootctrl.h
diff --git a/soc/common/bootctrl/Android.mk b/peripheral/bootctrl/hal.mk
index 7c7ecf2..cb18a78 100644
--- a/soc/common/bootctrl/Android.mk
+++ b/peripheral/bootctrl/hal.mk
@@ -12,8 +12,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-ifeq ($(strip $(TARGET_BOOTCTRL_HAL)),intel)
-
LOCAL_PATH := $(call my-dir)
include $(CLEAR_VARS)
@@ -24,4 +22,3 @@ LOCAL_SRC_FILES := bootctrl.c
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
-endif
diff --git a/peripheral/bootctrl/peripheral.mk b/peripheral/bootctrl/peripheral.mk
new file mode 100644
index 0000000..40d5339
--- /dev/null
+++ b/peripheral/bootctrl/peripheral.mk
@@ -0,0 +1,18 @@
+
+# Copyright (C) 2015 Intel Corporation
+
+# 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.
+
+# Boot control HAL package
+DEVICE_PACKAGES += \
+ bootctrl.$(TARGET_DEVICE)