From 11c9acf8adea70dae5efc09de8406dbdcf88ade9 Mon Sep 17 00:00:00 2001 From: blogic Date: Mon, 17 Aug 2015 05:59:29 +0000 Subject: [PATCH] ramips: fix Olimex models, images and profiles names Official names for RT5350F based OLinuXino products are "RT5350F-OLinuXino{,-EVB}" as on official manufacturer website. The following patch: * changes board names from "olinuxino-rt5350f{,-evb}" to "rt5350f-olinuxino{,-evb}" * changes filenames of dts and profile files * changes image filenames for Olimex RT5350F-OLinuXino{,-EVB} devices. Signed-off-by: Piotr Dymacz git-svn-id: svn://svn.openwrt.org/openwrt/trunk@46623 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/ramips/base-files/lib/ramips.sh | 8 ++++---- target/linux/ramips/base-files/lib/upgrade/platform.sh | 4 ++-- .../{OLINUXINO-RT5350F-EVB.dts => RT5350F-OLINUXINO-EVB.dts} | 4 ++-- .../dts/{OLINUXINO-RT5350F.dts => RT5350F-OLINUXINO.dts} | 2 +- target/linux/ramips/image/Makefile | 12 ++++++------ .../{olinuxino-rt5350f-evb.mk => rt5350f-olinuxino-evb.mk} | 10 +++++----- .../profiles/{olinuxino-rt5350f.mk => rt5350f-olinuxino.mk} | 10 +++++----- 7 files changed, 25 insertions(+), 25 deletions(-) rename target/linux/ramips/dts/{OLINUXINO-RT5350F-EVB.dts => RT5350F-OLINUXINO-EVB.dts} (93%) rename target/linux/ramips/dts/{OLINUXINO-RT5350F.dts => RT5350F-OLINUXINO.dts} (97%) rename target/linux/ramips/rt305x/profiles/{olinuxino-rt5350f-evb.mk => rt5350f-olinuxino-evb.mk} (56%) rename target/linux/ramips/rt305x/profiles/{olinuxino-rt5350f.mk => rt5350f-olinuxino.mk} (59%) diff --git a/target/linux/ramips/base-files/lib/ramips.sh b/target/linux/ramips/base-files/lib/ramips.sh index aff380b5d4..58d7fc9d45 100755 --- a/target/linux/ramips/base-files/lib/ramips.sh +++ b/target/linux/ramips/base-files/lib/ramips.sh @@ -247,11 +247,11 @@ ramips_board_detect() { *"Omnima MiniPlug") name="omni-plug" ;; - *"OLinuXino-RT5350F") - name="olinuxino-rt5350f" + *"Olimex RT5350F-OLinuXino") + name="rt5350f-olinuxino" ;; - *"OLinuXino-RT5350F-EVB") - name="olinuxino-rt5350f-evb" + *"Olimex RT5350F-OLinuXino-EVB") + name="rt5350f-olinuxino-evb" ;; *"PBR-M1") name="pbr-m1" diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index f78bc22822..5242e46bf9 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -77,8 +77,8 @@ platform_check_image() { omni-emb | \ omni-emb-hpm | \ omni-plug | \ - olinuxino-rt5350f | \ - olinuxino-rt5350f-evb | \ + rt5350f-olinuxino | \ + rt5350f-olinuxino-evb | \ psr-680w | \ px4885 | \ re6500 | \ diff --git a/target/linux/ramips/dts/OLINUXINO-RT5350F-EVB.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts similarity index 93% rename from target/linux/ramips/dts/OLINUXINO-RT5350F-EVB.dts rename to target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts index 0a7d7482b1..17fa66f3fd 100644 --- a/target/linux/ramips/dts/OLINUXINO-RT5350F-EVB.dts +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO-EVB.dts @@ -3,8 +3,8 @@ /include/ "rt5350.dtsi" / { - compatible = "RT5350F-OLINUXINO", "ralink,rt5350-soc"; - model = "RT5350F-OLINUXINO"; + compatible = "RT5350F-OLINUXINO-EVB", "ralink,rt5350-soc"; + model = "Olimex RT5350F-OLinuXino-EVB"; palmbus@10000000 { spi@b00 { diff --git a/target/linux/ramips/dts/OLINUXINO-RT5350F.dts b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts similarity index 97% rename from target/linux/ramips/dts/OLINUXINO-RT5350F.dts rename to target/linux/ramips/dts/RT5350F-OLINUXINO.dts index a2596930d3..40caa6b1f6 100644 --- a/target/linux/ramips/dts/OLINUXINO-RT5350F.dts +++ b/target/linux/ramips/dts/RT5350F-OLINUXINO.dts @@ -4,7 +4,7 @@ / { compatible = "RT5350F-OLINUXINO", "ralink,rt5350-soc"; - model = "RT5350F-OLINUXINO"; + model = "Olimex RT5350F-OLinuXino"; palmbus@10000000 { spi@b00 { diff --git a/target/linux/ramips/image/Makefile b/target/linux/ramips/image/Makefile index af09f2735f..e3ff8e6073 100644 --- a/target/linux/ramips/image/Makefile +++ b/target/linux/ramips/image/Makefile @@ -578,16 +578,16 @@ Image/Build/Profile/OMNI-EMB=$(call BuildFirmware/Default8M/$(1),$(1),omni-emb,O Image/Build/Profile/OMNI-PLUG=$(call BuildFirmware/Default8M/$(1),$(1),omni-plug,OMNI-PLUG) -Image/Build/Profile/OLINUXINO-RT5350F=$(call BuildFirmware/Default8M/$(1),$(1),olinuxino-rt5350f,OLINUXINO-RT5350F) - -Image/Build/Profile/OLINUXINO-RT5350F-EVB=$(call BuildFirmware/Default8M/$(1),$(1),olinuxino-rt5350f-evb,OLINUXINO-RT5350F-EVB) - Image/Build/Profile/PSR-680W=$(call BuildFirmware/Default4M/$(1),$(1),psr-680w,PSR-680W) Image/Build/Profile/PWH2004=$(call BuildFirmware/Default8M/$(1),$(1),pwh2004,PWH2004) Image/Build/Profile/PX4885=$(call BuildFirmware/DefaultDualSize/$(1),$(1),px4885,PX4885) +Image/Build/Profile/RT5350F-OLINUXINO=$(call BuildFirmware/Default8M/$(1),$(1),rt5350f-olinuxino,RT5350F-OLINUXINO) + +Image/Build/Profile/RT5350F-OLINUXINO-EVB=$(call BuildFirmware/Default8M/$(1),$(1),rt5350f-olinuxino-evb,RT5350F-OLINUXINO-EVB) + Image/Build/Profile/RTG32B1=$(call BuildFirmware/Default4M/$(1),$(1),rt-g32-b1,RT-G32-B1) Image/Build/Profile/RTN10PLUS=$(call BuildFirmware/Default4M/$(1),$(1),rt-n10-plus,RT-N10-PLUS) @@ -744,11 +744,11 @@ define Image/Build/Profile/Default $(call Image/Build/Profile/NW718,$(1)) $(call Image/Build/Profile/OMNI-EMB,$(1)) $(call Image/Build/Profile/OMNI-PLUG,$(1)) - $(call Image/Build/Profile/OLINUXINO-RT5350F,$(1)) - $(call Image/Build/Profile/OLINUXINO-RT5350F-EVB,$(1)) $(call Image/Build/Profile/PSR-680W,$(1)) $(call Image/Build/Profile/PWH2004,$(1)) $(call Image/Build/Profile/PX4885,$(1)) + $(call Image/Build/Profile/RT5350F-OLINUXINO,$(1)) + $(call Image/Build/Profile/RT5350F-OLINUXINO-EVB,$(1)) $(call Image/Build/Profile/RTG32B1,$(1)) $(call Image/Build/Profile/RTN10PLUS,$(1)) $(call Image/Build/Profile/RT-N13U,$(1)) diff --git a/target/linux/ramips/rt305x/profiles/olinuxino-rt5350f-evb.mk b/target/linux/ramips/rt305x/profiles/rt5350f-olinuxino-evb.mk similarity index 56% rename from target/linux/ramips/rt305x/profiles/olinuxino-rt5350f-evb.mk rename to target/linux/ramips/rt305x/profiles/rt5350f-olinuxino-evb.mk index 1bf9829166..61f5ddbf76 100644 --- a/target/linux/ramips/rt305x/profiles/olinuxino-rt5350f-evb.mk +++ b/target/linux/ramips/rt305x/profiles/rt5350f-olinuxino-evb.mk @@ -5,17 +5,17 @@ # See /LICENSE for more information. # -define Profile/OLINUXINO-RT5350F-EVB - NAME:=OLinuXino-RT5350F-EVB +define Profile/RT5350F-OLINUXINO-EVB + NAME:=RT5350F-OLinuXino-EVB PACKAGES:=\ kmod-usb-core kmod-usb-ohci kmod-usb2 \ kmod-i2c-core kmod-i2c-ralink \ kmod-spi-dev endef -define Profile/OLINUXINO-RT5350F/Description - Package set for OLinuXino-RT5350F-EVB board +define Profile/RT5350F-OLINUXINO-EVB/Description + Package set for RT5350F-OLinuXino-EVB board endef -$(eval $(call Profile,OLINUXINO-RT5350F-EVB)) +$(eval $(call Profile,RT5350F-OLINUXINO-EVB)) diff --git a/target/linux/ramips/rt305x/profiles/olinuxino-rt5350f.mk b/target/linux/ramips/rt305x/profiles/rt5350f-olinuxino.mk similarity index 59% rename from target/linux/ramips/rt305x/profiles/olinuxino-rt5350f.mk rename to target/linux/ramips/rt305x/profiles/rt5350f-olinuxino.mk index af24c5848e..3b201902b5 100644 --- a/target/linux/ramips/rt305x/profiles/olinuxino-rt5350f.mk +++ b/target/linux/ramips/rt305x/profiles/rt5350f-olinuxino.mk @@ -5,16 +5,16 @@ # See /LICENSE for more information. # -define Profile/OLINUXINO-RT5350F - NAME:=OLinuXino-RT5350F +define Profile/RT5350F-OLINUXINO + NAME:=RT5350F-OLinuXino PACKAGES:=\ kmod-usb-core kmod-usb-ohci kmod-usb2 \ kmod-i2c-core kmod-i2c-ralink \ kmod-spi-dev endef -define Profile/OLINUXINO-RT5350F/Description - Package set for OLinuXino-RT5350F board +define Profile/RT5350F-OLINUXINO/Description + Package set for RT5350F-OLinuXino board endef -$(eval $(call Profile,OLINUXINO-RT5350F)) +$(eval $(call Profile,RT5350F-OLINUXINO)) -- 2.11.0