diff options
author | Raptor Engineering Development Team <support@raptorengineering.com> | 2019-04-21 07:52:36 +0000 |
---|---|---|
committer | Raptor Engineering Development Team <support@raptorengineering.com> | 2019-04-21 08:12:45 +0000 |
commit | 9eb62396cd9355ed88b82ac90b0ded093a28006f (patch) | |
tree | 8e1750c5ea312dafa25cb4973822635190263741 | |
parent | c1d26445ce27382cdbc612da2fd0c77f39e961ed (diff) | |
download | pnor-9eb62396cd9355ed88b82ac90b0ded093a28006f.tar.gz pnor-9eb62396cd9355ed88b82ac90b0ded093a28006f.zip |
Merge latest upstream changes into tree
Shrink skiroot by 1MB to fit new UVISOR partition
Note that this breaks BOOTKERNFW block erase / write
-rw-r--r-- | p9Layouts/defaultPnorLayout_64.xml | 64 |
1 files changed, 45 insertions, 19 deletions
diff --git a/p9Layouts/defaultPnorLayout_64.xml b/p9Layouts/defaultPnorLayout_64.xml index 666484e..f9d196d 100644 --- a/p9Layouts/defaultPnorLayout_64.xml +++ b/p9Layouts/defaultPnorLayout_64.xml @@ -62,6 +62,7 @@ Layout Description but is across reboots. BMC will clear on power off/on <clearOnEccErr/>-> Indication that if an ECC error is comsumed on this partition, clear (write 0xFF with good ECC) to the partition to recover + <readOnly/> -> Indicates that the partition will be marked read only. </section> --> @@ -123,6 +124,7 @@ Layout Description <physicalRegionSize>0x48000</physicalRegionSize> <side>A</side> <ecc/> + <preserved/> <reprovision/> <clearOnEccErr/> </section> @@ -134,6 +136,7 @@ Layout Description <physicalRegionSize>0x90000</physicalRegionSize> <side>A</side> <ecc/> + <preserved/> <reprovision/> <clearOnEccErr/> </section> @@ -145,6 +148,7 @@ Layout Description <physicalRegionSize>0x48000</physicalRegionSize> <side>A</side> <ecc/> + <preserved/> <reprovision/> <clearOnEccErr/> </section> @@ -155,6 +159,7 @@ Layout Description <physicalRegionSize>0x100000</physicalRegionSize> <side>A</side> <sha512Version/> + <readOnly/> <ecc/> </section> <section> @@ -173,6 +178,7 @@ Layout Description <physicalRegionSize>0x11A0000</physicalRegionSize> <side>A</side> <sha512Version/> + <readOnly/> <ecc/> </section> <section> @@ -216,10 +222,10 @@ Layout Description <readOnly/> </section> <section> - <description>Bootloader Kernel (26.5MB)</description> + <description>Bootloader Kernel (25.5MB)</description> <eyeCatch>BOOTKERNEL</eyeCatch> <physicalOffset>0x1EA1000</physicalOffset> - <physicalRegionSize>0x1A80000</physicalRegionSize> + <physicalRegionSize>0x1980000</physicalRegionSize> <side>A</side> <sha512Version/> <readOnly/> @@ -227,7 +233,7 @@ Layout Description <section> <description>OCC Lid (1.125M)</description> <eyeCatch>OCC</eyeCatch> - <physicalOffset>0x3921000</physicalOffset> + <physicalOffset>0x3821000</physicalOffset> <physicalRegionSize>0x120000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -237,7 +243,7 @@ Layout Description <section> <description>Checkstop FIR data (12K)</description> <eyeCatch>FIRDATA</eyeCatch> - <physicalOffset>0x3A41000</physicalOffset> + <physicalOffset>0x3941000</physicalOffset> <physicalRegionSize>0x3000</physicalRegionSize> <side>A</side> <ecc/> @@ -247,7 +253,7 @@ Layout Description <section> <description>CAPP Lid (144K)</description> <eyeCatch>CAPP</eyeCatch> - <physicalOffset>0x3A44000</physicalOffset> + <physicalOffset>0x3944000</physicalOffset> <physicalRegionSize>0x24000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -257,7 +263,7 @@ Layout Description <section> <description>BMC Inventory (36K)</description> <eyeCatch>BMC_INV</eyeCatch> - <physicalOffset>0x3A68000</physicalOffset> + <physicalOffset>0x3968000</physicalOffset> <physicalRegionSize>0x9000</physicalRegionSize> <side>sideless</side> <reprovision/> @@ -265,7 +271,7 @@ Layout Description <section> <description>Hostboot Bootloader (28K)</description> <eyeCatch>HBBL</eyeCatch> - <physicalOffset>0x3A71000</physicalOffset> + <physicalOffset>0x3971000</physicalOffset> <!-- Physical Size includes Header rounded to ECC valid size --> <!-- Max size of actual HBBL content is 20K and 22.5K with ECC --> <physicalRegionSize>0x7000</physicalRegionSize> @@ -277,7 +283,7 @@ Layout Description <section> <description>Temporary Attribute Override (32K)</description> <eyeCatch>ATTR_TMP</eyeCatch> - <physicalOffset>0x3A78000</physicalOffset> + <physicalOffset>0x3978000</physicalOffset> <physicalRegionSize>0x8000</physicalRegionSize> <side>A</side> <reprovision/> @@ -285,7 +291,7 @@ Layout Description <section> <description>Permanent Attribute Override (32K)</description> <eyeCatch>ATTR_PERM</eyeCatch> - <physicalOffset>0x3A80000</physicalOffset> + <physicalOffset>0x3980000</physicalOffset> <physicalRegionSize>0x8000</physicalRegionSize> <side>A</side> <ecc/> @@ -295,15 +301,16 @@ Layout Description <section> <description>PNOR Version (4K)</description> <eyeCatch>VERSION</eyeCatch> - <physicalOffset>0x3A88000</physicalOffset> + <physicalOffset>0x3988000</physicalOffset> <physicalRegionSize>0x1000</physicalRegionSize> <side>A</side> + <sha512Version/> <readOnly/> </section> <section> <description>IMA Catalog (256K)</description> <eyeCatch>IMA_CATALOG</eyeCatch> - <physicalOffset>0x3A89000</physicalOffset> + <physicalOffset>0x3989000</physicalOffset> <physicalRegionSize>0x40000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -313,7 +320,7 @@ Layout Description <section> <description>Ref Image Ring Overrides (128K)</description> <eyeCatch>RINGOVD</eyeCatch> - <physicalOffset>0x3AC9000</physicalOffset> + <physicalOffset>0x39C9000</physicalOffset> <physicalRegionSize>0x20000</physicalRegionSize> <side>A</side> </section> @@ -322,7 +329,7 @@ Layout Description <!-- We need 266KB per module sort, going to support 10 sorts by default, plus ECC --> <eyeCatch>WOFDATA</eyeCatch> - <physicalOffset>0x3AE9000</physicalOffset> + <physicalOffset>0x39E9000</physicalOffset> <physicalRegionSize>0x300000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -332,7 +339,7 @@ Layout Description <section> <description>Hostboot deconfig area (64KB)</description> <eyeCatch>HB_VOLATILE</eyeCatch> - <physicalOffset>0x3DE9000</physicalOffset> + <physicalOffset>0x3CE9000</physicalOffset> <physicalRegionSize>0x5000</physicalRegionSize> <side>A</side> <reprovision/> @@ -343,7 +350,7 @@ Layout Description <section> <description>Memory config data (28K)</description> <eyeCatch>MEMD</eyeCatch> - <physicalOffset>0x3DEE000</physicalOffset> + <physicalOffset>0x3CEE000</physicalOffset> <physicalRegionSize>0xE000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -353,7 +360,7 @@ Layout Description <section> <description>SecureBoot Key Transition Partition (16K)</description> <eyeCatch>SBKT</eyeCatch> - <physicalOffset>0x3E02000</physicalOffset> + <physicalOffset>0x3D02000</physicalOffset> <physicalRegionSize>0x4000</physicalRegionSize> <side>A</side> <sha512Version/> @@ -363,7 +370,7 @@ Layout Description <section> <description>HDAT binary data (16KB)</description> <eyeCatch>HDAT</eyeCatch> - <physicalOffset>0x3E06000</physicalOffset> + <physicalOffset>0x3D06000</physicalOffset> <physicalRegionSize>0x8000</physicalRegionSize> <side>sideless</side> <sha512Version/> @@ -371,10 +378,29 @@ Layout Description <ecc/> </section> <section> + <description>Ultravisor binary image (1MB)</description> + <eyeCatch>UVISOR</eyeCatch> + <physicalOffset>0x3D10000</physicalOffset> + <physicalRegionSize>0x100000</physicalRegionSize> + <side>sideless</side> + <sha512Version/> + <readOnly/> + </section> + <section> + <description>Open CAPI Memory Buffer (OCMB) Firmware (300K)</description> + <eyeCatch>OCMBFW</eyeCatch> + <physicalOffset>0x3E10000</physicalOffset> + <physicalRegionSize>0x4B000</physicalRegionSize> + <side>sideless</side> + <sha512Version/> + <readOnly/> + <ecc/> + </section> + <section> <description>Boot kernel firmware data (1.8MB)</description> <eyeCatch>BOOTKERNFW</eyeCatch> - <physicalOffset>0x3E10000</physicalOffset> - <physicalRegionSize>0x1E0000</physicalRegionSize> + <physicalOffset>0x3E5B000</physicalOffset> + <physicalRegionSize>0x195000</physicalRegionSize> <side>sideless</side> <preserved/> </section> |