MA-14916-1 adapt to the directory change of libavb

libavb is now under the directory of lib/, not lib/avb/ as before, to
adapt to this change, some modifications are made:
1. header file inclusion change, including parameter of -I option in
   Makefile
2. remove fsl_avb_sysdeps_uboot.c as the functions have been defined in
   avb_sysdeps_posix.c.

Change-Id: I4216e3ddb4e3e810783e4f46b953eda510c2627b
Signed-off-by: faqiang.zhu <faqiang.zhu@nxp.com>
Signed-off-by: Ji Luo <ji.luo@nxp.com>
(cherry pick from 58010b99560eea2027dd39909eb5b35404e6030e)

3 files changed, 1 insertions, 72 deletions

diff --git a/lib/avb/Makefile b/lib/avb/Makefile
index 00957e253b..21af6a2029 100644
--- a/lib/avb/Makefile
+++ b/lib/avb/Makefile
@@ -1,4 +1,4 @@
-subdir-ccflags-y += -I./lib/avb \
+subdir-ccflags-y += -I./lib \
 			-D_FILE_OFFSET_BITS=64 \
 			-D_POSIX_C_SOURCE=199309L \
 			-Wa,--noexecstack \
diff --git a/lib/avb/fsl/Makefile b/lib/avb/fsl/Makefile
index 9c2fb44fc0..b209705252 100644
--- a/lib/avb/fsl/Makefile
+++ b/lib/avb/fsl/Makefile
@@ -1,7 +1,6 @@
 ifndef CONFIG_SPL_BUILD
 obj-y += fsl_avb.o
 obj-y += fsl_bootctl.o
-obj-y += fsl_avb_sysdeps_uboot.o
 endif
 
 obj-y += fsl_avbkey.o
diff --git a/lib/avb/fsl/fsl_avb_sysdeps_uboot.c b/lib/avb/fsl/fsl_avb_sysdeps_uboot.c
deleted file mode 100644
index 5fcb69f75e..0000000000
--- a/lib/avb/fsl/fsl_avb_sysdeps_uboot.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2016 The Android Open Source Project
- *
- * Permission is hereby granted, free of charge, to any person
- * obtaining a copy of this software and associated documentation
- * files (the "Software"), to deal in the Software without
- * restriction, including without limitation the rights to use, copy,
- * modify, merge, publish, distribute, sublicense, and/or sell copies
- * of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
- * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
- * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
- * SOFTWARE.
- */
-
-#include <common.h>
-#include <stdlib.h>
-#include <linux/string.h>
-
-#include "../libavb/libavb.h"
-
-int avb_memcmp(const void* src1, const void* src2, size_t n) {
-  return memcmp(src1, src2, n);
-}
-
-void* avb_memcpy(void* dest, const void* src, size_t n) {
-  return memcpy(dest, src, n);
-}
-
-void* avb_memset(void* dest, const int c, size_t n) {
-  return memset(dest, c, n);
-}
-
-int avb_strcmp(const char* s1, const char* s2) { return strcmp(s1, s2); }
-
-size_t avb_strlen(const char* str) { return strlen(str); }
-
-void avb_abort(void) { panic("avb_abort!\n"); }
-
-void avb_print(const char* message) { printf("%s", message); }
-
-void avb_printv(const char* message, ...) {
-  va_list ap;
-  const char* m;
-
-  va_start(ap, message);
-  for (m = message; m != NULL; m = va_arg(ap, const char*)) {
-    printf("%s", m);
-  }
-  va_end(ap);
-}
-
-void* avb_malloc_(size_t size) { return malloc(size); }
-
-void avb_free(void* ptr) { free(ptr); }
-
-uint32_t avb_div_by_10(uint64_t* dividend) {
-  uint32_t rem = (uint32_t)(*dividend % 10);
-  *dividend /= 10;
-  return rem;
-}