[openwrt/openwrt] kernel: move uImage.FIT partition parser to mediatek target

LEDE Commits lede-commits at lists.infradead.org
Thu Feb 15 11:34:48 PST 2024


dangole pushed a commit to openwrt/openwrt.git, branch main:
https://git.openwrt.org/548c383bdf505c9f71378c51885603911f8008c7

commit 548c383bdf505c9f71378c51885603911f8008c7
Author: Daniel Golle <daniel at makrotopia.org>
AuthorDate: Mon Dec 4 23:25:12 2023 +0000

    kernel: move uImage.FIT partition parser to mediatek target
    
    The partition parser approach has been rejected upstream, it will be
    replaced by a small block driver which is the solution suggestion by
    upstream maintainers.
    As the partition parser has only been used by the mediatek target, as
    a first step, move it there.
    
    Signed-off-by: Daniel Golle <daniel at makrotopia.org>
---
 target/linux/generic/config-5.15                                         | 1 -
 target/linux/generic/config-6.1                                          | 1 -
 target/linux/{generic => mediatek}/files/block/partitions/fit.c          | 0
 target/linux/mediatek/mt7629/config-5.15                                 | 1 +
 target/linux/mediatek/mt7629/config-6.1                                  | 1 +
 .../patches-5.15/041-block-fit-partition-parser.patch}                   | 0
 .../patches-6.1/041-block-fit-partition-parser.patch}                    | 0
 7 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/target/linux/generic/config-5.15 b/target/linux/generic/config-5.15
index bc2509ff47..5f82f0937d 100644
--- a/target/linux/generic/config-5.15
+++ b/target/linux/generic/config-5.15
@@ -2071,7 +2071,6 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/target/linux/generic/config-6.1 b/target/linux/generic/config-6.1
index 7da5f21532..30bda17d17 100644
--- a/target/linux/generic/config-6.1
+++ b/target/linux/generic/config-6.1
@@ -2167,7 +2167,6 @@ CONFIG_FILE_LOCKING=y
 # CONFIG_FIRMWARE_EDID is not set
 # CONFIG_FIRMWARE_IN_KERNEL is not set
 # CONFIG_FIRMWARE_MEMMAP is not set
-# CONFIG_FIT_PARTITION is not set
 # CONFIG_FIXED_PHY is not set
 CONFIG_FLATMEM=y
 CONFIG_FLATMEM_MANUAL=y
diff --git a/target/linux/generic/files/block/partitions/fit.c b/target/linux/mediatek/files/block/partitions/fit.c
similarity index 100%
rename from target/linux/generic/files/block/partitions/fit.c
rename to target/linux/mediatek/files/block/partitions/fit.c
diff --git a/target/linux/mediatek/mt7629/config-5.15 b/target/linux/mediatek/mt7629/config-5.15
index 8cddb04d66..c42ada6d23 100644
--- a/target/linux/mediatek/mt7629/config-5.15
+++ b/target/linux/mediatek/mt7629/config-5.15
@@ -95,6 +95,7 @@ CONFIG_DTC=y
 CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
+# CONFIG_FIT_PARTITION is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FWNODE_MDIO=y
diff --git a/target/linux/mediatek/mt7629/config-6.1 b/target/linux/mediatek/mt7629/config-6.1
index ad79b5ba9e..d8dc50a67a 100644
--- a/target/linux/mediatek/mt7629/config-6.1
+++ b/target/linux/mediatek/mt7629/config-6.1
@@ -107,6 +107,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y
 CONFIG_EDAC_SUPPORT=y
 CONFIG_EINT_MTK=y
 CONFIG_EXCLUSIVE_SYSTEM_RAM=y
+# CONFIG_FIT_PARTITION is not set
 CONFIG_FIXED_PHY=y
 CONFIG_FIX_EARLYCON_MEM=y
 CONFIG_FRAME_WARN=1024
diff --git a/target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch b/target/linux/mediatek/patches-5.15/041-block-fit-partition-parser.patch
similarity index 100%
rename from target/linux/generic/hack-5.15/410-block-fit-partition-parser.patch
rename to target/linux/mediatek/patches-5.15/041-block-fit-partition-parser.patch
diff --git a/target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch b/target/linux/mediatek/patches-6.1/041-block-fit-partition-parser.patch
similarity index 100%
rename from target/linux/generic/hack-6.1/410-block-fit-partition-parser.patch
rename to target/linux/mediatek/patches-6.1/041-block-fit-partition-parser.patch




More information about the lede-commits mailing list