include: export uuid.h

Move this header to include/u-boot/ so that it can be used by external
tools.

Reviewed-by: Ilias Apalodimas <ilias.apalodimas@linaro.org>
Signed-off-by: Caleb Connolly <caleb.connolly@linaro.org>

diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c
index 8a57b8217ff2683749068777e6be99d915c105f2..0fdf9365b41e9eff4036fe0cf8ac97b8fe3e2a01 100644 (file)
--- a/arch/arm/mach-rockchip/board.c
+++ b/arch/arm/mach-rockchip/board.c
@@ -25,7 +25,7 @@
 #include <part.h>
 #include <ram.h>
 #include <syscon.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <u-boot/crc.h>
 #include <u-boot/sha256.h>
 #include <asm/cache.h>

diff --git a/board/cobra5272/flash.c b/board/cobra5272/flash.c
index 616842e62f4edd85a6604ddd46678cb1b57868b8..f16f2f1184f37d09576e2be2ca9bb17ad5d7b597 100644 (file)
--- a/board/cobra5272/flash.c
+++ b/board/cobra5272/flash.c
@@ -11,7 +11,7 @@
 #include <irq_func.h>
 #include <stdio.h>
 #include <time.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <vsprintf.h>
 #include <linux/delay.h>
 #include <linux/string.h>

diff --git a/board/gardena/smart-gateway-mt7688/board.c b/board/gardena/smart-gateway-mt7688/board.c
index c6b14bed41fb676d0fac4333fd021064dca7640e..eb7fcd630a10852caca64f31425735a7d976f6b1 100644 (file)
--- a/board/gardena/smart-gateway-mt7688/board.c
+++ b/board/gardena/smart-gateway-mt7688/board.c
@@ -16,7 +16,7 @@
 #include <linux/delay.h>
 #include <linux/stringify.h>
 #include <u-boot/crc.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/ctype.h>
 #include <linux/io.h>
 

diff --git a/board/socrates/socrates.c b/board/socrates/socrates.c
index 6e6e276cc74118f2601c7d2d7996d3bc11282a93..5e5a45ee00db022ed5ef391dc525cfbc0500fcde 100644 (file)
--- a/board/socrates/socrates.c
+++ b/board/socrates/socrates.c
@@ -15,7 +15,7 @@
 #include <env.h>
 #include <init.h>
 #include <pci.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/global_data.h>
 #include <asm/processor.h>
 #include <asm/immap_85xx.h>

diff --git a/board/xilinx/common/board.c b/board/xilinx/common/board.c
index 3440402ab46574da294674ca885f4611a0c810fa..1c100d61589f34ab1df431c18c2d15be3f2d7af2 100644 (file)
--- a/board/xilinx/common/board.c
+++ b/board/xilinx/common/board.c
@@ -30,7 +30,7 @@
 #include <soc.h>
 #include <linux/ctype.h>
 #include <linux/kernel.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 #include "fru.h"
 

diff --git a/cmd/efi.c b/cmd/efi.c
index 6bed2d743ba6ebe2cefa00abfa2a08b0e3d287ba..687ccb5204282a42e3c984ef5bd422c3c9e743dc 100644 (file)
--- a/cmd/efi.c
+++ b/cmd/efi.c
@@ -11,7 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <sort.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/global_data.h>
 
 DECLARE_GLOBAL_DATA_PTR;

diff --git a/cmd/efi_common.c b/cmd/efi_common.c
index c46764e6eea74258aafebd031255a0f91a801795..d2f2b59e9e3b75df628fa307063d4ffa4a21401b 100644 (file)
--- a/cmd/efi_common.c
+++ b/cmd/efi_common.c
@@ -8,7 +8,7 @@
 
 #include <efi.h>
 #include <efi_api.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 void efi_show_tables(struct efi_system_table *systab)
 {

diff --git a/cmd/flash.c b/cmd/flash.c
index de0e04f09cfbb734969142d8e0c33feaa1cf9e86..fd660ec477c9219519167370035a9dac67937f02 100644 (file)
--- a/cmd/flash.c
+++ b/cmd/flash.c
@@ -10,7 +10,7 @@
 #include <command.h>
 #include <log.h>
 #include <vsprintf.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 #if defined(CONFIG_CMD_MTDPARTS)
 #include <jffs2/jffs2.h>

diff --git a/cmd/gpt.c b/cmd/gpt.c
index 86b7701886a32b534442f848d9fdda6bcb681fb4..27aea2df197c5a76b37f5bf16e68809f5af61a02 100644 (file)
--- a/cmd/gpt.c
+++ b/cmd/gpt.c
@@ -19,7 +19,7 @@
 #include <part_efi.h>
 #include <part.h>
 #include <exports.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/ctype.h>
 #include <div64.h>
 #include <memalign.h>

diff --git a/cmd/nvedit_efi.c b/cmd/nvedit_efi.c
index 64ae2ad2ce24b926c21f728bf4b31b2dbbe4370a..32b7d0490747d0b70f70afd576580f624f6bd3d1 100644 (file)
--- a/cmd/nvedit_efi.c
+++ b/cmd/nvedit_efi.c
@@ -15,7 +15,7 @@
 #include <malloc.h>
 #include <mapmem.h>
 #include <rtc.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/kernel.h>
 
 /*

diff --git a/cmd/x86/hob.c b/cmd/x86/hob.c
index 2dd30808bd109096f12146d58dc8b09659de2e57..d3713cef3312ae97e5c991bfb0fa3461ba0d471e 100644 (file)
--- a/cmd/x86/hob.c
+++ b/cmd/x86/hob.c
@@ -5,7 +5,7 @@
 
 #include <command.h>
 #include <efi.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/global_data.h>
 #include <asm/hob.h>
 #include <asm/fsp/fsp_hob.h>

diff --git a/common/flash.c b/common/flash.c
index 24ddc8bee72423bd1a6e3c5d3062757fec22aa54..226646c6868f8c4c4819b11b70ebfb647392784d 100644 (file)
--- a/common/flash.c
+++ b/common/flash.c
@@ -8,7 +8,7 @@
 
 #include <flash.h>
 #include <log.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/string.h>
 
 #include <mtd/cfi_flash.h>

diff --git a/disk/part_efi.c b/disk/part_efi.c
index b1a03bd165e07f497df93d66da6acf4415efbd9a..580821a6ee9c6a5bd755d6b960574c989d1708e8 100644 (file)
--- a/disk/part_efi.c
+++ b/disk/part_efi.c
@@ -15,7 +15,7 @@
 #include <blk.h>
 #include <log.h>
 #include <part.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <asm/unaligned.h>

diff --git a/drivers/firmware/arm-ffa/arm-ffa-uclass.c b/drivers/firmware/arm-ffa/arm-ffa-uclass.c
index e0767fc7551786aa380da1c849459eef938ffe9e..96c64964bb73b05e094f7ab71a5e68c3195f3edf 100644 (file)
--- a/drivers/firmware/arm-ffa/arm-ffa-uclass.c
+++ b/drivers/firmware/arm-ffa/arm-ffa-uclass.c
@@ -11,7 +11,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <string.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>
 #include <dm/devres.h>

diff --git a/env/sf.c b/env/sf.c
index 906b85b0db4481a0eaf625d84a9dda86559da537..21ac0c202e737283626613efd0978c3a68cec44f 100644 (file)
--- a/env/sf.c
+++ b/env/sf.c
@@ -16,7 +16,7 @@
 #include <spi_flash.h>
 #include <search.h>
 #include <errno.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/cache.h>
 #include <asm/global_data.h>
 #include <dm/device-internal.h>

diff --git a/fs/btrfs/btrfs.c b/fs/btrfs/btrfs.c
index 1149a3b200770890ab7054bafbd23d065cbf2b89..350cff0cbca08f0f83274e31ba7e6ed6b9240a78 100644 (file)
--- a/fs/btrfs/btrfs.c
+++ b/fs/btrfs/btrfs.c
@@ -7,7 +7,7 @@
 
 #include <config.h>
 #include <malloc.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/time.h>
 #include "btrfs.h"
 #include "crypto/hash.h"

diff --git a/fs/btrfs/compat.h b/fs/btrfs/compat.h
index 02173dea5f48ca3c84d7014a0841829762b0b7fa..4596b9d1dd395c0c3b720f3f7a1ba56da1ed805d 100644 (file)
--- a/fs/btrfs/compat.h
+++ b/fs/btrfs/compat.h
@@ -5,7 +5,7 @@
 
 #include <linux/errno.h>
 #include <fs_internal.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 /* Provide a compatibility layer to make code syncing easier */
 

diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 34d9d535121642c235996861065e766f7daca8eb..14efe7218df5af3f3afc21c06e5665ac7c8a1cde 100644 (file)
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: GPL-2.0+
 #include <fs_internal.h>
 #include <log.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <memalign.h>
 #include "kernel-shared/btrfs_tree.h"
 #include "common/rbtree-utils.h"

diff --git a/fs/ext4/ext4fs.c b/fs/ext4/ext4fs.c
index da59cb008fce46486384986430906113f7d500e5..15587e92e3e72d02206ddffe9c60733dc1df475b 100644 (file)
--- a/fs/ext4/ext4fs.c
+++ b/fs/ext4/ext4fs.c
@@ -27,7 +27,7 @@
 #include <div64.h>
 #include <malloc.h>
 #include <part.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 int ext4fs_symlinknest;
 struct ext_filesystem ext_fs;

diff --git a/include/fwu.h b/include/fwu.h
index 77ec65e61807ec7bdb5f1d548086607d71e87d28..c317613eaaab222eeca7b53fd5e516a19b0802f2 100644 (file)
--- a/include/fwu.h
+++ b/include/fwu.h
@@ -10,7 +10,7 @@
 #include <efi.h>
 #include <fwu_mdata.h>
 #include <mtd.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 #include <linux/types.h>
 

diff --git a/include/part.h b/include/part.h
index 54b986cee631bb8ef2a083b357b88851baed752d..797b542ef1fff6a99d4337eff4f103b2a2776214 100644 (file)
--- a/include/part.h
+++ b/include/part.h
@@ -8,7 +8,7 @@
 
 #include <blk.h>
 #include <ide.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linker_lists.h>
 #include <linux/errno.h>
 #include <linux/list.h>

diff --git a/include/rkmtd.h b/include/rkmtd.h
index 145fede6c840ffd80c038b1a239c3c8f4d071777..b7479036b397c4f7c445f4d3d88b5626e9c32d30 100644 (file)
--- a/include/rkmtd.h
+++ b/include/rkmtd.h
@@ -11,7 +11,7 @@
 #define __RKMTD__
 
 #include <part_efi.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 #define LBA                    64 + 512 + 33
 

diff --git a/include/uuid.h b/include/u-boot/uuid.h
similarity index 100%
rename from include/uuid.h
rename to include/u-boot/uuid.h

diff --git a/lib/acpi/acpi_dp.c b/lib/acpi/acpi_dp.c
index 6733809986aea5f7e72aab6b3ebe261ad7860484..5714acce08821a856ee6cb1bfb1c1bb831bdbea1 100644 (file)
--- a/lib/acpi/acpi_dp.c
+++ b/lib/acpi/acpi_dp.c
@@ -9,7 +9,7 @@
 #include <dm.h>
 #include <log.h>
 #include <malloc.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <dm/acpi.h>

diff --git a/lib/acpi/acpigen.c b/lib/acpi/acpigen.c
index b95cabb91493ee2bdb13e51edca9dfc2032c97c1..ecff5a50d5044573491ec383a8aefebb1c63137c 100644 (file)
--- a/lib/acpi/acpigen.c
+++ b/lib/acpi/acpigen.c
@@ -10,7 +10,7 @@
 
 #include <dm.h>
 #include <log.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>

diff --git a/lib/efi/efi_app.c b/lib/efi/efi_app.c
index 88332c3c910a2b474ca87f82125c6ca9d3662bb8..9b94a93ee4f149288ecc57880b3b7dd4e91b72a3 100644 (file)
--- a/lib/efi/efi_app.c
+++ b/lib/efi/efi_app.c
@@ -17,7 +17,7 @@
 #include <init.h>
 #include <malloc.h>
 #include <sysreset.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm/global_data.h>
 #include <linux/err.h>
 #include <linux/types.h>

diff --git a/lib/efi_loader/efi_capsule.c b/lib/efi_loader/efi_capsule.c
index f3a2388506cc75a81b21bd5510edfa2febb7f220..a4ea287303873cfa62add7cb1a758ebc51c58120 100644 (file)
--- a/lib/efi_loader/efi_capsule.c
+++ b/lib/efi_loader/efi_capsule.c
@@ -20,7 +20,7 @@
 #include <sort.h>
 #include <sysreset.h>
 #include <asm/global_data.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 
 #include <crypto/pkcs7.h>
 #include <crypto/pkcs7_parser.h>

diff --git a/lib/efi_loader/efi_device_path.c b/lib/efi_loader/efi_device_path.c
index 0f684590f22a1c88758b968630bec2f4030ff747..9de3b95d073b201b60a76e9d00cfcc9f10e08dd0 100644 (file)
--- a/lib/efi_loader/efi_device_path.c
+++ b/lib/efi_loader/efi_device_path.c
@@ -17,7 +17,7 @@
 #include <nvme.h>
 #include <efi_loader.h>
 #include <part.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <asm-generic/unaligned.h>
 #include <linux/compat.h> /* U16_MAX */
 

diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c
index e888c52efe3e08a7f718fdbc82f36a9332ec7435..f3533f4def3ae7bc9af9e180e6a7c4a69f2a8080 100644 (file)
--- a/lib/efi_loader/efi_variable.c
+++ b/lib/efi_loader/efi_variable.c
@@ -16,7 +16,7 @@
 #include <malloc.h>
 #include <rtc.h>
 #include <search.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <crypto/pkcs7_parser.h>
 #include <linux/compat.h>
 #include <u-boot/crc.h>

diff --git a/lib/fwu_updates/fwu_mtd.c b/lib/fwu_updates/fwu_mtd.c
index c14203b9dd3139f51f86a82ede90fb9ec4777986..554723046f6d87f86a120e643e1687320bfe66d1 100644 (file)
--- a/lib/fwu_updates/fwu_mtd.c
+++ b/lib/fwu_updates/fwu_mtd.c
@@ -10,7 +10,7 @@
 #include <log.h>
 #include <malloc.h>
 #include <mtd.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <stdio.h>
 
 #include <dm/ofnode.h>

diff --git a/lib/uuid.c b/lib/uuid.c
index 6fdae79977020e2fd3500f8ec3c5b70fa7f1ac54..11b86ffb02e6c9b3555ca63945852c85d28b6790 100644 (file)
--- a/lib/uuid.c
+++ b/lib/uuid.c
@@ -29,7 +29,7 @@
 #include <linux/types.h>
 #include <errno.h>
 #include <linux/kconfig.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <u-boot/sha1.h>
 
 #ifdef USE_HOSTCC

diff --git a/lib/vsprintf.c b/lib/vsprintf.c
index cfd1f1914edfc91399edd5178c6c1a3a18b625d8..e5802866632e4d8ecd88c4c4d8da882b76b0c317 100644 (file)
--- a/lib/vsprintf.c
+++ b/lib/vsprintf.c
@@ -18,7 +18,7 @@
 #include <div64.h>
 #include <hexdump.h>
 #include <stdarg.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <stdio.h>
 #include <vsprintf.h>
 #include <linux/ctype.h>

diff --git a/net/bootp.c b/net/bootp.c
index 9dfb50749b499fd5a709050480fc566412158cea..512ab2ed7c81c160aa5ef12b34952d5b1ac546b1 100644 (file)
--- a/net/bootp.c
+++ b/net/bootp.c
@@ -15,7 +15,7 @@
 #include <log.h>
 #include <net.h>
 #include <rand.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <linux/delay.h>
 #include <net/tftp.h>
 #include "bootp.h"

diff --git a/test/dm/acpi_dp.c b/test/dm/acpi_dp.c
index eaeda2b8a7afc1fb0d1943803709a07c476568bc..038806004b555b58b8c771b10e4ce33a61cedbd5 100644 (file)
--- a/test/dm/acpi_dp.c
+++ b/test/dm/acpi_dp.c
@@ -7,7 +7,7 @@
  */
 
 #include <dm.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_dp.h>
 #include <asm/unaligned.h>

diff --git a/test/dm/acpigen.c b/test/dm/acpigen.c
index 3e912fadaef82a41fee6741feeb8d01b8a9aff59..23c16bd986691074510e53f85a22cb2f93dd4947 100644 (file)
--- a/test/dm/acpigen.c
+++ b/test/dm/acpigen.c
@@ -9,7 +9,7 @@
 #include <dm.h>
 #include <irq.h>
 #include <malloc.h>
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <acpi/acpigen.h>
 #include <acpi/acpi_device.h>
 #include <acpi/acpi_table.h>

diff --git a/test/lib/uuid.c b/test/lib/uuid.c
index 8fe65dbf78ba3193d0f66e2c751aa3106eb18393..3d62e18bcfee4fab12e440faeb1f355f6f2b8efd 100644 (file)
--- a/test/lib/uuid.c
+++ b/test/lib/uuid.c
@@ -8,7 +8,7 @@
  *   Abdellatif El Khlifi <abdellatif.elkhlifi@arm.com>
  */
 
-#include <uuid.h>
+#include <u-boot/uuid.h>
 #include <test/lib.h>
 #include <test/test.h>
 #include <test/ut.h>