cleanup, add preset

Signed-off-by: Zixun LI <[email protected]>
Signed-off-by: HiFiPhile <[email protected]>

4 files changed, 24 insertions, 50 deletions

diff --git a/hw/bsp/BoardPresets.json b/hw/bsp/BoardPresets.json
index 5df924138..8829e65f8 100644
--- a/hw/bsp/BoardPresets.json
+++ b/hw/bsp/BoardPresets.json
@@ -235,6 +235,10 @@
       "inherits": "default"
     },
     {
+      "name": "hpm6750evk2",
+      "inherits": "default"
+    },
+    {
       "name": "itsybitsy_m0",
       "inherits": "default"
     },
@@ -363,10 +367,6 @@
       "inherits": "default"
     },
     {
-      "name": "metro_nrf52840",
-      "inherits": "default"
-    },
-    {
       "name": "mimxrt1010_evk",
       "inherits": "default"
     },
@@ -519,10 +519,6 @@
       "inherits": "default"
     },
     {
-      "name": "raspberry_pi_pico2_riscv",
-      "inherits": "default"
-    },
-    {
       "name": "raspberry_pi_pico_w",
       "inherits": "default"
     },
@@ -1229,6 +1225,11 @@
       "configurePreset": "frdm_mcxn947"
     },
     {
+      "name": "hpm6750evk2",
+      "description": "Build preset for the hpm6750evk2 board",
+      "configurePreset": "hpm6750evk2"
+    },
+    {
       "name": "itsybitsy_m0",
       "description": "Build preset for the itsybitsy_m0 board",
       "configurePreset": "itsybitsy_m0"
@@ -1389,11 +1390,6 @@
       "configurePreset": "metro_m7_1011_sd"
     },
     {
-      "name": "metro_nrf52840",
-      "description": "Build preset for the metro_nrf52840 board",
-      "configurePreset": "metro_nrf52840"
-    },
-    {
       "name": "mimxrt1010_evk",
       "description": "Build preset for the mimxrt1010_evk board",
       "configurePreset": "mimxrt1010_evk"
@@ -1584,11 +1580,6 @@
       "configurePreset": "raspberry_pi_pico2"
     },
     {
-      "name": "raspberry_pi_pico2_riscv",
-      "description": "Build preset for the raspberry_pi_pico2_riscv board",
-      "configurePreset": "raspberry_pi_pico2_riscv"
-    },
-    {
       "name": "raspberry_pi_pico_w",
       "description": "Build preset for the raspberry_pi_pico_w board",
       "configurePreset": "raspberry_pi_pico_w"
@@ -2855,6 +2846,19 @@
       ]
     },
     {
+      "name": "hpm6750evk2",
+      "steps": [
+        {
+          "type": "configure",
+          "name": "hpm6750evk2"
+        },
+        {
+          "type": "build",
+          "name": "hpm6750evk2"
+        }
+      ]
+    },
+    {
       "name": "itsybitsy_m0",
       "steps": [
         {
@@ -3271,19 +3275,6 @@
       ]
     },
     {
-      "name": "metro_nrf52840",
-      "steps": [
-        {
-          "type": "configure",
-          "name": "metro_nrf52840"
-        },
-        {
-          "type": "build",
-          "name": "metro_nrf52840"
-        }
-      ]
-    },
-    {
       "name": "mimxrt1010_evk",
       "steps": [
         {
@@ -3778,19 +3769,6 @@
       ]
     },
     {
-      "name": "raspberry_pi_pico2_riscv",
-      "steps": [
-        {
-          "type": "configure",
-          "name": "raspberry_pi_pico2_riscv"
-        },
-        {
-          "type": "build",
-          "name": "raspberry_pi_pico2_riscv"
-        }
-      ]
-    },
-    {
       "name": "raspberry_pi_pico_w",
       "steps": [
         {
diff --git a/hw/bsp/hpmicro/family.cmake b/hw/bsp/hpmicro/family.cmake
index 4500f326f..1289859d3 100644
--- a/hw/bsp/hpmicro/family.cmake
+++ b/hw/bsp/hpmicro/family.cmake
@@ -2,8 +2,6 @@ include_guard()
 
 set(SDK_DIR ${TOP}/hw/mcu/hpmicro/hpm_sdk)
 
-set(CROSS_COMPILE "riscv32-unknown-elf-")
-
 # include board specific
 include(${CMAKE_CURRENT_LIST_DIR}/boards/${BOARD}/board.cmake)
 
@@ -13,7 +11,7 @@ if (NOT DEFINED CMAKE_SYSTEM_CPU)
 endif ()
 set(CMAKE_TOOLCHAIN_FILE ${TOP}/examples/build_system/cmake/toolchain/riscv_${TOOLCHAIN}.cmake)
 
-set(FAMILY_MCUS HPMIRCO CACHE INTERNAL "")
+set(FAMILY_MCUS HPMICRO CACHE INTERNAL "")
 
 #------------------------------------
 # Startup & Linker script
diff --git a/hw/bsp/hpmicro/family.mk b/hw/bsp/hpmicro/family.mk
index 9721e2f7d..f8cde55eb 100644
--- a/hw/bsp/hpmicro/family.mk
+++ b/hw/bsp/hpmicro/family.mk
@@ -1,7 +1,5 @@
 SDK_DIR = hw/mcu/hpmicro/hpm_sdk
 
-CROSS_COMPILE ?= riscv32-unknown-elf-
-
 include $(TOP)/$(BOARD_PATH)/board.mk
 
 CPU_CORE ?= rv32imac-ilp32
diff --git a/tools/get_deps.py b/tools/get_deps.py
index 42ead17ff..9d9e8149f 100755
--- a/tools/get_deps.py
+++ b/tools/get_deps.py
@@ -246,7 +246,7 @@ deps_optional = {
                                'at32f413'],
     'hw/mcu/hpmicro/hpm_sdk': ['https://github.com/hpmicro/hpm_sdk',
                                '8d2af741ecc4aaa82d7ee395dc1ce25d7070c3ff',
-                               'hpm_sdk hpmicro hpm6750 hpm6300 hpm6200 hpm6800 hpm5300 hpm6e00 hpm5e00'],
+                               'hpmicro'],
     'lib/CMSIS_5': ['https://github.com/ARM-software/CMSIS_5.git',
                     '2b7495b8535bdcb306dac29b9ded4cfb679d7e5c',
                     'imxrt kinetis_k32l2 kinetis_kl lpc51 lpc54 lpc55 mcx mm32 msp432e4 nrf saml2x '