revert: fix k2p 32m reboot problems

This commit is contained in:
lean 2021-01-08 22:55:29 +08:00
parent 622af09a79
commit f6381d2094
4 changed files with 57 additions and 98 deletions

View File

@ -1,55 +1,12 @@
/dts-v1/;
#include "mt7621_phicomm_k2p.dtsi"
#include "mt7621_phicomm_k2p_default.dtsi"
/ {
compatible = "phicomm,k2p-32m", "phicomm,k2p", "mediatek,mt7621-soc";
model = "Phicomm K2P 32M";
model = "Phicomm K2P (32M)";
};
&spi0 {
status = "okay";
m25p80@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
broken-flash-reset;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
partition@50000 {
label = "permanent_config";
reg = <0x50000 0x50000>;
read-only;
};
partition@a0000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0xa0000 0x1f60000>;
};
};
};
&firmware {
reg = <0xa0000 0x1f60000>;
};

View File

@ -1,54 +1,7 @@
/dts-v1/;
#include "mt7621_phicomm_k2p.dtsi"
#include "mt7621_phicomm_k2p_default.dtsi"
/ {
compatible = "phicomm,k2p", "mediatek,mt7621-soc";
model = "Phicomm K2P";
};
&spi0 {
status = "okay";
m25p80@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
partition@50000 {
label = "permanent_config";
reg = <0x50000 0x50000>;
read-only;
};
partition@a0000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0xa0000 0xf60000>;
};
};
};
&firmware {
reg = <0xa0000 0xf60000>;
};

View File

@ -5,6 +5,9 @@
#include <dt-bindings/input/input.h>
/ {
compatible = "phicomm,k2p", "mediatek,mt7621-soc";
model = "Phicomm K2P";
aliases {
led-boot = &led_blue;
led-failsafe = &led_blue;
@ -46,6 +49,52 @@
};
};
&spi0 {
status = "okay";
flash@0 {
compatible = "jedec,spi-nor";
reg = <0>;
spi-max-frequency = <10000000>;
partitions {
compatible = "fixed-partitions";
#address-cells = <1>;
#size-cells = <1>;
partition@0 {
label = "u-boot";
reg = <0x0 0x30000>;
read-only;
};
partition@30000 {
label = "u-boot-env";
reg = <0x30000 0x10000>;
read-only;
};
factory: partition@40000 {
label = "factory";
reg = <0x40000 0x10000>;
read-only;
};
partition@50000 {
label = "permanent_config";
reg = <0x50000 0x50000>;
read-only;
};
firmware: partition@a0000 {
compatible = "denx,uimage";
label = "firmware";
reg = <0xa0000 0xf60000>;
};
};
};
};
&pcie {
status = "okay";
};

View File

@ -833,7 +833,7 @@ define Device/phicomm_k2p-32m
$(Device/phicomm_k2p)
IMAGE_SIZE := 32128k
DEVICE_VARIANT := 32M
SUPPORTED_DEVICES += k2p-32m
SUPPORTED_DEVICES += k2p-32M
endef
TARGET_DEVICES += phicomm_k2p-32m