From 0615de597bb84e6ed2e6a5aa4fa916a481026357 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BD=D0=B4=D1=80=D0=B5=D0=B9=20=D0=9B=D1=83=D1=85?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2?= Date: Mon, 22 Jan 2024 14:03:06 +0300 Subject: [PATCH] quilt refresh patches --- ...relative-paths-for-debugging-symbols.patch | 8 +-- debian/patches/arndale/board-spl-rule.diff | 8 +-- ...efault-console-only-to-specify-the-d.patch | 62 +++++++++---------- .../patches/rockchip/rockchip-inno-usb.patch | 20 +++--- 4 files changed, 49 insertions(+), 49 deletions(-) diff --git a/debian/patches/Makefile-Use-relative-paths-for-debugging-symbols.patch b/debian/patches/Makefile-Use-relative-paths-for-debugging-symbols.patch index 023a89829d..42a48cbbbc 100644 --- a/debian/patches/Makefile-Use-relative-paths-for-debugging-symbols.patch +++ b/debian/patches/Makefile-Use-relative-paths-for-debugging-symbols.patch @@ -19,11 +19,11 @@ Signed-off-by: Vagrant Cascadian Makefile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) -Index: u-boot/Makefile +Index: u-boot-salsa-elvees/Makefile =================================================================== ---- u-boot.orig/Makefile -+++ u-boot/Makefile -@@ -758,14 +758,18 @@ KBUILD_CFLAGS += $(call cc-disable-warni +--- u-boot-salsa-elvees.orig/Makefile ++++ u-boot-salsa-elvees/Makefile +@@ -769,14 +769,18 @@ KBUILD_CFLAGS += $(call cc-disable-warni # Enabled with W=2, disabled by default as noisy KBUILD_CFLAGS += $(call cc-disable-warning, maybe-uninitialized) diff --git a/debian/patches/arndale/board-spl-rule.diff b/debian/patches/arndale/board-spl-rule.diff index c3c394cc51..74506c67af 100644 --- a/debian/patches/arndale/board-spl-rule.diff +++ b/debian/patches/arndale/board-spl-rule.diff @@ -1,11 +1,11 @@ Description: Add spl/arndale-spl.bin rule Author: Ian Campbell -Index: u-boot/Makefile +Index: u-boot-salsa-elvees/Makefile =================================================================== ---- u-boot.orig/Makefile -+++ u-boot/Makefile -@@ -2108,6 +2108,9 @@ spl/u-boot-spl: tools prepare $(if $(CON +--- u-boot-salsa-elvees.orig/Makefile ++++ u-boot-salsa-elvees/Makefile +@@ -2056,6 +2056,9 @@ spl/u-boot-spl: tools prepare $(if $(CON spl/sunxi-spl.bin: spl/u-boot-spl @: diff --git a/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch b/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch index aaec16ac6e..4dd7aacfc7 100644 --- a/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch +++ b/debian/patches/exynos/0001-arm-config-fix-default-console-only-to-specify-the-d.patch @@ -25,10 +25,10 @@ Signed-off-by: Benjamin Drung include/configs/trats2.h | 4 ++-- 9 files changed, 17 insertions(+), 17 deletions(-) -Index: u-boot/board/samsung/common/bootscripts/autoboot.cmd +Index: u-boot-salsa-elvees/board/samsung/common/bootscripts/autoboot.cmd =================================================================== ---- u-boot.orig/board/samsung/common/bootscripts/autoboot.cmd -+++ u-boot/board/samsung/common/bootscripts/autoboot.cmd +--- u-boot-salsa-elvees.orig/board/samsung/common/bootscripts/autoboot.cmd ++++ u-boot-salsa-elvees/board/samsung/common/bootscripts/autoboot.cmd @@ -12,7 +12,7 @@ setenv initrdaddr "42000000" setenv loaddtb "load mmc ${mmcbootdev}:${mmcbootpart} ${fdtaddr} ${fdtfile}" setenv loadinitrd "load mmc ${mmcbootdev}:${mmcbootpart} ${initrdaddr} ${initrdname}" @@ -38,10 +38,10 @@ Index: u-boot/board/samsung/common/bootscripts/autoboot.cmd #### Routine: check_dtb - check that target.dtb exists on boot partition setenv check_dtb " -Index: u-boot/board/samsung/common/bootscripts/bootzimg.cmd +Index: u-boot-salsa-elvees/board/samsung/common/bootscripts/bootzimg.cmd =================================================================== ---- u-boot.orig/board/samsung/common/bootscripts/bootzimg.cmd -+++ u-boot/board/samsung/common/bootscripts/bootzimg.cmd +--- u-boot-salsa-elvees.orig/board/samsung/common/bootscripts/bootzimg.cmd ++++ u-boot-salsa-elvees/board/samsung/common/bootscripts/bootzimg.cmd @@ -1,5 +1,5 @@ setenv kernelname zImage; -setenv boot_kernel "setenv bootargs \"${console} root=/dev/mmcblk${mmcrootdev}p${mmcrootpart} rootfstype=${rootfstype} rootwait ${opts}\"; @@ -56,10 +56,10 @@ Index: u-boot/board/samsung/common/bootscripts/bootzimg.cmd -run boot_kernel; \ No newline at end of file +run boot_kernel; -Index: u-boot/board/samsung/common/dfu_sample_env.txt +Index: u-boot-salsa-elvees/board/samsung/common/dfu_sample_env.txt =================================================================== ---- u-boot.orig/board/samsung/common/dfu_sample_env.txt -+++ u-boot/board/samsung/common/dfu_sample_env.txt +--- u-boot-salsa-elvees.orig/board/samsung/common/dfu_sample_env.txt ++++ u-boot-salsa-elvees/board/samsung/common/dfu_sample_env.txt @@ -1,9 +1,9 @@ -mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait ${console}; run loaduimage; bootm 0x40007FC0 +mmcboot=setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} ${rootfstype} rootwait console=${console}; run loaduimage; bootm 0x40007FC0 @@ -72,10 +72,10 @@ Index: u-boot/board/samsung/common/dfu_sample_env.txt +console=ttySAC2,115200n8 bootcmd=run mmcboot dfu_alt_info=u-boot mmc 80 800;params.bin mmc 0x38 0x8;uImage ext4 0 2 -Index: u-boot/include/configs/odroid.h +Index: u-boot-salsa-elvees/include/configs/odroid.h =================================================================== ---- u-boot.orig/include/configs/odroid.h -+++ u-boot/include/configs/odroid.h +--- u-boot-salsa-elvees.orig/include/configs/odroid.h ++++ u-boot-salsa-elvees/include/configs/odroid.h @@ -128,7 +128,7 @@ "elif test -e mmc ${mmcbootdev} uImage; then; " \ "run boot_uimg;" \ @@ -85,11 +85,11 @@ Index: u-boot/include/configs/odroid.h "mmcbootdev=0\0" \ "mmcbootpart=1\0" \ "mmcrootdev=0\0" \ -Index: u-boot/include/configs/odroid_xu3.h +Index: u-boot-salsa-elvees/include/configs/odroid_xu3.h =================================================================== ---- u-boot.orig/include/configs/odroid_xu3.h -+++ u-boot/include/configs/odroid_xu3.h -@@ -76,7 +76,7 @@ +--- u-boot-salsa-elvees.orig/include/configs/odroid_xu3.h ++++ u-boot-salsa-elvees/include/configs/odroid_xu3.h +@@ -67,7 +67,7 @@ MEM_LAYOUT_ENV_SETTINGS \ BOOTENV \ "rootfstype=ext4\0" \ @@ -98,11 +98,11 @@ Index: u-boot/include/configs/odroid_xu3.h "fdtfile=exynos5422-odroidxu3.dtb\0" \ "board=odroid\0" \ "board_name=odroidxu3\0" \ -Index: u-boot/include/configs/s5p_goni.h +Index: u-boot-salsa-elvees/include/configs/s5p_goni.h =================================================================== ---- u-boot.orig/include/configs/s5p_goni.h -+++ u-boot/include/configs/s5p_goni.h -@@ -100,7 +100,7 @@ +--- u-boot-salsa-elvees.orig/include/configs/s5p_goni.h ++++ u-boot-salsa-elvees/include/configs/s5p_goni.h +@@ -91,7 +91,7 @@ "bootchart=set opts init=/sbin/bootchartd; run bootcmd\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ @@ -111,10 +111,10 @@ Index: u-boot/include/configs/s5p_goni.h "meminfo=mem=80M mem=256M@0x40000000 mem=128M@0x50000000\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x30007FC0 uImage\0" \ "mmcdev=0\0" \ -Index: u-boot/include/configs/s5pc210_universal.h +Index: u-boot-salsa-elvees/include/configs/s5pc210_universal.h =================================================================== ---- u-boot.orig/include/configs/s5pc210_universal.h -+++ u-boot/include/configs/s5pc210_universal.h +--- u-boot-salsa-elvees.orig/include/configs/s5pc210_universal.h ++++ u-boot-salsa-elvees/include/configs/s5pc210_universal.h @@ -74,7 +74,7 @@ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "verify=n\0" \ @@ -124,11 +124,11 @@ Index: u-boot/include/configs/s5pc210_universal.h "mbrparts=" MBRPARTS_DEFAULT \ "meminfo=crashkernel=32M@0x50000000\0" \ "nfsroot=/nfsroot/arm\0" \ -Index: u-boot/include/configs/trats.h +Index: u-boot-salsa-elvees/include/configs/trats.h =================================================================== ---- u-boot.orig/include/configs/trats.h -+++ u-boot/include/configs/trats.h -@@ -87,7 +87,7 @@ +--- u-boot-salsa-elvees.orig/include/configs/trats.h ++++ u-boot-salsa-elvees/include/configs/trats.h +@@ -86,7 +86,7 @@ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ @@ -137,11 +137,11 @@ Index: u-boot/include/configs/trats.h "meminfo=crashkernel=32M@0x50000000\0" \ "nfsroot=/nfsroot/arm\0" \ "bootblock=10\0" \ -Index: u-boot/include/configs/trats2.h +Index: u-boot-salsa-elvees/include/configs/trats2.h =================================================================== ---- u-boot.orig/include/configs/trats2.h -+++ u-boot/include/configs/trats2.h -@@ -76,7 +76,7 @@ +--- u-boot-salsa-elvees.orig/include/configs/trats2.h ++++ u-boot-salsa-elvees/include/configs/trats2.h +@@ -75,7 +75,7 @@ "boottrace=setenv opts initcall_debug; run bootcmd\0" \ "verify=n\0" \ "rootfstype=ext4\0" \ diff --git a/debian/patches/rockchip/rockchip-inno-usb.patch b/debian/patches/rockchip/rockchip-inno-usb.patch index 35bbc91582..e132abddea 100644 --- a/debian/patches/rockchip/rockchip-inno-usb.patch +++ b/debian/patches/rockchip/rockchip-inno-usb.patch @@ -36,11 +36,11 @@ Tested-by: Peter Robinson drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 21 +++++++++++++++++++ 1 file changed, 21 insertions(+) -diff --git a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -index 62b8ba3a4a..be9cc99d90 100644 ---- a/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -+++ b/drivers/phy/rockchip/phy-rockchip-inno-usb2.c -@@ -62,6 +62,8 @@ struct rockchip_usb2phy { +Index: u-boot-salsa-elvees/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +=================================================================== +--- u-boot-salsa-elvees.orig/drivers/phy/rockchip/phy-rockchip-inno-usb2.c ++++ u-boot-salsa-elvees/drivers/phy/rockchip/phy-rockchip-inno-usb2.c +@@ -64,6 +64,8 @@ struct rockchip_usb2phy { void *reg_base; struct clk phyclk; const struct rockchip_usb2phy_cfg *phy_cfg; @@ -49,7 +49,7 @@ index 62b8ba3a4a..be9cc99d90 100644 }; static inline int property_enable(void *reg_base, -@@ -92,6 +94,10 @@ static int rockchip_usb2phy_power_on(str +@@ -106,6 +108,10 @@ static int rockchip_usb2phy_power_on(str struct rockchip_usb2phy *priv = dev_get_priv(parent); const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); @@ -60,7 +60,7 @@ index 62b8ba3a4a..be9cc99d90 100644 property_enable(priv->reg_base, &port_cfg->phy_sus, false); /* waiting for the utmi_clk to become stable */ -@@ -106,6 +112,10 @@ static int rockchip_usb2phy_power_off(st +@@ -120,6 +126,10 @@ static int rockchip_usb2phy_power_off(st struct rockchip_usb2phy *priv = dev_get_priv(parent); const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); @@ -71,7 +71,7 @@ index 62b8ba3a4a..be9cc99d90 100644 property_enable(priv->reg_base, &port_cfg->phy_sus, true); return 0; -@@ -118,6 +128,10 @@ static int rockchip_usb2phy_init(struct +@@ -132,6 +142,10 @@ static int rockchip_usb2phy_init(struct const struct rockchip_usb2phy_port_cfg *port_cfg = us2phy_get_port(phy); int ret; @@ -82,7 +82,7 @@ index 62b8ba3a4a..be9cc99d90 100644 ret = clk_enable(&priv->phyclk); if (ret && ret != -ENOSYS) { dev_err(phy->dev, "failed to enable phyclk (ret=%d)\n", ret); -@@ -140,6 +154,10 @@ static int rockchip_usb2phy_exit(struct +@@ -154,6 +168,10 @@ static int rockchip_usb2phy_exit(struct struct udevice *parent = dev_get_parent(phy->dev); struct rockchip_usb2phy *priv = dev_get_priv(parent); @@ -93,7 +93,7 @@ index 62b8ba3a4a..be9cc99d90 100644 clk_disable(&priv->phyclk); return 0; -@@ -212,6 +230,9 @@ static int rockchip_usb2phy_probe(struct +@@ -294,6 +312,9 @@ static int rockchip_usb2phy_probe(struct return ret; } -- 2.30.2