projects
/
oweals
/
openwrt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
brcm63xx: drop linux,part-probe usage where possible
[oweals/openwrt.git]
/
target
/
linux
/
brcm63xx
/
dts
/
ar1004g.dts
diff --git
a/target/linux/brcm63xx/dts/ar1004g.dts
b/target/linux/brcm63xx/dts/ar1004g.dts
index eb6d9a2b20b418871abd39a8217ce091ce1ba80c..c7f8c506879d6327713486ee482170bbb9e02cc0 100644
(file)
--- a/
target/linux/brcm63xx/dts/ar1004g.dts
+++ b/
target/linux/brcm63xx/dts/ar1004g.dts
@@
-9,7
+9,8
@@
compatible = "asmax,ar1004g", "brcm,bcm6348";
chosen {
compatible = "asmax,ar1004g", "brcm,bcm6348";
chosen {
- bootargs = "root=/dev/mtdblock2 rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ bootargs = "rootfstype=squashfs,jffs2 noinitrd console=ttyS0,115200";
+ stdout-path = "serial0:115200n8";
};
gpio-keys-polled {
};
gpio-keys-polled {
@@
-48,22
+49,27
@@
&pflash {
status = "ok";
&pflash {
status = "ok";
- linux,part-probe = "bcm63xxpart";
+ partitions {
+ compatible = "fixed-partitions";
+ #address-cells = <1>;
+ #size-cells = <1>;
- cfe@0 {
- label = "CFE";
- reg = <0x000000 0x010000>;
- read-only;
- };
+
cfe@0 {
+
label = "CFE";
+
reg = <0x000000 0x010000>;
+
read-only;
+
};
- linux@10000 {
- label = "linux";
- reg = <0x010000 0x3e0000>;
- };
+ linux@10000 {
+ label = "linux";
+ reg = <0x010000 0x3e0000>;
+ compatible = "brcm,bcm963xx-imagetag";
+ };
- nvram@3f0000 {
- label = "nvram";
- reg = <0x3f0000 0x010000>;
+ nvram@3f0000 {
+ label = "nvram";
+ reg = <0x3f0000 0x010000>;
+ };
};
};
};
};
@@
-71,3
+77,7
@@
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
};
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_ext_mii &pinctrl_pci>;
};
+
+&uart0 {
+ status = "ok";
+};