1From 215a2d9660a929beae8bc420239467fc9e135b4f Mon Sep 17 00:00:00 2001 2From: Benjamin Fair <benjaminfair@google.com> 3Date: Wed, 23 Oct 2019 14:23:08 -0700 4Subject: [PATCH] Adjust paths for use with Bitbake 5 6Upstream-Status: Pending 7 8Signed-off-by: Benjamin Fair <benjaminfair@google.com> 9--- 10 ImageGeneration/inputs/mergedBootBlockAndUboot.xml | 10 +++++----- 11 ImageGeneration/references/BootBlockAndHeader_EB.xml | 6 +++--- 12 .../references/BootBlockAndHeader_RunBMC.xml | 6 +++--- 13 ImageGeneration/references/UbootHeader_EB.xml | 6 +++--- 14 ImageGeneration/references/UbootHeader_RunBMC.xml | 6 +++--- 15 5 files changed, 17 insertions(+), 17 deletions(-) 16 17diff --git a/ImageGeneration/inputs/mergedBootBlockAndUboot.xml b/ImageGeneration/inputs/mergedBootBlockAndUboot.xml 18index d832f96..f4c7756 100644 19--- a/ImageGeneration/inputs/mergedBootBlockAndUboot.xml 20+++ b/ImageGeneration/inputs/mergedBootBlockAndUboot.xml 21@@ -18,18 +18,18 @@ 22 <name>BootBlock</name> <!-- name of field --> 23 <config> 24 <offset>0</offset> <!-- offset in the header --> 25- <size format='FileSize'>output_binaries/BootBlockAndHeader.bin</size> <!-- size in the header --> 26+ <size format='FileSize'>Poleg_bootblock.bin.full</size> <!-- size in the header --> 27 </config> 28- <content format='FileContent'>output_binaries/BootBlockAndHeader.bin</content> <!-- content the user should fill --> 29+ <content format='FileContent'>Poleg_bootblock.bin.full</content> <!-- content the user should fill --> 30 </BinField> 31 32 <BinField> 33 <name>u-boot</name> <!-- name of field --> 34 <config> 35- <offset format='FileSize' align='0x1000'>output_binaries/BootBlockAndHeader.bin</offset> <!-- offset in the header --> 36- <size format='FileSize'>output_binaries/UbootAndHeader.bin</size> <!-- size in the header --> 37+ <offset format='FileSize' align='0x1000'>Poleg_bootblock.bin.full</offset> <!-- offset in the header --> 38+ <size format='FileSize'>u-boot.bin.full</size> <!-- size in the header --> 39 </config> 40- <content format='FileContent'>output_binaries/UbootAndHeader.bin</content> <!-- content the user should fill --> 41+ <content format='FileContent'>u-boot.bin.full</content> <!-- content the user should fill --> 42 </BinField> 43 44 </Bin_Ecc_Map> 45diff --git a/ImageGeneration/references/BootBlockAndHeader_EB.xml b/ImageGeneration/references/BootBlockAndHeader_EB.xml 46index 775534f..157535d 100644 47--- a/ImageGeneration/references/BootBlockAndHeader_EB.xml 48+++ b/ImageGeneration/references/BootBlockAndHeader_EB.xml 49@@ -42,7 +42,7 @@ 50 <offset>0x144</offset> 51 <size>0x4</size> 52 </config> 53- <content format='FileSize'>inputs/Poleg_bootblock.bin</content> <!-- content the user should fill --> 54+ <content format='FileSize'>Poleg_bootblock.bin</content> <!-- content the user should fill --> 55 </BinField> 56 57 <BinField> 58@@ -50,9 +50,9 @@ 59 <name>Code</name> <!-- name of field --> 60 <config> 61 <offset>0x200</offset> 62- <size format='FileSize'>inputs/Poleg_bootblock.bin</size> <!-- size in the header calculated by tool--> 63+ <size format='FileSize'>Poleg_bootblock.bin</size> <!-- size in the header calculated by tool--> 64 </config> 65- <content format='FileContent'>inputs/Poleg_bootblock.bin</content> <!-- content the user should fill --> 66+ <content format='FileContent'>Poleg_bootblock.bin</content> <!-- content the user should fill --> 67 </BinField> 68 69 <!-- BMC optional fields --> 70diff --git a/ImageGeneration/references/BootBlockAndHeader_RunBMC.xml b/ImageGeneration/references/BootBlockAndHeader_RunBMC.xml 71index cc719e9..4d1e972 100644 72--- a/ImageGeneration/references/BootBlockAndHeader_RunBMC.xml 73+++ b/ImageGeneration/references/BootBlockAndHeader_RunBMC.xml 74@@ -42,7 +42,7 @@ 75 <offset>0x144</offset> 76 <size>0x4</size> 77 </config> 78- <content format='FileSize'>inputs/Poleg_bootblock.bin</content> <!-- content the user should fill --> 79+ <content format='FileSize'>Poleg_bootblock.bin</content> <!-- content the user should fill --> 80 </BinField> 81 82 <BinField> 83@@ -50,9 +50,9 @@ 84 <name>Code</name> 85 <config> 86 <offset>0x200</offset> 87- <size format='FileSize'>inputs/Poleg_bootblock.bin</size> <!-- size in the header calculated by tool--> 88+ <size format='FileSize'>Poleg_bootblock.bin</size> <!-- size in the header calculated by tool--> 89 </config> 90- <content format='FileContent'>inputs/Poleg_bootblock.bin</content> <!-- content the user should fill --> 91+ <content format='FileContent'>Poleg_bootblock.bin</content> <!-- content the user should fill --> 92 </BinField> 93 94 <!-- BMC optional fields --> 95diff --git a/ImageGeneration/references/UbootHeader_EB.xml b/ImageGeneration/references/UbootHeader_EB.xml 96index 1e72e22..475ec45 100644 97--- a/ImageGeneration/references/UbootHeader_EB.xml 98+++ b/ImageGeneration/references/UbootHeader_EB.xml 99@@ -42,7 +42,7 @@ 100 <offset>0x144</offset> <!-- offset in the header --> 101 <size>0x4</size> <!-- size in the header --> 102 </config> 103- <content format='FileSize'>inputs/u-boot.bin</content> <!-- content the user should fill --> 104+ <content format='FileSize'>u-boot.bin</content> <!-- content the user should fill --> 105 </BinField> 106 107 <BinField> 108@@ -50,9 +50,9 @@ 109 <name>Code</name> <!-- name of field --> 110 <config> 111 <offset>0x200</offset> <!-- offset in the header --> 112- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool--> 113+ <size format='FileSize'>u-boot.bin</size> <!-- size in the header calculated by tool--> 114 </config> 115- <content format='FileContent'>inputs/u-boot.bin</content> <!-- content the user should fill --> 116+ <content format='FileContent'>u-boot.bin</content> <!-- content the user should fill --> 117 </BinField> 118 119 <!-- BMC optional fields --> 120diff --git a/ImageGeneration/references/UbootHeader_RunBMC.xml b/ImageGeneration/references/UbootHeader_RunBMC.xml 121index 7eb3076..481ed2f 100644 122--- a/ImageGeneration/references/UbootHeader_RunBMC.xml 123+++ b/ImageGeneration/references/UbootHeader_RunBMC.xml 124@@ -42,7 +42,7 @@ 125 <offset>0x144</offset> <!-- offset in the header --> 126 <size>0x4</size> <!-- size in the header --> 127 </config> 128- <content format='FileSize'>inputs/u-boot.bin</content> <!-- content the user should fill --> 129+ <content format='FileSize'>u-boot.bin</content> <!-- content the user should fill --> 130 </BinField> 131 132 <BinField> 133@@ -50,9 +50,9 @@ 134 <name>Code</name> <!-- name of field --> 135 <config> 136 <offset>0x200</offset> <!-- offset in the header --> 137- <size format='FileSize'>inputs/u-boot.bin</size> <!-- size in the header calculated by tool--> 138+ <size format='FileSize'>u-boot.bin</size> <!-- size in the header calculated by tool--> 139 </config> 140- <content format='FileContent'>inputs/u-boot.bin</content> <!-- content the user should fill --> 141+ <content format='FileContent'>u-boot.bin</content> <!-- content the user should fill --> 142 </BinField> 143 144 <!-- BMC optional fields --> 145-- 1462.24.0.rc0.303.g954a862665-goog 147 148