diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 87aa004..f341053 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -67,7 +67,7 @@ jobs: working-directory: ${{github.workspace}}/build run: | mkdir -p $OUTPUT_DIR - cmake $GITHUB_WORKSPACE/sw -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPROJECT_TYPE="NE2K" -DPICO_BOARD=pico_w #-DUSE_LTO=1 + cmake $GITHUB_WORKSPACE/sw -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DPROJECT_TYPE="NE2K" -DPICO_BOARD=picow_fast #-DUSE_LTO=1 cmake --build . --config $BUILD_TYPE --parallel $(nproc) cp pg-ne2k.uf2 $OUTPUT_DIR/pg-ne2k.uf2 diff --git a/sw/CMakeLists.txt b/sw/CMakeLists.txt index 643e5ba..0d8845c 100644 --- a/sw/CMakeLists.txt +++ b/sw/CMakeLists.txt @@ -334,7 +334,6 @@ function(build_ne2k TARGET_NAME MULTIFW) target_link_libraries( ${TARGET_NAME} ne2000 - pico_cyw43_arch_none ) endfunction() diff --git a/sw/ne2000play.cpp b/sw/ne2000play.cpp index b5a2863..44576be 100644 --- a/sw/ne2000play.cpp +++ b/sw/ne2000play.cpp @@ -33,10 +33,8 @@ extern uint LED_PIN; void play_ne2000() { //flash_safe_execute_core_init(); puts("starting core 1 ne2000"); - set_sys_clock_khz(240000, true);//temporary hack because of board definition flash divider PG_EnableWifi(); PG_Wifi_Connect(settings.WiFi.ssid, settings.WiFi.password); - set_sys_clock_khz(366000, true); static bool flag = false; while(1) { diff --git a/sw/picow-fast.h b/sw/picow-fast.h deleted file mode 100644 index caab900..0000000 --- a/sw/picow-fast.h +++ /dev/null @@ -1,12 +0,0 @@ -// Board config file for PicoGUS 2.0, also compatible with the Pi Pico -#ifndef _BOARDS_PICOW_FAST_H -#define _BOARDS_PICOW_FAST_H - -// Allow extra time for xosc to start. -#define PICO_XOSC_STARTUP_DELAY_MULTIPLIER 64 - -// Slower flash to assist restarts when flashing on the fly -#define PICO_FLASH_SPI_CLKDIV 6 - -#include "boards/pico_w.h" -#endif \ No newline at end of file