projects/WeTek_Play/patches/linux: Remove all NAND partitions in device tree

Having pre-defined NAND partition layout in device tree causes NAND driver to
update partition layout in NAND environment. If we are booting OE from SD-card
but have Android installed in NAND, this will overwrite Android NAND partition layout
with OE partition layout, and bootloader will no be able to boot Android anymore.

This update removes NAND partition layout from OE device tree. This causes NAND
driver to always use partition layout from NAND environment never overwriting it.

For OE NAND installations partition layout will be written to NAND environment
by recovery during installation, and then just reused by OpenELEC.
This commit is contained in:
Alex Deryskyba 2015-05-04 13:36:26 +02:00 committed by Stefan Saraev
parent 7d7bf1d8f4
commit b5ca84b4dd

View File

@ -1,46 +1,51 @@
diff --git a/arch/arm/boot/dts/amlogic/wetek_play.dtd b/arch/arm/boot/dts/amlogic/wetek_play.dtd
index ce4f2e8..10433be 100755
index efc7f22..9994d09 100755
--- a/arch/arm/boot/dts/amlogic/wetek_play.dtd
+++ b/arch/arm/boot/dts/amlogic/wetek_play.dtd
@@ -790,7 +790,7 @@ void root_func(){
@@ -794,45 +794,9 @@ void root_func(){
t_rea = <20>;
t_rhoh = <15>;
chip_num = <2>;
- part_num = <9>;
+ part_num = <6>;
partition = <&nand_partitions>;
- partition = <&nand_partitions>;
+ part_num = <0>;
rb_detect = <1>;
};
@@ -800,28 +800,16 @@ void root_func(){
offset=<0x0 0x4800000>;
size=<0x0 0x800000>;
};
-
- nand_partitions:nand_partition{
- logo{
- offset=<0x0 0x4800000>;
- size=<0x0 0x800000>;
- };
- aml_logo{
- offset=<0x0 0x5800000>;
- size=<0x0 0x800000>;
- };
recovery{
- recovery{
- offset=<0x0 0x6800000>;
- size=<0x0 0x800000>;
- };
- boot{
- offset=<0x0 0x8800000>;
+ offset=<0x0 0x5800000>;
size=<0x0 0x800000>;
};
system{
- size=<0x0 0x800000>;
- };
- system{
- offset=<0x0 0xa800000>;
- size=<0x0 0x40000000>;
+ offset=<0x0 0x7000000>;
+ size=<0x0 0x10000000>;
};
cache{
- };
- cache{
- offset=<0x0 0x4a800000>;
- size=<0x0 0x20000000>;
- };
- backup{
- offset=<0x0 0x6a800000>;
+ offset=<0x0 0x17000000>;
size=<0x0 0x10000000>;
};
userdata{
- size=<0x0 0x10000000>;
- };
- userdata{
- offset=<0xffffffff 0xffffffff>;
- size=<0x0 0x0>;
- };
- };
};
/// ***************************************************************************************