diff --git a/Android.mk b/Android.mk
index 89ba8731c1..d2b53f90da 100644
--- a/Android.mk
+++ b/Android.mk
@@ -16,6 +16,10 @@ endef
 LOCAL_MODULE_DDK_BUILD := false
 LOCAL_MODULE_DDK_ALLOW_UNSAFE_HEADERS := false
 
+ifeq ($(TARGET_BOARD_PLATFORM), sun)
+LOCAL_MODULE_DDK_BUILD := true
+LOCAL_MODULE_DDK_ALLOW_UNSAFE_HEADERS := true
+endif
 ifeq ($(TARGET_BOARD_PLATFORM), pineapple)
 LOCAL_MODULE_DDK_BUILD := true
 LOCAL_MODULE_DDK_ALLOW_UNSAFE_HEADERS := true
diff --git a/wlan_qcacld3_modules.bzl b/wlan_qcacld3_modules.bzl
index 030250ea49..916ddab53f 100644
--- a/wlan_qcacld3_modules.bzl
+++ b/wlan_qcacld3_modules.bzl
@@ -6,6 +6,10 @@ _target_chipset_map = {
     "pineapple": [
 	"kiwi-v2",
     ],
+    "sun": [
+        "peach",
+        "kiwi-v2",
+    ],
 }
 
 _chipset_hw_map = {
@@ -2107,11 +2111,6 @@ def _define_module_for_target_variant_chipset(target, variant, chipset):
         copts.append(i)
 
     feature_grep_map = [
-        {
-            "pattern": "walt_get_cpus_taken",
-            "file": "kernel/sched/walt/walt.c",
-            "flag": "WALT_GET_CPU_TAKEN_SUPPORT",
-        },
         {
             "pattern": "nl80211_validate_key_link_id",
             "file": "net/wireless/nl80211.c",
@@ -2163,6 +2162,7 @@ def _define_module_for_target_variant_chipset(target, variant, chipset):
         cmd = cmd,
     )
 
+    copts.append("-Wno-format")
     copts.append("-include")
     copts.append("$(location :{}_grep_defines)".format(tvc))