aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-mediatek
diff options
context:
space:
mode:
authorDaniel Golle <daniel@makrotopia.org>2021-03-18 04:18:05 +0000
committerDaniel Golle <daniel@makrotopia.org>2021-03-18 04:19:48 +0000
commit81edc842f6277bc9c12a86f295caab70ad519d27 (patch)
treee29bddb0698d6d3c546134c7ebb756e1614811d6 /package/boot/uboot-mediatek
parent42d943f40a67fdbefe0bc9d445145969d6e5c8a0 (diff)
downloadupstream-81edc842f6277bc9c12a86f295caab70ad519d27.tar.gz
upstream-81edc842f6277bc9c12a86f295caab70ad519d27.tar.bz2
upstream-81edc842f6277bc9c12a86f295caab70ad519d27.zip
uboot-mediatek: don't rely in 'lzma' cmdline
Use 'xz --format=lzma' instead. Fixes build for mt7629. Signed-off-by: Daniel Golle <daniel@makrotopia.org>
Diffstat (limited to 'package/boot/uboot-mediatek')
-rw-r--r--package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch5
-rw-r--r--package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch11
2 files changed, 11 insertions, 5 deletions
diff --git a/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch b/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch
index 5e2b4aa39b..448bf7b865 100644
--- a/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch
+++ b/package/boot/uboot-mediatek/patches/010-ahci-mediatek-fix-missing-dev_err-definition.patch
@@ -7,8 +7,6 @@ Subject: [PATCH] ahci: mediatek: fix missing dev_err definition
drivers/ata/mtk_ahci.c | 1 +
1 file changed, 1 insertion(+)
-diff --git a/drivers/ata/mtk_ahci.c b/drivers/ata/mtk_ahci.c
-index 554175bc00..2c5227df30 100644
--- a/drivers/ata/mtk_ahci.c
+++ b/drivers/ata/mtk_ahci.c
@@ -21,6 +21,7 @@
@@ -19,6 +17,3 @@ index 554175bc00..2c5227df30 100644
#define SYS_CFG 0x14
#define SYS_CFG_SATA_MSK GENMASK(31, 30)
---
-2.30.2
-
diff --git a/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch b/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch
new file mode 100644
index 0000000000..d33b0b93a0
--- /dev/null
+++ b/package/boot/uboot-mediatek/patches/120-use-xz-instead-of-lzma.patch
@@ -0,0 +1,11 @@
+--- a/Makefile
++++ b/Makefile
+@@ -1008,7 +1008,7 @@ quiet_cmd_pad_cat = CAT $@
+ cmd_pad_cat = $(cmd_objcopy) && $(append) || { rm -f $@; false; }
+
+ quiet_cmd_lzma = LZMA $@
+-cmd_lzma = lzma -c -z -k -9 $< > $@
++cmd_lzma = xz --format=lzma -c -z -k -9 $< > $@
+
+ cfg: u-boot.cfg
+