5 files changed, 30 insertions, 10 deletions
diff --git a/include/configs/mx6ul_nxpu_iopb_android_things.h b/include/configs/mx6ul_nxpu_iopb_android_things.h
index f50a38b1e0..fe31b49cf3 100644
--- a/include/configs/mx6ul_nxpu_iopb_android_things.h
+++ b/include/configs/mx6ul_nxpu_iopb_android_things.h
@@ -1,6 +1,7 @@
 
 /*
  * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -19,6 +20,10 @@
 #define KEYSLOT_HWPARTITION_ID 2
 #endif
 
+#ifdef CONFIG_AVB_ATX
+#define PERMANENT_ATTRIBUTE_HASH_OFFSET 32
+#endif
+
 #ifdef CONFIG_IMX_TRUSTY_OS
 #define NON_SECURE_FASTBOOT
 #define TRUSTY_KEYSLOT_PACKAGE
@@ -39,7 +44,6 @@
 #define CONFIG_SHA256
 
 #define CONFIG_AVB_SUPPORT
-#define CONFIG_AVB_FUSE
 #ifdef CONFIG_AVB_SUPPORT
 #ifdef CONFIG_SYS_MALLOC_LEN
 #undef CONFIG_SYS_MALLOC_LEN
@@ -53,3 +57,4 @@
 #endif
 
 #endif
+/* __MX6UL_NXPU_IOPB_ANDROID_THINGS_H */
diff --git a/include/configs/mx6ul_spriot_android_things.h b/include/configs/mx6ul_spriot_android_things.h
index 4e3c3cd574..67682f9b10 100644
--- a/include/configs/mx6ul_spriot_android_things.h
+++ b/include/configs/mx6ul_spriot_android_things.h
@@ -1,14 +1,19 @@
 
 /*
  * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
 
-#ifndef __PICOSOM_IMX6UL_ANDROID_THINGS_H
-#define __PICOSOM_IMX6UL_ANDROID_THINGS_H
+#ifndef __MX6UL_SPRIOT_ANDROID_THINGS_H
+#define __MX6UL_SPRIOT_ANDROID_THINGS_H
 #include "mx_android_common.h"
 
+#ifdef CONFIG_AVB_ATX
+#define PERMANENT_ATTRIBUTE_HASH_OFFSET 32
+#endif
+
 #define AVB_RPMB
 #ifdef AVB_RPMB
 #define KEYSLOT_BLKS 0xFFF
@@ -30,7 +35,6 @@
 
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SYSTEM_RAMDISK_SUPPORT
-#define CONFIG_AVB_FUSE
 #ifdef CONFIG_AVB_SUPPORT
 
 #ifdef CONFIG_SYS_MALLOC_LEN
@@ -46,3 +50,4 @@
 #endif
 
 #endif
+/* __MX6UL_SPRIOT_ANDROID_THINGS_H */
diff --git a/include/configs/pico-imx6dl_android_things.h b/include/configs/pico-imx6dl_android_things.h
index 3e95e312da..a2b1cc7c0b 100755
--- a/include/configs/pico-imx6dl_android_things.h
+++ b/include/configs/pico-imx6dl_android_things.h
@@ -23,7 +23,6 @@
 
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SYSTEM_RAMDISK_SUPPORT
-#define CONFIG_AVB_FUSE
 #ifdef CONFIG_AVB_SUPPORT
 
 #ifdef CONFIG_SYS_MALLOC_LEN
@@ -39,3 +38,4 @@
 #endif
 
 #endif
+/* __PICO_IMX6DL_ANDROID_THINGS_H */
diff --git a/include/configs/pico-imx7dandroidthings.h b/include/configs/pico-imx7dandroidthings.h
index 1fe6dbd3be..64b6ff5e69 100644
--- a/include/configs/pico-imx7dandroidthings.h
+++ b/include/configs/pico-imx7dandroidthings.h
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -12,6 +13,10 @@
 #define TEE_HWPARTITION_ID 2
 #define TRUSTY_OS_MMC_BLKS 0xFFF
 
+#ifdef CONFIG_AVB_ATX
+#define PERMANENT_ATTRIBUTE_HASH_OFFSET 0
+#endif
+
 #define AVB_RPMB
 #ifdef AVB_RPMB
 #define KEYSLOT_BLKS 0xFFF
@@ -63,10 +68,10 @@
 /* infact 7D have no enough bits
  * set this size to 0 will disable
  * program/read FUSE */
-#define CONFIG_AVB_FUSE_BANK_SIZEW 0
-#define CONFIG_AVB_FUSE_BANK_START 0
-#define CONFIG_AVB_FUSE_BANK_END 0
+#define CONFIG_AVB_FUSE_BANK_SIZEW 4
+#define CONFIG_AVB_FUSE_BANK_START 14
+#define CONFIG_AVB_FUSE_BANK_END 14
 #endif
 
 #endif
-
+/* __PICO_IMX7DANDROIDTHINGS_H */
diff --git a/include/configs/picosom-imx6ul_android_things.h b/include/configs/picosom-imx6ul_android_things.h
index 461141c2d3..a0c580a6a1 100644
--- a/include/configs/picosom-imx6ul_android_things.h
+++ b/include/configs/picosom-imx6ul_android_things.h
@@ -1,6 +1,7 @@
 
 /*
  * Copyright (C) 2015-2016 Freescale Semiconductor, Inc.
+ * Copyright 2017 NXP
  *
  * SPDX-License-Identifier:	GPL-2.0+
  */
@@ -8,6 +9,10 @@
 #ifndef __PICOSOM_IMX6UL_ANDROID_THINGS_H
 #define __PICOSOM_IMX6UL_ANDROID_THINGS_H
 
+#ifdef CONFIG_AVB_ATX
+#define PERMANENT_ATTRIBUTE_HASH_OFFSET 32
+#endif
+
 #define AVB_RPMB
 #ifdef AVB_RPMB
 #define KEYSLOT_BLKS 0xFFF
@@ -38,7 +43,6 @@
 
 #define CONFIG_AVB_SUPPORT
 #define CONFIG_SYSTEM_RAMDISK_SUPPORT
-#define CONFIG_AVB_FUSE
 #ifdef CONFIG_AVB_SUPPORT
 
 #ifdef CONFIG_SYS_MALLOC_LEN
@@ -55,3 +59,4 @@
 
 
 #endif
+/* __PICOSOM_IMX6UL_ANDROID_THINGS_H */