Author: blogic
Date: 2015-08-17 08:01:06 +0200 (Mon, 17 Aug 2015)
New Revision: 46629
Added:
trunk/target/linux/ramips/dts/PX-4885-4M.dts
trunk/target/linux/ramips/dts/PX-4885-8M.dts
trunk/target/linux/ramips/dts/PX-4885.dtsi
Removed:
trunk/target/linux/ramips/dts/PX4885-4M.dts
trunk/target/linux/ramips/dts/PX4885-8M.dts
trunk/target/linux/ramips/dts/PX4885.dtsi
Modified:
trunk/target/linux/ramips/base-files/etc/board.d/01_leds
trunk/target/linux/ramips/base-files/etc/diag.sh
trunk/target/linux/ramips/base-files/lib/ramips.sh
trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
trunk/target/linux/ramips/image/Makefile
trunk/target/linux/ramips/rt305x/profiles/sevenlinks.mk
Log:
ramips: fix 7Links PX-4885 dts{, i}, board, image and profile names
The following patch changes 7Links PX-4885 dts{,i} filenames, board, image and
profile names from "PX4885" to "PX-4885" (for consistency).
Signed-off-by: Piotr Dymacz <[email protected]>
Modified: trunk/target/linux/ramips/base-files/etc/board.d/01_leds
===================================================================
--- trunk/target/linux/ramips/base-files/etc/board.d/01_leds 2015-08-17
06:00:49 UTC (rev 46628)
+++ trunk/target/linux/ramips/base-files/etc/board.d/01_leds 2015-08-17
06:01:06 UTC (rev 46629)
@@ -175,9 +175,9 @@
set_wifi_led "miniembplug:green:wlan"
set_usb_led "miniembplug:green:mobile"
;;
- px4885)
- set_wifi_led "7links:orange:wifi"
- set_usb_led "7links:blue:storage"
+ px-4885)
+ set_wifi_led "px-4885:orange:wifi"
+ set_usb_led "px-4885:blue:storage"
;;
pbr-m1)
ucidef_set_led_netdev "internet" "internet" "pbr-m1:green:internet"
"eth0.2"
Modified: trunk/target/linux/ramips/base-files/etc/diag.sh
===================================================================
--- trunk/target/linux/ramips/base-files/etc/diag.sh 2015-08-17 06:00:49 UTC
(rev 46628)
+++ trunk/target/linux/ramips/base-files/etc/diag.sh 2015-08-17 06:01:06 UTC
(rev 46629)
@@ -134,8 +134,8 @@
pwh2004)
status_led="pwh2004:green:power"
;;
- px4885)
- status_led="7links:orange:wifi"
+ px-4885)
+ status_led="px-4885:orange:wifi"
;;
re6500)
status_led="linksys:orange:wifi"
Modified: trunk/target/linux/ramips/base-files/lib/ramips.sh
===================================================================
--- trunk/target/linux/ramips/base-files/lib/ramips.sh 2015-08-17 06:00:49 UTC
(rev 46628)
+++ trunk/target/linux/ramips/base-files/lib/ramips.sh 2015-08-17 06:01:06 UTC
(rev 46629)
@@ -14,7 +14,7 @@
case "$machine" in
*"7Links PX-4885")
- name="px4885"
+ name="px-4885"
;;
*"8devices Carambola")
name="carambola"
Modified: trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
===================================================================
--- trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
2015-08-17 06:00:49 UTC (rev 46628)
+++ trunk/target/linux/ramips/base-files/lib/upgrade/platform.sh
2015-08-17 06:01:06 UTC (rev 46629)
@@ -80,7 +80,7 @@
rt5350f-olinuxino | \
rt5350f-olinuxino-evb | \
psr-680w | \
- px4885 | \
+ px-4885 | \
re6500 | \
rp-n53 | \
rt-g32-b1 | \
Copied: trunk/target/linux/ramips/dts/PX-4885-4M.dts (from rev 46628,
trunk/target/linux/ramips/dts/PX4885-4M.dts)
===================================================================
--- trunk/target/linux/ramips/dts/PX-4885-4M.dts
(rev 0)
+++ trunk/target/linux/ramips/dts/PX-4885-4M.dts 2015-08-17 06:01:06 UTC
(rev 46629)
@@ -0,0 +1,43 @@
+/dts-v1/;
+
+/include/ "PX-4885.dtsi"
+
+/ {
+ palmbus@10000000 {
+ spi@b00 {
+ status = "okay";
+
+ m25p80@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "mx25l3205d";
+ reg = <0 0>;
+ linux,modalias = "m25p80", "mx25l3205d";
+ spi-max-frequency = <10000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x20000>;
+ read-only;
+ };
+
+ partition@20000 {
+ label = "devdata";
+ reg = <0x20000 0x20000>;
+ read-only;
+ };
+
+ factory: partition@40000 {
+ label = "devconf";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+
+ partition@50000 {
+ label = "firmware";
+ reg = <0x50000 0x3b0000>;
+ };
+ };
+ };
+ };
+};
Copied: trunk/target/linux/ramips/dts/PX-4885-8M.dts (from rev 46628,
trunk/target/linux/ramips/dts/PX4885-8M.dts)
===================================================================
--- trunk/target/linux/ramips/dts/PX-4885-8M.dts
(rev 0)
+++ trunk/target/linux/ramips/dts/PX-4885-8M.dts 2015-08-17 06:01:06 UTC
(rev 46629)
@@ -0,0 +1,43 @@
+/dts-v1/;
+
+/include/ "PX-4885.dtsi"
+
+/ {
+ palmbus@10000000 {
+ spi@b00 {
+ status = "okay";
+
+ m25p80@0 {
+ #address-cells = <1>;
+ #size-cells = <1>;
+ compatible = "mx25l3205d";
+ reg = <0 0>;
+ linux,modalias = "m25p80", "mx25l3205d";
+ spi-max-frequency = <10000000>;
+
+ partition@0 {
+ label = "u-boot";
+ reg = <0x0 0x20000>;
+ read-only;
+ };
+
+ partition@20000 {
+ label = "devdata";
+ reg = <0x20000 0x20000>;
+ read-only;
+ };
+
+ factory: partition@40000 {
+ label = "devconf";
+ reg = <0x40000 0x10000>;
+ read-only;
+ };
+
+ partition@50000 {
+ label = "firmware";
+ reg = <0x50000 0x7b0000>;
+ };
+ };
+ };
+ };
+};
Copied: trunk/target/linux/ramips/dts/PX-4885.dtsi (from rev 46628,
trunk/target/linux/ramips/dts/PX4885.dtsi)
===================================================================
--- trunk/target/linux/ramips/dts/PX-4885.dtsi (rev 0)
+++ trunk/target/linux/ramips/dts/PX-4885.dtsi 2015-08-17 06:01:06 UTC (rev
46629)
@@ -0,0 +1,54 @@
+/include/ "rt5350.dtsi"
+
+/ {
+ compatible = "PX-4885", "ralink,rt5350-soc";
+ model = "7Links PX-4885";
+
+ pinctrl {
+ state_default: pinctrl0 {
+ gpio {
+ ralink,group = "i2c", "jtag", "uartf";
+ ralink,function = "gpio";
+ };
+ };
+ };
+
+ ethernet@10100000 {
+ mtd-mac-address = <&factory 0x28>;
+ };
+
+ esw@10110000 {
+ ralink,portmap = <0x3f>;
+ };
+
+ wmac@10180000 {
+ ralink,mtd-eeprom = <&factory 0>;
+ };
+
+ gpio-keys-polled {
+ compatible = "gpio-keys-polled";
+ #address-cells = <1>;
+ #size-cells = <0>;
+ poll-interval = <20>;
+
+ reset {
+ label = "reset";
+ gpios = <&gpio0 10 1>;
+ linux,code = <0x198>;
+ };
+ };
+
+ gpio-leds {
+ compatible = "gpio-leds";
+
+ orange {
+ label = "px-4885:orange:wifi";
+ gpios = <&gpio0 18 1>;
+ };
+
+ blue {
+ label = "px-4885:blue:storage";
+ gpios = <&gpio0 19 1>;
+ };
+ };
+};
Deleted: trunk/target/linux/ramips/dts/PX4885-4M.dts
===================================================================
--- trunk/target/linux/ramips/dts/PX4885-4M.dts 2015-08-17 06:00:49 UTC (rev
46628)
+++ trunk/target/linux/ramips/dts/PX4885-4M.dts 2015-08-17 06:01:06 UTC (rev
46629)
@@ -1,43 +0,0 @@
-/dts-v1/;
-
-/include/ "PX4885.dtsi"
-
-/ {
- palmbus@10000000 {
- spi@b00 {
- status = "okay";
-
- m25p80@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "mx25l3205d";
- reg = <0 0>;
- linux,modalias = "m25p80", "mx25l3205d";
- spi-max-frequency = <10000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x20000>;
- read-only;
- };
-
- partition@20000 {
- label = "devdata";
- reg = <0x20000 0x20000>;
- read-only;
- };
-
- factory: partition@40000 {
- label = "devconf";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition@50000 {
- label = "firmware";
- reg = <0x50000 0x3b0000>;
- };
- };
- };
- };
-};
Deleted: trunk/target/linux/ramips/dts/PX4885-8M.dts
===================================================================
--- trunk/target/linux/ramips/dts/PX4885-8M.dts 2015-08-17 06:00:49 UTC (rev
46628)
+++ trunk/target/linux/ramips/dts/PX4885-8M.dts 2015-08-17 06:01:06 UTC (rev
46629)
@@ -1,43 +0,0 @@
-/dts-v1/;
-
-/include/ "PX4885.dtsi"
-
-/ {
- palmbus@10000000 {
- spi@b00 {
- status = "okay";
-
- m25p80@0 {
- #address-cells = <1>;
- #size-cells = <1>;
- compatible = "mx25l3205d";
- reg = <0 0>;
- linux,modalias = "m25p80", "mx25l3205d";
- spi-max-frequency = <10000000>;
-
- partition@0 {
- label = "u-boot";
- reg = <0x0 0x20000>;
- read-only;
- };
-
- partition@20000 {
- label = "devdata";
- reg = <0x20000 0x20000>;
- read-only;
- };
-
- factory: partition@40000 {
- label = "devconf";
- reg = <0x40000 0x10000>;
- read-only;
- };
-
- partition@50000 {
- label = "firmware";
- reg = <0x50000 0x7b0000>;
- };
- };
- };
- };
-};
Deleted: trunk/target/linux/ramips/dts/PX4885.dtsi
===================================================================
--- trunk/target/linux/ramips/dts/PX4885.dtsi 2015-08-17 06:00:49 UTC (rev
46628)
+++ trunk/target/linux/ramips/dts/PX4885.dtsi 2015-08-17 06:01:06 UTC (rev
46629)
@@ -1,54 +0,0 @@
-/include/ "rt5350.dtsi"
-
-/ {
- compatible = "PX4885", "ralink,rt5350-soc";
- model = "7Links PX-4885";
-
- pinctrl {
- state_default: pinctrl0 {
- gpio {
- ralink,group = "i2c", "jtag", "uartf";
- ralink,function = "gpio";
- };
- };
- };
-
- ethernet@10100000 {
- mtd-mac-address = <&factory 0x28>;
- };
-
- esw@10110000 {
- ralink,portmap = <0x3f>;
- };
-
- wmac@10180000 {
- ralink,mtd-eeprom = <&factory 0>;
- };
-
- gpio-keys-polled {
- compatible = "gpio-keys-polled";
- #address-cells = <1>;
- #size-cells = <0>;
- poll-interval = <20>;
-
- reset {
- label = "reset";
- gpios = <&gpio0 10 1>;
- linux,code = <0x198>;
- };
- };
-
- gpio-leds {
- compatible = "gpio-leds";
-
- orange {
- label = "7links:orange:wifi";
- gpios = <&gpio0 18 1>;
- };
-
- blue {
- label = "7links:blue:storage";
- gpios = <&gpio0 19 1>;
- };
- };
-};
Modified: trunk/target/linux/ramips/image/Makefile
===================================================================
--- trunk/target/linux/ramips/image/Makefile 2015-08-17 06:00:49 UTC (rev
46628)
+++ trunk/target/linux/ramips/image/Makefile 2015-08-17 06:01:06 UTC (rev
46629)
@@ -582,7 +582,7 @@
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/PX-4885=$(call
BuildFirmware/DefaultDualSize/$(1),$(1),px-4885,PX-4885)
Image/Build/Profile/RT5350F-OLINUXINO=$(call
BuildFirmware/Default8M/$(1),$(1),rt5350f-olinuxino,RT5350F-OLINUXINO)
@@ -746,7 +746,7 @@
$(call Image/Build/Profile/MINIEMBPLUG,$(1))
$(call Image/Build/Profile/PSR-680W,$(1))
$(call Image/Build/Profile/PWH2004,$(1))
- $(call Image/Build/Profile/PX4885,$(1))
+ $(call Image/Build/Profile/PX-4885,$(1))
$(call Image/Build/Profile/RT5350F-OLINUXINO,$(1))
$(call Image/Build/Profile/RT5350F-OLINUXINO-EVB,$(1))
$(call Image/Build/Profile/RTG32B1,$(1))
Modified: trunk/target/linux/ramips/rt305x/profiles/sevenlinks.mk
===================================================================
--- trunk/target/linux/ramips/rt305x/profiles/sevenlinks.mk 2015-08-17
06:00:49 UTC (rev 46628)
+++ trunk/target/linux/ramips/rt305x/profiles/sevenlinks.mk 2015-08-17
06:01:06 UTC (rev 46629)
@@ -5,16 +5,14 @@
# See /LICENSE for more information.
#
-define Profile/PX4885
+define Profile/PX-4885
NAME:=7Links PX-4885
PACKAGES:=\
kmod-usb-core kmod-usb-dwc2 kmod-usb2 kmod-usb-ohci \
kmod-ledtrig-usbdev kmod-leds-gpio
endef
-define Profile/PX4885/Description
+define Profile/PX-4885/Description
Package set for 7Links PX-4885 wireless router.
endef
-
-$(eval $(call Profile,PX4885))
-
+$(eval $(call Profile,PX-4885))
_______________________________________________
openwrt-commits mailing list
[email protected]
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
