Merge pull request #51 from parameshbabu/develop

Updated to support ms-iot/bsp based bsp and provisioning based appx install
ms-iot · Jan 25, 2017 · 5c57454 · 5c57454
2 parents 37e9771 + 36a0042
commit 5c57454
Show file tree

Hide file tree

Showing 14 changed files with 165 additions and 100 deletions.
diff --git a/README.md b/README.md
@@ -11,8 +11,8 @@ This branch supports the lastest Windows 10 IoT Core release available ( current
 ##Develop Branch
 This branch contains the active development contents, mostly addressing the upcoming release features. 
 
-##10586 Branch
-This branch supports the Windows 10 IoT Core Release 1511 (version 10.0.10586.x).
+##Older Versions 
+* [10586_v1.0 release](https://github.com/ms-iot/iot-adk-addonkit/releases/tag/v1.0) for Windows 10 IoT Core Release 1511 (version 10.0.10586.x).
 
 
 #References
@@ -35,3 +35,14 @@ This branch supports the Windows 10 IoT Core Release 1511 (version 10.0.10586.x)
 	* [ADK Version 1511](https://go.microsoft.com/fwlink/p/?LinkId=823089)
 * [Windows Driver Kit - WDK](https://go.microsoft.com/fwlink/p/?LinkId=526733)
 * [Windows 10 IoT Core Dashboard](https://developer.microsoft.com/windows/iot/docs/iotdashboard)
+
+## BSPs
+* Raspberry Pi BSP
+  The drivers required for the Raspberry Pi are available in the github project : [ms-iot/bsp](https://github.com/ms-iot/bsp).
+  Steps to create the drivers :
+  1. check out ms-iot/bsp project
+  2. Build the bcm2386 solution
+  3. Go to the tools folder and run 
+     binexport Release/debug <target folder> eg. binexport release c:\rpibsp
+  4. In IoTCoreShell, run C:\rpibsp\build.cmd
+  The required cabs will be created in the output folder.
diff --git a/Source-arm/BSP/CustomRpi2/Packages/CustomRPi2FM.xml b/Source-arm/BSP/CustomRpi2/Packages/CustomRPi2FM.xml
@@ -9,16 +9,16 @@
     <!-- UEFI for the silicon packaged in Bootfirmware -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
     <!-- Drivers required for boot/reading partitions for UpdateOS -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
     <!-- MBR BCD Settings -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
     <!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
     <!-- Mandatory device drivers -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
     <!-- Device specific customisations if any -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
   </BasePackages>
@@ -39,22 +39,22 @@
     <MSFeatureGroups />
     <OEM>
       <!-- Optional Device Drivers -->
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
         <FeatureIDs>
           <FeatureID>RPI2_GPIO_DRIVER</FeatureID>
         </FeatureIDs>
@@ -65,17 +65,17 @@
           <FeatureID>CustomRPi2_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
@@ -92,24 +92,24 @@
       </PackageFile>
       <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.FT5406.Touch.cab">
         <FeatureIDs>
-          <FeatureID>RPI2_DRIVERS</FeatureID>
+          <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
         <FeatureIDs>
-          <FeatureID>RPI2_DRIVERS</FeatureID>
+          <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
         <FeatureIDs>
           <FeatureID>RPI_MINIUART</FeatureID>
-          <FeatureID>RPi3_Drivers</FeatureID>
+          <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
       <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.Wifi.bcmdhd63.cab">
         <FeatureIDs>
           <FeatureID>RPI_WIFI_DRIVER</FeatureID>
-          <FeatureID>RPi3_Drivers</FeatureID>
+          <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
       <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.BtwSerialH5Bus.cab">

diff --git a/Source-arm/BSP/ModelA/Packages/ModelAFM.xml b/Source-arm/BSP/ModelA/Packages/ModelAFM.xml
@@ -10,17 +10,16 @@
     <!--PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.ModelA.BootFirmware.cab"/-->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
     <!-- Drivers required for boot/reading partitions for UpdateOS -->
-    <!--PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/-->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
     <!-- MBR BCD Settings -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
     <!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
     <!-- Mandatory device drivers -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
     <!-- Device specific customisations if any -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
   </BasePackages>
@@ -41,37 +40,37 @@
     <MSFeatureGroups />
     <OEM>
       <!-- Optional Device Drivers -->
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
@@ -91,12 +90,12 @@
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
         <FeatureIDs>
           <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
@@ -108,7 +107,7 @@
       </PackageFile>
       <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.BtwSerialH5Bus.cab">
         <FeatureIDs>
-          <FeatureID>RPI_BTWSERIALH5BUS_DRIVER</FeatureID>
+          <FeatureID>ModelA_Drivers</FeatureID>
         </FeatureIDs>
       </PackageFile>
     </OEM>

diff --git a/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml b/Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml
@@ -36,7 +36,7 @@
     <Microsoft>
       <Feature>IOT_EFIESP</Feature>
       <Feature>IOT_DMAP_DRIVER</Feature>
-      <!-- Feature>IOT_GENERIC_POP</Feature -->
+      <Feature>IOT_GENERIC_POP</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>

diff --git a/Source-arm/BSP/Rpi2/OEMInputSamples/TestOEMInput.xml b/Source-arm/BSP/Rpi2/OEMInputSamples/TestOEMInput.xml
@@ -40,6 +40,7 @@
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
+      <Feature>IOT_GENERIC_POP</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>

diff --git a/Source-arm/BSP/Rpi2/Packages/RPi2FM.xml b/Source-arm/BSP/Rpi2/Packages/RPi2FM.xml
@@ -5,71 +5,72 @@
   xmlns="http://schemas.microsoft.com/embedded/2004/10/ImageUpdate">
   <BasePackages>
     <!-- System Information package for providing system details , required for DM enrollment etc -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SystemInformation.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.Device.SystemInformation.cab"/>
     <!-- UEFI for the silicon packaged in Bootfirmware -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
     <!-- Drivers required for boot/reading partitions for UpdateOS -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
     <!-- MBR BCD Settings -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
-    <!-- Device Info/ Device Targeting Info : -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.DeviceInfo.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.DeviceTargetingInfo.cab"/>
+    <!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
     <!-- Mandatory device drivers -->
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
-    <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
+    <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
     <!-- Device specific customisations if any -->
     <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
   </BasePackages>
   <DeviceLayoutPackages>
     <!-- MBR 4GB layout  -->
-    <PackageFile SOC="RPi2" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-DeviceLayoutProd-Package.cab"/>
-    <PackageFile SOC="RPi2_2GB" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-DeviceLayoutProd-Min2GB-Package.cab"/>
+    <PackageFile SOC="RPi2" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR4GB.cab"/>
+    <!-- MBR 2GB layout - select this by specifying the SOC field in the OEMInput xml file -->
+    <PackageFile SOC="RPi2_2GB" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR2GB.cab"/>
   </DeviceLayoutPackages>
   <OEMDevicePlatformPackages>
     <!-- MBR 4GB layout  -->
-    <PackageFile Device="RPi2" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.OEMDevicePlatform.cab"/>
-    <PackageFile Device="RPi2_2GB" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.OEMDevicePlatform_Min2GB.cab"/>
+    <PackageFile Device="RPi2" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR4GB.cab"/>
+    <!-- MBR 2GB layout - select this by specifying the SOC field in the OEMInput xml file -->
+    <PackageFile Device="RPi2_2GB" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR2GB.cab"/>
   </OEMDevicePlatformPackages>
+
   <Features>
     <Microsoft />
     <MSFeatureGroups />
     <OEM>
       <!-- Optional Device Drivers -->
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
         <FeatureIDs>
           <FeatureID>RPI2_DRIVERS</FeatureID>
         </FeatureIDs>
@@ -89,12 +90,12 @@
           <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
         <FeatureIDs>
           <FeatureID>RPI3_DRIVERS</FeatureID>
         </FeatureIDs>
       </PackageFile>
-      <PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
+      <PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
         <FeatureIDs>
           <FeatureID>RPI_MINIUART</FeatureID>
           <FeatureID>RPI3_DRIVERS</FeatureID>

diff --git a/Source-arm/Products/SampleA/RetailOEMInput.xml b/Source-arm/Products/SampleA/RetailOEMInput.xml
@@ -38,20 +38,22 @@
       <Feature>IOT_DMAP_DRIVER</Feature>
       <Feature>IOT_CP210x_MAKERDRIVER</Feature>
       <Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
+      <Feature>IOT_GENERIC_POP</Feature>
       <!-- Following two required for Appx Installation -->
       <Feature>IOT_UAP_OOBE</Feature>
       <Feature>IOT_APP_TOOLKIT</Feature>
       <!-- for Connectivity -->
       <Feature>IOT_SSH</Feature>
       <Feature>IOT_SIREP</Feature>
+      <Feature>IOT_BERTHA</Feature>
+      <Feature>IOT_ALLJOYN_APP</Feature>
       <Feature>IOT_ENABLE_ADMIN</Feature>
       <Feature>IOT_APPLICATIONS</Feature>
     </Microsoft>
     <OEM>
       <!-- Include BSP Features -->
       <Feature>RPI2_DRIVERS</Feature>
       <!-- Include OEM features -->
-      <Feature>OEM_AppxMain</Feature>
       <Feature>OEM_CustomCmd</Feature>
       <Feature>OEM_ProvAuto</Feature>
     </OEM>