fix: sata: a38x: add SATA3 HAL to makefile and missing file mv_hal_if/mvSysSata3.c
Change-Id: I08fa68949f2a06c66432eecc3320d7e381a5a4d7
Signed-off-by: Eli Nidam <elini@marvell.com>
Reviewed-on: http://vgitil04.il.marvell.com:8080/5281
Tested-by: Star_Automation <star@marvell.com>
Reviewed-by: Omri Itach <omrii@marvell.com>
Tested-by: Omri Itach <omrii@marvell.com>
diff --git a/board/mv_ebu/common/Makefile b/board/mv_ebu/common/Makefile
old mode 100755
new mode 100644
index a064be8..fe9df8b
--- a/board/mv_ebu/common/Makefile
+++ b/board/mv_ebu/common/Makefile
@@ -24,6 +24,7 @@
endif
ifeq ($(BOARD),a38x)
+MAKE_SATA3 = yes
MAKE_NETA = yes
MAKE_GENERAL_U_BOOT_TOOLS = yes
endif
@@ -150,6 +151,10 @@
$(HAL_SATA_CORE_DIR)/mvStorageDev.o \
$(HAL_SATA_CORE_DIR)/mvLog.o
USP_OBJS += $(USP_DIR)/mv_ide.o
+ifdef MAKE_SATA3
+SOC_OBJS += $(HAL_SATA3_DIR)/mvSata3AddrDec.o
+HAL_IF_OBJS += $(HAL_IF_DIR)/mvSysSata3.o
+endif
endif
diff --git a/board/mv_ebu/common/mv_hal_if/mvSysSata3.c b/board/mv_ebu/common/mv_hal_if/mvSysSata3.c
new file mode 100644
index 0000000..18c5234
--- /dev/null
+++ b/board/mv_ebu/common/mv_hal_if/mvSysSata3.c
@@ -0,0 +1,81 @@
+/*******************************************************************************
+Copyright (C) Marvell International Ltd. and its affiliates
+
+This software file (the "File") is owned and distributed by Marvell
+International Ltd. and/or its affiliates ("Marvell") under the following
+alternative licensing terms. Once you have made an election to distribute the
+File under one of the following license alternatives, please (i) delete this
+introductory statement regarding license alternatives, (ii) delete the two
+license alternatives that you have not elected to use and (iii) preserve the
+Marvell copyright notice above.
+
+********************************************************************************
+Marvell Commercial License Option
+
+If you received this File from Marvell and you have entered into a commercial
+license agreement (a "Commercial License") with Marvell, the File is licensed
+to you under the terms of the applicable Commercial License.
+
+********************************************************************************
+Marvell GPL License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File in accordance with the terms and conditions of the General
+Public License Version 2, June 1991 (the "GPL License"), a copy of which is
+available along with the File in the license.txt file or by writing to the Free
+Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 or
+on the worldwide web at http://www.gnu.org/licenses/gpl.txt.
+
+THE FILE IS DISTRIBUTED AS-IS, WITHOUT WARRANTY OF ANY KIND, AND THE IMPLIED
+WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE ARE EXPRESSLY
+DISCLAIMED. The GPL License provides additional details about this warranty
+disclaimer.
+********************************************************************************
+Marvell BSD License Option
+
+If you received this File from Marvell, you may opt to use, redistribute and/or
+modify this File under the following licensing terms.
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+
+ * Neither the name of Marvell nor the names of its contributors may be
+ used to endorse or promote products derived from this software without
+ specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+*******************************************************************************/
+
+#include "mvCommon.h"
+#include "mvOs.h"
+#include "ctrlEnv/mvCtrlEnvSpec.h"
+#include "ctrlEnv/mvCtrlEnvAddrDec.h"
+#include "sata/sata3/mvSata3.h"
+
+MV_STATUS mvSysSata3WinInit(MV_VOID)
+{
+ MV_UNIT_WIN_INFO addrWinMap[MAX_TARGETS + 1];
+ MV_STATUS status;
+
+ status = mvCtrlAddrWinMapBuild(addrWinMap, MAX_TARGETS + 1);
+ if (status == MV_OK)
+ status = mvSata3WinInit(addrWinMap);
+
+ return status;
+}
diff --git a/board/mv_ebu/common/paths.mk b/board/mv_ebu/common/paths.mk
index 9b52e84..d43794c 100755
--- a/board/mv_ebu/common/paths.mk
+++ b/board/mv_ebu/common/paths.mk
@@ -43,7 +43,7 @@
NET_DIR = $(HAL_NETA_DIR)
endif
-ifeq ($(BOARD),axp)
+ifeq ($(BOARD),axp)
SOC_DIR = $(SRC_PATH)/axp
FAM_DIR = $(SOC_DIR)/armada_xp_family
NET_DIR = $(HAL_NETA_DIR)
@@ -73,6 +73,7 @@
HAL_RTC_DIR = $(HAL_DIR)/rtc/integ_rtc
HAL_SFLASH_DIR = $(HAL_DIR)/sflash
HAL_SATA_CORE_DIR = $(HAL_DIR)/sata/CoreDriver/
+HAL_SATA3_DIR = $(HAL_DIR)/sata/sata3/
HAL_CNTMR_DIR = $(HAL_DIR)/cntmr
HAL_GPP_DIR = $(HAL_DIR)/gpp
HAL_IDMA_DIR = $(HAL_DIR)/idma
