From 763a413367ac5302236abf614997d0e55883c5d5 Mon Sep 17 00:00:00 2001 From: David Bauer Date: Thu, 28 Nov 2019 08:21:28 +0100 Subject: [PATCH] mpc85xx: update profile names --- .github/workflows/build-gluon.yml | 10 +++++----- targets/mpc85xx-generic | 1 - targets/mpc85xx-p1010 | 1 + targets/mpc85xx-p1020 | 6 +++--- targets/targets.mk | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) delete mode 100644 targets/mpc85xx-generic create mode 100644 targets/mpc85xx-p1010 diff --git a/.github/workflows/build-gluon.yml b/.github/workflows/build-gluon.yml index 2466f52e..4ee9fb8c 100644 --- a/.github/workflows/build-gluon.yml +++ b/.github/workflows/build-gluon.yml @@ -333,8 +333,8 @@ jobs: name: lantiq-xway_output path: output - mpc85xx-generic: - name: mpc85xx-generic + mpc85xx-p1010: + name: mpc85xx-p1010 runs-on: ubuntu-latest steps: - uses: actions/checkout@v1 @@ -349,7 +349,7 @@ jobs: - name: Install Dependencies run: sudo contrib/actions/install-dependencies.sh - name: Build - run: contrib/actions/run-build.sh mpc85xx-generic + run: contrib/actions/run-build.sh mpc85xx-p1010 - name: Create cache to save if: steps.cache-dl.outputs.cache-hit != 'true' run: mkdir dl_target; mv openwrt/dl/* dl_target/; find dl_target/ -size +20M -delete @@ -357,12 +357,12 @@ jobs: if: ${{ !cancelled() }} uses: actions/upload-artifact@v1 with: - name: mpc85xx-generic_logs + name: mpc85xx-p1010_logs path: openwrt/logs - name: Archive build output uses: actions/upload-artifact@v1 with: - name: mpc85xx-generic_output + name: mpc85xx-p1010_output path: output mpc85xx-p1020: diff --git a/targets/mpc85xx-generic b/targets/mpc85xx-generic deleted file mode 100644 index a806587b..00000000 --- a/targets/mpc85xx-generic +++ /dev/null @@ -1 +0,0 @@ -device('tp-link-tl-wdr4900-v1', 'tl-wdr4900-v1') diff --git a/targets/mpc85xx-p1010 b/targets/mpc85xx-p1010 new file mode 100644 index 00000000..3335ac59 --- /dev/null +++ b/targets/mpc85xx-p1010 @@ -0,0 +1 @@ +device('tp-link-tl-wdr4900-v1', 'tplink_tl-wdr4900-v1') diff --git a/targets/mpc85xx-p1020 b/targets/mpc85xx-p1020 index 952b9998..b2887eb8 100644 --- a/targets/mpc85xx-p1020 +++ b/targets/mpc85xx-p1020 @@ -1,20 +1,20 @@ -- Aerohive -device('aerohive-hiveap-330', 'hiveap-330', { +device('aerohive-hiveap-330', 'aerohive_hiveap-330', { factory = false, }) -- Enterasys -device('enterasys-ws-ap3710i', 'ws-ap3710i', { +device('enterasys-ws-ap3710i', 'enterasys_ws-ap3710i', { factory = false, }) -- OCEDO -device('ocedo-panda', 'panda', { +device('ocedo-panda', 'ocedo_panda', { factory = false, }) diff --git a/targets/targets.mk b/targets/targets.mk index 357902d6..b1bbc2b3 100644 --- a/targets/targets.mk +++ b/targets/targets.mk @@ -10,7 +10,7 @@ $(eval $(call GluonTarget,ipq40xx,generic)) $(eval $(call GluonTarget,ipq806x,generic)) $(eval $(call GluonTarget,lantiq,xrx200)) $(eval $(call GluonTarget,lantiq,xway)) -$(eval $(call GluonTarget,mpc85xx,generic)) +$(eval $(call GluonTarget,mpc85xx,p1010)) $(eval $(call GluonTarget,mpc85xx,p1020)) $(eval $(call GluonTarget,ramips,mt7620)) $(eval $(call GluonTarget,ramips,mt7621))