Skip to content
This repository was archived by the owner on Sep 26, 2024. It is now read-only.

Commit 5c57454

Browse files
parameshbabuparameshbabu
authored
Merge pull request #51 from parameshbabu/develop
Updated to support ms-iot/bsp based bsp and provisioning based appx install
2 parents 37e9771 + 36a0042 commit 5c57454

File tree

14 files changed

+165
-100
lines changed

14 files changed

+165
-100
lines changed

‎README.md

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ This branch supports the lastest Windows 10 IoT Core release available ( current
1111
##Develop Branch
1212
This branch contains the active development contents, mostly addressing the upcoming release features.
1313

14-
##10586 Branch
15-
This branch supports the Windows 10 IoT Core Release 1511 (version 10.0.10586.x).
14+
##Older Versions
15+
* [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).
1616

1717

1818
#References
@@ -35,3 +35,14 @@ This branch supports the Windows 10 IoT Core Release 1511 (version 10.0.10586.x)
3535
* [ADK Version 1511](https://go.microsoft.com/fwlink/p/?LinkId=823089)
3636
* [Windows Driver Kit - WDK](https://go.microsoft.com/fwlink/p/?LinkId=526733)
3737
* [Windows 10 IoT Core Dashboard](https://developer.microsoft.com/windows/iot/docs/iotdashboard)
38+
39+
## BSPs
40+
* Raspberry Pi BSP
41+
The drivers required for the Raspberry Pi are available in the github project : [ms-iot/bsp](https://github.com/ms-iot/bsp).
42+
Steps to create the drivers :
43+
1. check out ms-iot/bsp project
44+
2. Build the bcm2386 solution
45+
3. Go to the tools folder and run
46+
binexport Release/debug <target folder> eg. binexport release c:\rpibsp
47+
4. In IoTCoreShell, run C:\rpibsp\build.cmd
48+
The required cabs will be created in the output folder.

‎Source-arm/BSP/CustomRpi2/Packages/CustomRPi2FM.xml

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
<!-- UEFI for the silicon packaged in Bootfirmware -->
1010
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
1111
<!-- Drivers required for boot/reading partitions for UpdateOS -->
12-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
12+
<PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
1313
<!-- MBR BCD Settings -->
1414
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
1515
<!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
1616
<!-- Mandatory device drivers -->
17-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
18-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
17+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
18+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
1919
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
2020
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
21-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
21+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
2222
<!-- Device specific customisations if any -->
2323
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
2424
</BasePackages>
@@ -39,22 +39,22 @@
3939
<MSFeatureGroups />
4040
<OEM>
4141
<!-- Optional Device Drivers -->
42-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
42+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
4343
<FeatureIDs>
4444
<FeatureID>RPI2_DRIVERS</FeatureID>
4545
</FeatureIDs>
4646
</PackageFile>
47-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
47+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
4848
<FeatureIDs>
4949
<FeatureID>RPI2_DRIVERS</FeatureID>
5050
</FeatureIDs>
5151
</PackageFile>
52-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
52+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
5353
<FeatureIDs>
5454
<FeatureID>RPI2_DRIVERS</FeatureID>
5555
</FeatureIDs>
5656
</PackageFile>
57-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
57+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
5858
<FeatureIDs>
5959
<FeatureID>RPI2_GPIO_DRIVER</FeatureID>
6060
</FeatureIDs>
@@ -65,17 +65,17 @@
6565
<FeatureID>CustomRPi2_Drivers</FeatureID>
6666
</FeatureIDs>
6767
</PackageFile>
68-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
68+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
6969
<FeatureIDs>
7070
<FeatureID>RPI2_DRIVERS</FeatureID>
7171
</FeatureIDs>
7272
</PackageFile>
73-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
73+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
7474
<FeatureIDs>
7575
<FeatureID>RPI2_DRIVERS</FeatureID>
7676
</FeatureIDs>
7777
</PackageFile>
78-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
78+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
7979
<FeatureIDs>
8080
<FeatureID>RPI2_DRIVERS</FeatureID>
8181
</FeatureIDs>
@@ -92,24 +92,24 @@
9292
</PackageFile>
9393
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.FT5406.Touch.cab">
9494
<FeatureIDs>
95-
<FeatureID>RPI2_DRIVERS</FeatureID>
95+
<FeatureID>RPI3_DRIVERS</FeatureID>
9696
</FeatureIDs>
9797
</PackageFile>
98-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
98+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
9999
<FeatureIDs>
100-
<FeatureID>RPI2_DRIVERS</FeatureID>
100+
<FeatureID>RPI3_DRIVERS</FeatureID>
101101
</FeatureIDs>
102102
</PackageFile>
103-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
103+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
104104
<FeatureIDs>
105105
<FeatureID>RPI_MINIUART</FeatureID>
106-
<FeatureID>RPi3_Drivers</FeatureID>
106+
<FeatureID>RPI3_DRIVERS</FeatureID>
107107
</FeatureIDs>
108108
</PackageFile>
109109
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.Wifi.bcmdhd63.cab">
110110
<FeatureIDs>
111111
<FeatureID>RPI_WIFI_DRIVER</FeatureID>
112-
<FeatureID>RPi3_Drivers</FeatureID>
112+
<FeatureID>RPI3_DRIVERS</FeatureID>
113113
</FeatureIDs>
114114
</PackageFile>
115115
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.BtwSerialH5Bus.cab">

‎Source-arm/BSP/ModelA/Packages/ModelAFM.xml

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,17 +10,16 @@
1010
<!--PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.ModelA.BootFirmware.cab"/-->
1111
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
1212
<!-- Drivers required for boot/reading partitions for UpdateOS -->
13-
<!--PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/-->
14-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
13+
<PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
1514
<!-- MBR BCD Settings -->
1615
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
1716
<!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
1817
<!-- Mandatory device drivers -->
19-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
20-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
18+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
19+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
2120
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
2221
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
23-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
22+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
2423
<!-- Device specific customisations if any -->
2524
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
2625
</BasePackages>
@@ -41,37 +40,37 @@
4140
<MSFeatureGroups />
4241
<OEM>
4342
<!-- Optional Device Drivers -->
44-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
43+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
4544
<FeatureIDs>
4645
<FeatureID>ModelA_Drivers</FeatureID>
4746
</FeatureIDs>
4847
</PackageFile>
49-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
48+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
5049
<FeatureIDs>
5150
<FeatureID>ModelA_Drivers</FeatureID>
5251
</FeatureIDs>
5352
</PackageFile>
54-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
53+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
5554
<FeatureIDs>
5655
<FeatureID>ModelA_Drivers</FeatureID>
5756
</FeatureIDs>
5857
</PackageFile>
59-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
58+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
6059
<FeatureIDs>
6160
<FeatureID>ModelA_Drivers</FeatureID>
6261
</FeatureIDs>
6362
</PackageFile>
64-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
63+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
6564
<FeatureIDs>
6665
<FeatureID>ModelA_Drivers</FeatureID>
6766
</FeatureIDs>
6867
</PackageFile>
69-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
68+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
7069
<FeatureIDs>
7170
<FeatureID>ModelA_Drivers</FeatureID>
7271
</FeatureIDs>
7372
</PackageFile>
74-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
73+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
7574
<FeatureIDs>
7675
<FeatureID>ModelA_Drivers</FeatureID>
7776
</FeatureIDs>
@@ -91,12 +90,12 @@
9190
<FeatureID>ModelA_Drivers</FeatureID>
9291
</FeatureIDs>
9392
</PackageFile>
94-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
93+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
9594
<FeatureIDs>
9695
<FeatureID>ModelA_Drivers</FeatureID>
9796
</FeatureIDs>
9897
</PackageFile>
99-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
98+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
10099
<FeatureIDs>
101100
<FeatureID>ModelA_Drivers</FeatureID>
102101
</FeatureIDs>
@@ -108,7 +107,7 @@
108107
</PackageFile>
109108
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.BtwSerialH5Bus.cab">
110109
<FeatureIDs>
111-
<FeatureID>RPI_BTWSERIALH5BUS_DRIVER</FeatureID>
110+
<FeatureID>ModelA_Drivers</FeatureID>
112111
</FeatureIDs>
113112
</PackageFile>
114113
</OEM>

‎Source-arm/BSP/Rpi2/OEMInputSamples/RetailOEMInput.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<Microsoft>
3737
<Feature>IOT_EFIESP</Feature>
3838
<Feature>IOT_DMAP_DRIVER</Feature>
39-
<!-- Feature>IOT_GENERIC_POP</Feature -->
39+
<Feature>IOT_GENERIC_POP</Feature>
4040
<!-- Following two required for Appx Installation -->
4141
<Feature>IOT_UAP_OOBE</Feature>
4242
<Feature>IOT_APP_TOOLKIT</Feature>

‎Source-arm/BSP/Rpi2/OEMInputSamples/TestOEMInput.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<Feature>IOT_DMAP_DRIVER</Feature>
4141
<Feature>IOT_CP210x_MAKERDRIVER</Feature>
4242
<Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
43+
<Feature>IOT_GENERIC_POP</Feature>
4344
<!-- Following two required for Appx Installation -->
4445
<Feature>IOT_UAP_OOBE</Feature>
4546
<Feature>IOT_APP_TOOLKIT</Feature>

‎Source-arm/BSP/Rpi2/Packages/RPi2FM.xml

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -5,71 +5,72 @@
55
xmlns="http://schemas.microsoft.com/embedded/2004/10/ImageUpdate">
66
<BasePackages>
77
<!-- System Information package for providing system details , required for DM enrollment etc -->
8-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SystemInformation.cab"/>
8+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.Device.SystemInformation.cab"/>
99
<!-- UEFI for the silicon packaged in Bootfirmware -->
1010
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.BootFirmware.cab"/>
1111
<!-- Drivers required for boot/reading partitions for UpdateOS -->
12-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="SV.PlatExtensions.UpdateOS.cab"/>
12+
<PackageFile Path="%PKGBLD_DIR%" Name="SV.PlatExtensions.UpdateOS.cab"/>
1313
<!-- MBR BCD Settings -->
1414
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-BCD-Package.cab" />
15-
<!-- Device Info/ Device Targeting Info : -->
16-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.DeviceInfo.cab"/>
17-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.DeviceTargetingInfo.cab"/>
15+
<!-- Device Info/ Device Targeting Info : Include IOT_GENERIC_POP in OEMInput xml file -->
1816
<!-- Mandatory device drivers -->
19-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836sdhc.cab"/>
20-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.rpisdhc.cab"/>
17+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836sdhc.cab"/>
18+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpisdhc.cab"/>
2119
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.dwcUsbOtg.cab"/>
2220
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.LAN9500N630F.cab"/>
23-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.rpiq.cab"/>
21+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiq.cab"/>
2422
<!-- Device specific customisations if any -->
2523
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-Customization-Package.cab" />
2624
</BasePackages>
2725
<DeviceLayoutPackages>
2826
<!-- MBR 4GB layout -->
29-
<PackageFile SOC="RPi2" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-DeviceLayoutProd-Package.cab"/>
30-
<PackageFile SOC="RPi2_2GB" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="Microsoft-IoTUAP-RPi2-DeviceLayoutProd-Min2GB-Package.cab"/>
27+
<PackageFile SOC="RPi2" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR4GB.cab"/>
28+
<!-- MBR 2GB layout - select this by specifying the SOC field in the OEMInput xml file -->
29+
<PackageFile SOC="RPi2_2GB" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR2GB.cab"/>
3130
</DeviceLayoutPackages>
3231
<OEMDevicePlatformPackages>
3332
<!-- MBR 4GB layout -->
34-
<PackageFile Device="RPi2" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.OEMDevicePlatform.cab"/>
35-
<PackageFile Device="RPi2_2GB" Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.OEMDevicePlatform_Min2GB.cab"/>
33+
<PackageFile Device="RPi2" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR4GB.cab"/>
34+
<!-- MBR 2GB layout - select this by specifying the SOC field in the OEMInput xml file -->
35+
<PackageFile Device="RPi2_2GB" Path="%PKGBLD_DIR%" Name="%OEM_NAME%.DeviceLayout.MBR2GB.cab"/>
3636
</OEMDevicePlatformPackages>
37+
3738
<Features>
3839
<Microsoft />
3940
<MSFeatureGroups />
4041
<OEM>
4142
<!-- Optional Device Drivers -->
42-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.bcm2836pwm.cab">
43+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcm2836pwm.cab">
4344
<FeatureIDs>
4445
<FeatureID>RPI2_DRIVERS</FeatureID>
4546
</FeatureIDs>
4647
</PackageFile>
47-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.Audio.Wav.cab">
48+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.rpiwav.cab">
4849
<FeatureIDs>
4950
<FeatureID>RPI2_DRIVERS</FeatureID>
5051
</FeatureIDs>
5152
</PackageFile>
52-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SerPL011.cab">
53+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.SerPL011.cab">
5354
<FeatureIDs>
5455
<FeatureID>RPI2_DRIVERS</FeatureID>
5556
</FeatureIDs>
5657
</PackageFile>
57-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.GPIO.cab">
58+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmgpio.cab">
5859
<FeatureIDs>
5960
<FeatureID>RPI2_DRIVERS</FeatureID>
6061
</FeatureIDs>
6162
</PackageFile>
62-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.I2C.cab">
63+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmi2c.cab">
6364
<FeatureIDs>
6465
<FeatureID>RPI2_DRIVERS</FeatureID>
6566
</FeatureIDs>
6667
</PackageFile>
67-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.SPI.cab">
68+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmspi.cab">
6869
<FeatureIDs>
6970
<FeatureID>RPI2_DRIVERS</FeatureID>
7071
</FeatureIDs>
7172
</PackageFile>
72-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi2.AUX.SPI.cab">
73+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.bcmauxspi.cab">
7374
<FeatureIDs>
7475
<FeatureID>RPI2_DRIVERS</FeatureID>
7576
</FeatureIDs>
@@ -89,12 +90,12 @@
8990
<FeatureID>RPI3_DRIVERS</FeatureID>
9091
</FeatureIDs>
9192
</PackageFile>
92-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.VCHIQ.cab">
93+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.vchiq.cab">
9394
<FeatureIDs>
9495
<FeatureID>RPI3_DRIVERS</FeatureID>
9596
</FeatureIDs>
9697
</PackageFile>
97-
<PackageFile Path="$(mspackageroot)\Retail\$(cputype)\$(buildtype)" Name="RASPBERRYPI.RPi.MiniUART.cab">
98+
<PackageFile Path="%PKGBLD_DIR%" Name="%OEM_NAME%.RPi.piminiuart.cab">
9899
<FeatureIDs>
99100
<FeatureID>RPI_MINIUART</FeatureID>
100101
<FeatureID>RPI3_DRIVERS</FeatureID>

‎Source-arm/Products/SampleA/RetailOEMInput.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,20 +38,22 @@
3838
<Feature>IOT_DMAP_DRIVER</Feature>
3939
<Feature>IOT_CP210x_MAKERDRIVER</Feature>
4040
<Feature>IOT_FTSER2K_MAKERDRIVER</Feature>
41+
<Feature>IOT_GENERIC_POP</Feature>
4142
<!-- Following two required for Appx Installation -->
4243
<Feature>IOT_UAP_OOBE</Feature>
4344
<Feature>IOT_APP_TOOLKIT</Feature>
4445
<!-- for Connectivity -->
4546
<Feature>IOT_SSH</Feature>
4647
<Feature>IOT_SIREP</Feature>
48+
<Feature>IOT_BERTHA</Feature>
49+
<Feature>IOT_ALLJOYN_APP</Feature>
4750
<Feature>IOT_ENABLE_ADMIN</Feature>
4851
<Feature>IOT_APPLICATIONS</Feature>
4952
</Microsoft>
5053
<OEM>
5154
<!-- Include BSP Features -->
5255
<Feature>RPI2_DRIVERS</Feature>
5356
<!-- Include OEM features -->
54-
<Feature>OEM_AppxMain</Feature>
5557
<Feature>OEM_CustomCmd</Feature>
5658
<Feature>OEM_ProvAuto</Feature>
5759
</OEM>

0 commit comments

Comments
 (0)