Introduce separate package and config for RPi3/RPi4

Change-Id: Ibc6a1574ad4d872e21bd87ca4c4aa2fe92e10f46

diff --git a/hw/peripheral-io/rpi3/gpio.ini b/hw/peripheral-io/rpi3/gpio.ini
new file mode 100644 (file)
index 0000000..40ea962
--- /dev/null
+++ b/hw/peripheral-io/rpi3/gpio.ini
@@ -0,0 +1,11 @@
+[Chip0]
+name = pinctrl-bcm2835
+base = 0
+
+[Chip1]
+name = brcmvirt-gpio
+base = 100
+
+[Chip2]
+name = raspberrypi-exp-gpio
+base = 504

diff --git a/hw/peripheral-io/gpio.ini b/hw/peripheral-io/rpi4/gpio.ini
similarity index 100%
rename from hw/peripheral-io/gpio.ini
rename to hw/peripheral-io/rpi4/gpio.ini

diff --git a/packaging/hal-backend-device-rpi.spec b/packaging/hal-backend-device-rpi.spec
index f920bad..1da8a10 100644 (file)
--- a/packaging/hal-backend-device-rpi.spec
+++ b/packaging/hal-backend-device-rpi.spec
@@ -19,6 +19,20 @@ BuildRequires:  pkgconfig(hal-backend-device-common)
 %description
 Device HAL backend drivers for Raspberry Pi targets
 
+%package -n hal-backend-device-rpi3
+Summary: Additional device HAL backend drivers for RPi3
+Conflicts: hal-backend-device-rpi4
+
+%description -n hal-backend-device-rpi3
+Additional device HAL backend drivers for Raspberry Pi 3
+
+%package -n hal-backend-device-rpi4
+Summary: Additional device HAL backend drivers for RPi4
+Conflicts: hal-backend-device-rpi3
+
+%description -n hal-backend-device-rpi4
+Additional device HAL backend drivers for Raspberry Pi 4
+
 %prep
 %setup -q
 cp %{SOURCE1} .
@@ -38,7 +52,11 @@ install -D -m 644 hw/reboot/register_storage %{buildroot}%{_hal_sysconfdir}/rebo
 
 # peripheral-io ini file
 mkdir -p %{buildroot}%{_hal_sysconfdir}/peripheral-io
+mkdir %{buildroot}%{_hal_sysconfdir}/peripheral-io/rpi3
+mkdir %{buildroot}%{_hal_sysconfdir}/peripheral-io/rpi4
 install -m 644  hw/peripheral-io/*.ini %{buildroot}%{_hal_sysconfdir}/peripheral-io
+install -m 644  hw/peripheral-io/rpi3/*.ini %{buildroot}%{_hal_sysconfdir}/peripheral-io/rpi3
+install -m 644  hw/peripheral-io/rpi4/*.ini %{buildroot}%{_hal_sysconfdir}/peripheral-io/rpi4
 
 %post
 /sbin/ldconfig
@@ -46,9 +64,29 @@ install -m 644  hw/peripheral-io/*.ini %{buildroot}%{_hal_sysconfdir}/peripheral
 %postun
 /sbin/ldconfig
 
+%post -n hal-backend-device-rpi3
+pushd %{_hal_sysconfdir}/peripheral-io
+mv rpi3/gpio.ini .
+rmdir rpi3
+popd
+
+%post -n hal-backend-device-rpi4
+pushd %{_hal_sysconfdir}/peripheral-io
+mv rpi4/gpio.ini .
+rmdir rpi4
+popd
+
 %files
 %{_hal_libdir}/*.so*
 %{_hal_sysconfdir}/reboot/register_storage
 %{_hal_sysconfdir}/peripheral-io/*.ini
 %manifest %{name}.manifest
 %{_hal_licensedir}/%{name}/LICENSE.Apache-2.0
+
+%files -n hal-backend-device-rpi3
+%dir %{_hal_sysconfdir}/peripheral-io/rpi3
+%{_hal_sysconfdir}/peripheral-io/rpi3/gpio.ini
+
+%files -n hal-backend-device-rpi4
+%dir %{_hal_sysconfdir}/peripheral-io/rpi4
+%{_hal_sysconfdir}/peripheral-io/rpi4/gpio.ini