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