diff --git a/patch/u-boot/v2024.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch b/patch/u-boot/v2024.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch index e17ae85136..69c354d6be 100644 --- a/patch/u-boot/v2024.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch +++ b/patch/u-boot/v2024.07/board_tinkerboard/0001-tinkerboard-defconfig-fix.patch @@ -1,14 +1,14 @@ -From 3a5581574d3574ac24f26becfe96100353637b7f Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 4 Jul 2024 21:28:24 +0200 -Subject: [PATCH] accomodations for asus tinkerboard/s +Subject: accomodations for asus tinkerboard/s --- configs/tinker-s-rk3288_defconfig | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/configs/tinker-s-rk3288_defconfig b/configs/tinker-s-rk3288_defconfig -index 2a2e1226eb..79a89542a3 100644 +index 111111111111..222222222222 100644 --- a/configs/tinker-s-rk3288_defconfig +++ b/configs/tinker-s-rk3288_defconfig @@ -11,6 +11,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y @@ -38,5 +38,5 @@ index 2a2e1226eb..79a89542a3 100644 CONFIG_VIDEO=y # CONFIG_VIDEO_BPP8 is not set -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch b/patch/u-boot/v2024.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch index f17acdcc12..bfafdec05a 100644 --- a/patch/u-boot/v2024.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch +++ b/patch/u-boot/v2024.07/board_tinkerboard/0003-UMS-mode-on-otg-port.patch @@ -1,14 +1,14 @@ -From a3e842c436f1749b9ca774f159ffba52cd96dbfd Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Thu, 4 Jul 2024 21:49:20 +0200 -Subject: [PATCH] UMS mode for Asus Tinkerboard +Subject: UMS mode for Asus Tinkerboard --- - arch/arm/include/asm/arch-rockchip/gpio.h | 22 ++++ - arch/arm/mach-rockchip/board.c | 114 +++++++++++++++++++++ - arch/arm/mach-rockchip/spl.c | 22 ++++ + arch/arm/include/asm/arch-rockchip/gpio.h | 22 ++ + arch/arm/mach-rockchip/board.c | 114 ++++++++++ + arch/arm/mach-rockchip/spl.c | 22 ++ cmd/usb_mass_storage.c | 9 +- - common/autoboot.c | 22 ++++ + common/autoboot.c | 22 ++ common/board_r.c | 1 + drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c | 1 + drivers/usb/gadget/f_mass_storage.c | 10 +- @@ -17,7 +17,7 @@ Subject: [PATCH] UMS mode for Asus Tinkerboard 10 files changed, 202 insertions(+), 3 deletions(-) diff --git a/arch/arm/include/asm/arch-rockchip/gpio.h b/arch/arm/include/asm/arch-rockchip/gpio.h -index 1aaec5faec..135688d3b8 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/include/asm/arch-rockchip/gpio.h +++ b/arch/arm/include/asm/arch-rockchip/gpio.h @@ -24,6 +24,28 @@ struct rockchip_gpio_regs { @@ -50,7 +50,7 @@ index 1aaec5faec..135688d3b8 100644 GPIO_PULL_NORMAL = 0, GPIO_PULL_UP, diff --git a/arch/arm/mach-rockchip/board.c b/arch/arm/mach-rockchip/board.c -index cd226844b6..6f13afd14d 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/board.c +++ b/arch/arm/mach-rockchip/board.c @@ -19,6 +19,7 @@ @@ -196,7 +196,7 @@ index cd226844b6..6f13afd14d 100644 { int ret; diff --git a/arch/arm/mach-rockchip/spl.c b/arch/arm/mach-rockchip/spl.c -index 3ce7e792b5..323b297aca 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/spl.c +++ b/arch/arm/mach-rockchip/spl.c @@ -116,10 +116,32 @@ __weak int arch_cpu_init(void) @@ -233,7 +233,7 @@ index 3ce7e792b5..323b297aca 100644 ret = spl_early_init(); diff --git a/cmd/usb_mass_storage.c b/cmd/usb_mass_storage.c -index 751701fe73..c4488b3c16 100644 +index 111111111111..222222222222 100644 --- a/cmd/usb_mass_storage.c +++ b/cmd/usb_mass_storage.c @@ -108,7 +108,7 @@ static int ums_init(const char *devtype, const char *devnums_part_str) @@ -267,7 +267,7 @@ index 751701fe73..c4488b3c16 100644 /* Check I/O error */ if (rc == -EIO) diff --git a/common/autoboot.c b/common/autoboot.c -index 6f0aeae6bf..03ba8b2cb6 100644 +index 111111111111..222222222222 100644 --- a/common/autoboot.c +++ b/common/autoboot.c @@ -40,6 +40,9 @@ DECLARE_GLOBAL_DATA_PTR; @@ -314,7 +314,7 @@ index 6f0aeae6bf..03ba8b2cb6 100644 (stored_bootdelay != -1 && !abortboot(stored_bootdelay)))) { bool lock; diff --git a/common/board_r.c b/common/board_r.c -index da0b80f24f..3d8e338544 100644 +index 111111111111..222222222222 100644 --- a/common/board_r.c +++ b/common/board_r.c @@ -667,6 +667,7 @@ static init_fnc_t init_sequence_r[] = { @@ -326,7 +326,7 @@ index da0b80f24f..3d8e338544 100644 xen_init, #endif diff --git a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c -index 1c34b75351..2f017f835a 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c +++ b/drivers/usb/gadget/dwc2_udc_otg_xfer_dma.c @@ -1393,6 +1393,7 @@ static void dwc2_ep0_setup(struct dwc2_udc *dev) @@ -338,7 +338,7 @@ index 1c34b75351..2f017f835a 100644 case USB_REQ_SET_INTERFACE: diff --git a/drivers/usb/gadget/f_mass_storage.c b/drivers/usb/gadget/f_mass_storage.c -index ef90c7ec7f..de054eba6a 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/gadget/f_mass_storage.c +++ b/drivers/usb/gadget/f_mass_storage.c @@ -657,7 +657,7 @@ static void busy_indicator(void) @@ -373,7 +373,7 @@ index ef90c7ec7f..de054eba6a 100644 } common->thread_wakeup_needed = 0; diff --git a/include/init.h b/include/init.h -index 630d86729c..eeb9526efe 100644 +index 111111111111..222222222222 100644 --- a/include/init.h +++ b/include/init.h @@ -337,6 +337,7 @@ int board_early_init_f(void); @@ -385,7 +385,7 @@ index 630d86729c..eeb9526efe 100644 int board_early_init_r(void); diff --git a/include/linux/usb/gadget.h b/include/linux/usb/gadget.h -index 36572be89e..eaf1078ba7 100644 +index 111111111111..222222222222 100644 --- a/include/linux/usb/gadget.h +++ b/include/linux/usb/gadget.h @@ -25,6 +25,9 @@ @@ -399,5 +399,5 @@ index 36572be89e..eaf1078ba7 100644 * struct usb_request - describes one i/o request * @buf: Buffer used for data. Always provide this; some controllers -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch index 5d9600399b..016e09cbbe 100644 --- a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch +++ b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-defconfig.patch @@ -1,16 +1,15 @@ -From e198e6879beace64347179b2a155f1e76ed06a50 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 6 Jul 2024 20:21:59 +0200 -Subject: [PATCH 2/3] add xt-q8l-v10 defconfig +Subject: add xt-q8l-v10 defconfig --- - configs/xt-q8l-v10-rk3288_defconfig | 121 ++++++++++++++++++++++++++++ + configs/xt-q8l-v10-rk3288_defconfig | 121 ++++++++++ 1 file changed, 121 insertions(+) - create mode 100644 configs/xt-q8l-v10-rk3288_defconfig diff --git a/configs/xt-q8l-v10-rk3288_defconfig b/configs/xt-q8l-v10-rk3288_defconfig new file mode 100644 -index 0000000000..dba1f143ef +index 000000000000..111111111111 --- /dev/null +++ b/configs/xt-q8l-v10-rk3288_defconfig @@ -0,0 +1,121 @@ @@ -136,5 +135,5 @@ index 0000000000..dba1f143ef +# CONFIG_SPL_SHA256 is not set +CONFIG_ERRNO_STR=y -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch index 17eca09b25..ed9560b0cb 100644 --- a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch +++ b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree-makefile.patch @@ -1,25 +1,20 @@ -From ff847d695a81eb724b4a288a60b1ec5a85d8b1d5 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 6 Jul 2024 20:22:22 +0200 -Subject: [PATCH 3/3] add xt-q8l-v10 ancillary makefile and sources +Subject: add xt-q8l-v10 ancillary makefile and sources --- - arch/arm/dts/Makefile | 1 + - arch/arm/mach-rockchip/rk3288/Kconfig | 12 +++++++++++ - board/rockchip/xt-q8l-v10_rk3288/Kconfig | 15 +++++++++++++ - board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS | 6 ++++++ - board/rockchip/xt-q8l-v10_rk3288/Makefile | 7 +++++++ - .../xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c | 21 +++++++++++++++++++ - include/configs/xt-q8l-v10_rk3288.h | 21 +++++++++++++++++++ + arch/arm/dts/Makefile | 1 + + arch/arm/mach-rockchip/rk3288/Kconfig | 12 ++++++ + board/rockchip/xt-q8l-v10_rk3288/Kconfig | 15 +++++++ + board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS | 6 +++ + board/rockchip/xt-q8l-v10_rk3288/Makefile | 7 ++++ + board/rockchip/xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c | 21 ++++++++++ + include/configs/xt-q8l-v10_rk3288.h | 21 ++++++++++ 7 files changed, 83 insertions(+) - create mode 100644 board/rockchip/xt-q8l-v10_rk3288/Kconfig - create mode 100644 board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS - create mode 100644 board/rockchip/xt-q8l-v10_rk3288/Makefile - create mode 100644 board/rockchip/xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c - create mode 100644 include/configs/xt-q8l-v10_rk3288.h diff --git a/arch/arm/dts/Makefile b/arch/arm/dts/Makefile -index 8fb6a8a1f1..9a799aad71 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/dts/Makefile +++ b/arch/arm/dts/Makefile @@ -84,6 +84,7 @@ dtb-$(CONFIG_ROCKCHIP_RK3288) += \ @@ -31,7 +26,7 @@ index 8fb6a8a1f1..9a799aad71 100644 rk3288-veyron-mickey.dtb \ rk3288-veyron-minnie.dtb \ diff --git a/arch/arm/mach-rockchip/rk3288/Kconfig b/arch/arm/mach-rockchip/rk3288/Kconfig -index 69a5614b44..2ef13e2e8e 100644 +index 111111111111..222222222222 100644 --- a/arch/arm/mach-rockchip/rk3288/Kconfig +++ b/arch/arm/mach-rockchip/rk3288/Kconfig @@ -139,6 +139,16 @@ config TARGET_TINKER_RK3288 @@ -60,7 +55,7 @@ index 69a5614b44..2ef13e2e8e 100644 endif diff --git a/board/rockchip/xt-q8l-v10_rk3288/Kconfig b/board/rockchip/xt-q8l-v10_rk3288/Kconfig new file mode 100644 -index 0000000000..176abf00b8 +index 000000000000..111111111111 --- /dev/null +++ b/board/rockchip/xt-q8l-v10_rk3288/Kconfig @@ -0,0 +1,15 @@ @@ -81,7 +76,7 @@ index 0000000000..176abf00b8 +endif diff --git a/board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS b/board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS new file mode 100644 -index 0000000000..9a3ad97c14 +index 000000000000..111111111111 --- /dev/null +++ b/board/rockchip/xt-q8l-v10_rk3288/MAINTAINERS @@ -0,0 +1,6 @@ @@ -93,7 +88,7 @@ index 0000000000..9a3ad97c14 +F: configs/xt-q8l-v10-rk3288_defconfig diff --git a/board/rockchip/xt-q8l-v10_rk3288/Makefile b/board/rockchip/xt-q8l-v10_rk3288/Makefile new file mode 100644 -index 0000000000..852c9100a7 +index 000000000000..111111111111 --- /dev/null +++ b/board/rockchip/xt-q8l-v10_rk3288/Makefile @@ -0,0 +1,7 @@ @@ -106,7 +101,7 @@ index 0000000000..852c9100a7 +obj-y += xt-q8l-v10-rk3288.o diff --git a/board/rockchip/xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c b/board/rockchip/xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c new file mode 100644 -index 0000000000..f0f618a5ab +index 000000000000..111111111111 --- /dev/null +++ b/board/rockchip/xt-q8l-v10_rk3288/xt-q8l-v10-rk3288.c @@ -0,0 +1,21 @@ @@ -133,7 +128,7 @@ index 0000000000..f0f618a5ab + diff --git a/include/configs/xt-q8l-v10_rk3288.h b/include/configs/xt-q8l-v10_rk3288.h new file mode 100644 -index 0000000000..a3275262c3 +index 000000000000..111111111111 --- /dev/null +++ b/include/configs/xt-q8l-v10_rk3288.h @@ -0,0 +1,21 @@ @@ -159,5 +154,5 @@ index 0000000000..a3275262c3 + +#endif -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch index e0b25eacd8..5965fc1381 100644 --- a/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch +++ b/patch/u-boot/v2024.07/board_xt-q8l-v10/xt-q8l-v10-device-tree.patch @@ -1,18 +1,16 @@ -From c039d9c32bccfe9c079972bae9feaca34ba95233 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sat, 6 Jul 2024 20:21:32 +0200 -Subject: [PATCH 1/3] add xt-q8lv-10 device tree +Subject: add xt-q8lv-10 device tree --- - arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi | 70 ++ - arch/arm/dts/rk3288-xt-q8l-v10.dts | 703 +++++++++++++++++++++ + arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi | 70 + + arch/arm/dts/rk3288-xt-q8l-v10.dts | 703 ++++++++++ 2 files changed, 773 insertions(+) - create mode 100644 arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi - create mode 100755 arch/arm/dts/rk3288-xt-q8l-v10.dts diff --git a/arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi b/arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi new file mode 100644 -index 0000000000..120f60998b +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm/dts/rk3288-xt-q8l-v10-u-boot.dtsi @@ -0,0 +1,70 @@ @@ -88,7 +86,7 @@ index 0000000000..120f60998b +}; diff --git a/arch/arm/dts/rk3288-xt-q8l-v10.dts b/arch/arm/dts/rk3288-xt-q8l-v10.dts new file mode 100755 -index 0000000000..f2bd8fd039 +index 000000000000..111111111111 --- /dev/null +++ b/arch/arm/dts/rk3288-xt-q8l-v10.dts @@ -0,0 +1,703 @@ @@ -796,5 +794,5 @@ index 0000000000..f2bd8fd039 +}; + -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/general-dw-hdmi-disable.patch b/patch/u-boot/v2024.07/general-dw-hdmi-disable.patch index 6427e2a234..acf5cadc94 100644 --- a/patch/u-boot/v2024.07/general-dw-hdmi-disable.patch +++ b/patch/u-boot/v2024.07/general-dw-hdmi-disable.patch @@ -1,15 +1,15 @@ -From 3ba46ffdad0cc96c5ffb0e5b3474800db954456e Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 30 Jun 2024 17:36:02 +0200 -Subject: [PATCH] add dw_hdmi_disable() function to DW-HDMI driver +Subject: add dw_hdmi_disable() function to DW-HDMI driver --- - drivers/video/dw_hdmi.c | 17 +++++++++++++++++ + drivers/video/dw_hdmi.c | 17 ++++++++++ include/dw_hdmi.h | 1 + 2 files changed, 18 insertions(+) diff --git a/drivers/video/dw_hdmi.c b/drivers/video/dw_hdmi.c -index c217af9787..66dde8cc1b 100644 +index 111111111111..222222222222 100644 --- a/drivers/video/dw_hdmi.c +++ b/drivers/video/dw_hdmi.c @@ -1025,6 +1025,23 @@ int dw_hdmi_enable(struct dw_hdmi *hdmi, const struct display_timing *edid) @@ -37,7 +37,7 @@ index c217af9787..66dde8cc1b 100644 .phy_set = dw_hdmi_phy_cfg, }; diff --git a/include/dw_hdmi.h b/include/dw_hdmi.h -index f4d66edace..5fe97e5a07 100644 +index 111111111111..222222222222 100644 --- a/include/dw_hdmi.h +++ b/include/dw_hdmi.h @@ -562,6 +562,7 @@ int dw_hdmi_phy_wait_for_hpd(struct dw_hdmi *hdmi); @@ -49,5 +49,5 @@ index f4d66edace..5fe97e5a07 100644 void dw_hdmi_init(struct dw_hdmi *hdmi); int dw_hdmi_detect_hpd(struct dw_hdmi *hdmi); -- -2.34.1 +Armbian diff --git a/patch/u-boot/v2024.07/general-dwc-otg-usb-fix.patch b/patch/u-boot/v2024.07/general-dwc-otg-usb-fix.patch index dcfbaea5ad..46b59a2ce6 100644 --- a/patch/u-boot/v2024.07/general-dwc-otg-usb-fix.patch +++ b/patch/u-boot/v2024.07/general-dwc-otg-usb-fix.patch @@ -1,8 +1,48 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Fri, 12 Mar 2021 20:20:12 +0000 +Subject: [ARCHEOLOGY] Changes and fixes to rk322x uboot and kernel config + +> X-Git-Archeology: > recovered message: > - Enabled nfc on rk322x-dev and disable on rk322x-current (need further development) +> X-Git-Archeology: > recovered message: > - Tidied up rk322x-current device tree +> X-Git-Archeology: > recovered message: > - enabled nfc rockchip driver enabled in rk322x-dev kernel config +> X-Git-Archeology: > recovered message: > - Enabled EHCI controller in u-boot (added patch for inno-phy, device tree and config bits), better device detection for dwc2 usb otg port +> X-Git-Archeology: > recovered message: > - Removed SPL_FIT_GENERATOR from u-boot configuration, fixed .its file to use binman +> X-Git-Archeology: > recovered message: > - fixed rk322x its file (now includes dtb), reverted u-boot to v2020.10 and changed dev_* into log_debug() calls +> X-Git-Archeology: - Revision 95425c27b9d3bbb96e7936cc531638c9150538f9: https://github.com/armbian/build/commit/95425c27b9d3bbb96e7936cc531638c9150538f9 +> X-Git-Archeology: Date: Fri, 12 Mar 2021 20:20:12 +0000 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: Changes and fixes to rk322x uboot and kernel config +> X-Git-Archeology: +> X-Git-Archeology: - Revision 5130cc32fd9b18ecf71d5d26b688859ede0ffe03: https://github.com/armbian/build/commit/5130cc32fd9b18ecf71d5d26b688859ede0ffe03 +> X-Git-Archeology: Date: Mon, 20 Jun 2022 08:35:13 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: fix u-boot USB OTG patch name +> X-Git-Archeology: +> X-Git-Archeology: - Revision d4daf41404853fc13813dc4eb9f6cad76f95945c: https://github.com/armbian/build/commit/d4daf41404853fc13813dc4eb9f6cad76f95945c +> X-Git-Archeology: Date: Mon, 20 Jun 2022 08:35:13 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: add sdmmc_ext node, mmc reset properties and otg usb fix to u-boot +> X-Git-Archeology: +> X-Git-Archeology: - Revision efee17f217e58a93e795c165e303bfd0a2a0a32a: https://github.com/armbian/build/commit/efee17f217e58a93e795c165e303bfd0a2a0a32a +> X-Git-Archeology: Date: Mon, 22 Apr 2024 12:39:09 +0200 +> X-Git-Archeology: From: Paolo Sabatino +> X-Git-Archeology: Subject: rockchip64: bump rk3318-box uboot to v2024.01 +> X-Git-Archeology: +> X-Git-Archeology: - Revision 7876017d0b77bbfefbb3d112045b32d9b50db928: https://github.com/armbian/build/commit/7876017d0b77bbfefbb3d112045b32d9b50db928 +> X-Git-Archeology: Date: Tue, 02 Jul 2024 23:31:50 +0000 +> X-Git-Archeology: From: Paolo +> X-Git-Archeology: Subject: Bump rk322x-box and rk3318-box to u-boot v2024.07-rc5 (#6855) +> X-Git-Archeology: +--- + drivers/usb/host/dwc2.c | 2 ++ + 1 file changed, 2 insertions(+) + diff --git a/drivers/usb/host/dwc2.c b/drivers/usb/host/dwc2.c -index cefe9d83..f7288203 100644 +index 111111111111..222222222222 100644 --- a/drivers/usb/host/dwc2.c +++ b/drivers/usb/host/dwc2.c -@@ -440,6 +440,8 @@ static void dwc_otg_core_init(struct dwc2_priv *priv) +@@ -441,6 +441,8 @@ static void dwc_otg_core_init(struct udevice *dev) writel(usbcfg, ®s->gusbcfg); @@ -11,3 +51,6 @@ index cefe9d83..f7288203 100644 /* Program the GAHBCFG Register. */ switch (readl(®s->ghwcfg2) & DWC2_HWCFG2_ARCHITECTURE_MASK) { case DWC2_HWCFG2_ARCHITECTURE_SLAVE_ONLY: +-- +Armbian + diff --git a/patch/u-boot/v2024.07/general-fix-inno-phy-macro.patch b/patch/u-boot/v2024.07/general-fix-inno-phy-macro.patch index d277601772..ce360c97d2 100644 --- a/patch/u-boot/v2024.07/general-fix-inno-phy-macro.patch +++ b/patch/u-boot/v2024.07/general-fix-inno-phy-macro.patch @@ -1,14 +1,14 @@ -From 729ceebfef3f3d2c6a7a4811c89ccd404d6e0a58 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 16 Jun 2024 18:07:03 +0200 -Subject: [PATCH] fix inno_poll macro +Subject: fix inno_poll macro --- drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 3bb1a254ff..604e2703da 100644 +index 111111111111..222222222222 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c @@ -432,8 +432,8 @@ static inline void inno_update_bits(struct inno_hdmi_phy *inno, u8 reg, @@ -41,5 +41,5 @@ index 3bb1a254ff..604e2703da 100644 if (ret) { dev_err(phy->dev, "Post-PLL locking failed\n"); -- -2.34.1 +Armbian