Merge "riscv64: Add basic support for riscv64 IoT headless" into tizen

8 files changed, 28 insertions, 10 deletions

diff --git a/packaging/building-blocks.spec b/packaging/building-blocks.spec
index edfd4f7..d936c0f 100644
--- a/packaging/building-blocks.spec
+++ b/packaging/building-blocks.spec
@@ -90,6 +90,10 @@ Source3816:	platform-preset-boards-generic-hal-backend.inc
 Source3820:	platform-preset-boards-common.inc
 Source3813:	platform-preset-boards-vim3-hal-backend.inc
 %endif
+%ifarch riscv64
+Source3816:	platform-preset-boards-generic-hal-backend.inc
+Source3820:	platform-preset-boards-common.inc
+%endif
 %ifarch armv7l
 Source3812:	platform-preset-boards-artik530-hal-backend.inc
 %endif
@@ -424,6 +428,10 @@ python ./rule_checker.py
 %{include_if_mainbuild %{SOURCE3820}}
 %{include_if_mainbuild %{SOURCE3813}}
 %endif
+%ifarch riscv64
+%{include_if_mainbuild %{SOURCE3816}}
+%{include_if_mainbuild %{SOURCE3820}}
+%endif
 %ifarch armv7l
 %{include_if_mainbuild %{SOURCE3812}}
 %endif
diff --git a/packaging/domain-apis-machinelearning.inc b/packaging/domain-apis-machinelearning.inc
index 7e24ab6..852dbe7 100644
--- a/packaging/domain-apis-machinelearning.inc
+++ b/packaging/domain-apis-machinelearning.inc
@@ -15,7 +15,9 @@ Summary: NNStreamer and its API
 Requires: nnstreamer
 Requires: nnstreamer-tensorflow-lite
 Requires: nnstreamer-tensorflow2-lite
+%ifnarch riscv64
 Requires: nnstreamer-nnfw
+%endif
 Requires: capi-machine-learning-inference
 Requires: nnstreamer-flatbuf
 Requires: nnstreamer-protobuf
@@ -23,8 +25,10 @@ Requires: nnstreamer-edge
 Requires: machine-learning-agent
 %ifarch x86_64 aarch64
 Suggests: nnstreamer-tensorflow
+%ifnarch riscv64
 Suggests: nnstreamer-edgetpu
 %endif
+%endif
 %ifarch %arm aarch64
 Suggests: nnstreamer-armnn
 %endif
diff --git a/packaging/domain-features-starter.inc b/packaging/domain-features-starter.inc
index 1ab459a..e285aeb 100755
--- a/packaging/domain-features-starter.inc
+++ b/packaging/domain-features-starter.inc
@@ -8,7 +8,7 @@
 Summary:	Starter daemon and Menu screen App
 Requires: starter
 Requires: starter-profile_common
-%ifarch armv7l aarch64 %{ix86} x86_64
+%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
 Requires: org.tizen.homescreen-nui
 Requires: org.tizen.quickpanel_common
 Requires: org.tizen.setting-homescreen_common
diff --git a/packaging/epicfeature-application.inc b/packaging/epicfeature-application.inc
index 9e713bd..bd665f0 100755
--- a/packaging/epicfeature-application.inc
+++ b/packaging/epicfeature-application.inc
@@ -42,7 +42,7 @@ Suggests: org.tizen.bluetooth-share-ui
 Suggests: org.tizen.MusicPlayer
 Suggests: org.tizen.ScreenMirroringSink
 Suggests: org.tizen.Tray
-%ifarch armv7l aarch64 %{ix86} x86_64
+%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
 Suggests: org.tizen.wallpaper-ui-service_common
 Suggests: org.tizen.videos_common
 Suggests: org.tizen.ug-gallery-efl_common
@@ -95,7 +95,7 @@ Requires: org.tizen.bluetooth-share-ui
 Requires: org.tizen.MusicPlayer
 Requires: org.tizen.ScreenMirroringSink
 Requires: org.tizen.Tray
-%ifarch armv7l aarch64 %{ix86} x86_64
+%ifarch armv7l aarch64 %{ix86} x86_64 riscv64
 Requires: org.tizen.wallpaper-ui-service_common
 Requires: org.tizen.videos_common
 Requires: org.tizen.ug-gallery-efl_common
@@ -112,4 +112,3 @@ Tizen Applications which are included in IoT Headed Image
 %files sub1-feature_App-IoT_Headed_Ref_image
 %posttrans sub1-feature_App-IoT_Headed_Ref_image
 %tizen_feature tizen.org/feature/systemsetting.home_screen true
-
diff --git a/packaging/platform-preset-boards.inc b/packaging/platform-preset-boards.inc
index 5554133..85f546d 100644
--- a/packaging/platform-preset-boards.inc
+++ b/packaging/platform-preset-boards.inc
@@ -12,6 +12,9 @@ Suggests:	%{name}-sub1-Preset_boards-RPI4_HAL_Backend
 Suggests:	%{name}-sub1-Preset_boards-GENERIC_HAL_Backend
 Suggests:	%{name}-sub1-Preset_boards-VIM3_HAL_Backend
 %endif
+%ifarch riscv64
+Suggests:	%{name}-sub1-Preset_boards-GENERIC_HAL_Backend
+%endif
 %ifarch aarch64
 Suggests:	%{name}-sub1-Preset_boards-C4_HAL_Backend
 %endif
diff --git a/packaging/platform-preset-iot-headed-images.inc b/packaging/platform-preset-iot-headed-images.inc
index fa0f4e5..c55e33c 100644
--- a/packaging/platform-preset-iot-headed-images.inc
+++ b/packaging/platform-preset-iot-headed-images.inc
@@ -6,7 +6,7 @@
 ################################
 %package root-Preset_img_headed
 Summary:    IOT Headed Images
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 riscv64
 Suggests:	%{name}-sub1-Preset_img_headed-common
 %endif
 %ifarch %{ix86} x86_64
@@ -19,7 +19,7 @@ The IoT Headed Images.
 %files root-Preset_img_headed
 
 
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 riscv64
 #############################
 ### IOT Headed COMMON ###
 #############################
diff --git a/packaging/platform-preset-iot-headless-images.inc b/packaging/platform-preset-iot-headless-images.inc
index 82fa182..80881ef 100644
--- a/packaging/platform-preset-iot-headless-images.inc
+++ b/packaging/platform-preset-iot-headless-images.inc
@@ -6,7 +6,7 @@
 ################################
 %package root-Preset_img_headless
 Summary:    IOT Headless Images
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 riscv64
 Suggests:	%{name}-sub1-Preset_img_headless-common
 %endif
 
@@ -15,7 +15,7 @@ __EXPAND__: preset
 The IoT Headless Images.
 %files root-Preset_img_headless
 
-%ifarch %{arm} aarch64
+%ifarch %{arm} aarch64 riscv64
 ###########################
 ### IOT Headless COMMON ###
 ###########################
@@ -44,7 +44,9 @@ Requires:	%{name}-sub2-domain_API-Multimedia-Webrtc
 Requires:	gstreamer-utils
 Requires:	%{name}-sub2-domain_API-Network-Bluetooth_Media_Audio
 Requires:	%{name}-sub2-domain_API-Network-Curl
+%ifnarch riscv64
 Requires:       %{name}-sub1-domain_Feature-Diagnostics
+%endif
 Requires:	%{name}-sub1-domain_Feature-Upgrade
 Requires:	%{name}-sub1-domain_Feature-Setup
 Requires:	tar
@@ -81,5 +83,3 @@ The packages of Tizen IoT Headless for COMMON.
 %files sub1-Preset_img_headless-common
 
 %endif
-
-
diff --git a/packaging/platform-preset-iot.inc b/packaging/platform-preset-iot.inc
index 83f21be..f2804b7 100644
--- a/packaging/platform-preset-iot.inc
+++ b/packaging/platform-preset-iot.inc
@@ -339,7 +339,9 @@ Requires:	%{name}-sub2-domain_API-Base-Sqlite
 Requires:	%{name}-sub2-domain_API-Base-Utils
 Requires:	%{name}-sub2-domain_API-Base-zlib
 Requires:	%{name}-sub2-domain_API-Content-MIME_Type
+%ifnarch riscv64
 Requires:	%{name}-sub2-domain_API-Messaging-Push
+%endif
 Requires:	%{name}-sub2-domain_API-Multimedia-Audio_IO
 Requires:	%{name}-sub2-domain_API-Multimedia-Media_Controller
 Requires:	%{name}-sub2-domain_API-Multimedia-Sound_Manager
@@ -361,8 +363,10 @@ Requires:	%{name}-sub2-domain_API-System-System_Information
 Requires:	%{name}-sub2-domain_API-System-System_Settings
 Requires:	%{name}-sub2-domain_API-System-dlog
 Requires:	%{name}-sub2-domain_API-UI-EFL_MainLoop
+%ifnarch riscv64
 Requires:	%{name}-sub2-domain_API-UIX-TTS
 Requires:	%{name}-sub2-domain_API-UIX-Voice_control
+%endif
 Requires:	%{name}-sub2-domain_API-Web-json_Glib
 #From TRE-2900
 Requires:       %{name}-sub2-domain_API-System-Resource_Monitor