bfk3: enable NVMe support, change U-Boot SPI flash partition

diff --git a/arch/mips/dts/baikal_bfk3.dts b/arch/mips/dts/baikal_bfk3.dts
index 489467be8294835043984e0ffd0a1525ac3b095a..c54825b3c64f4601827f395680d0098f8dc28f88 100644 (file)
--- a/arch/mips/dts/baikal_bfk3.dts
+++ b/arch/mips/dts/baikal_bfk3.dts
@@ -190,23 +190,23 @@
                /* total size 16MB */
                part@0 {
                        label = "UBOOT";
-                       reg = <0x0 0xc0000>;
+                       reg = <0x0 0xbe000>;
                };
-               part@C0000 {
+               part@BE000 {
                        label = "ENVSET";
-                       reg = <0xc0000 0x10000>;
+                       reg = <0xbe000 0x10000>;
                };
-               part@D0000 {
+               part@CE000 {
                        label = "FIRMWARE";
-                       reg = <0xd0000 0x10000>;
+                       reg = <0xce000 0x1000>;
                };
-               part@E0000 {
+               part@CF000 {
                        label = "FDT";
-                       reg = <0xe0000 0x10000>;
+                       reg = <0xcf000 0x6000>;
                };
-               part@F0000 {
+               part@D5000 {
                        label = "MULTIIMAGE";
-                       reg = <0xf0000 0xf10000>;
+                       reg = <0xd5000 0xf2b000>;
                };
        };
 };

diff --git a/configs/baikal_bfk3_defconfig b/configs/baikal_bfk3_defconfig
index f5c40629779a2e63f115cea948a3ab50d9203bc8..3ad9fb7aca76542a444ae60ffe7786f436350d6e 100644 (file)
--- a/configs/baikal_bfk3_defconfig
+++ b/configs/baikal_bfk3_defconfig
@@ -70,6 +70,7 @@ CONFIG_PHY_MICREL=y
 CONFIG_PHY_MSCC=y
 CONFIG_DM_ETH=y
 CONFIG_ETH_DESIGNWARE=y
+CONFIG_NVME_PCI=y
 CONFIG_PCI=y
 CONFIG_DM_PCI=y
 CONFIG_PCIE_DW_GENERIC=y
@@ -103,7 +104,7 @@ CONFIG_CPU=y
 CONFIG_CPU_BAIKAL=y
 # CONFIG_SPI_FLASH_USE_4K_SECTORS is not set
 CONFIG_ENV_ADDR=0x9C0C0000
-CONFIG_ENV_OFFSET=0x000C0000
+CONFIG_ENV_OFFSET=0x000BE000
 CONFIG_ENV_SIZE=0x00010000
 CONFIG_ENV_SECT_SIZE=0x00010000
 CONFIG_MIPS_RELOCATION_TABLE_SIZE=0x9000