diff --git a/linux-6.6/rk3568_patch/kernel.patch b/linux-6.6/rk3568_patch/kernel.patch index 1ff4793f37a0f70791e6fe27773220d9080b4add..c117fb7d33fa7a7ace28248382962c7e15993fdb 100644 --- a/linux-6.6/rk3568_patch/kernel.patch +++ b/linux-6.6/rk3568_patch/kernel.patch @@ -1312,7 +1312,7 @@ index 259e59594..da0640994 100644 dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-rock-5a.dtb +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3588s-orangepi-5.dtb diff --git a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts -index de0a1f2af..7d4c5324c 100644 +index 776c2236d..c8ceb5cdb 100644 --- a/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts +++ b/arch/arm64/boot/dts/rockchip/px30-ringneck-haikou.dts @@ -86,7 +86,7 @@ simple-audio-card,cpu { @@ -1345,10 +1345,10 @@ index 20955556b..42ce78beb 100644 pinctrl-0 = <&spi1_clk &spi1_csn0 &spi1_csn1 &spi1_miso &spi1_mosi>; #address-cells = <1>; diff --git a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -index 4237f2ee8..5d7d56728 100644 +index f57d4acd9..21e030604 100644 --- a/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts +++ b/arch/arm64/boot/dts/rockchip/rk3328-orangepi-r1-plus-lts.dts -@@ -26,11 +26,9 @@ yt8531c: ethernet-phy@0 { +@@ -28,11 +28,9 @@ yt8531c: ethernet-phy@0 { compatible = "ethernet-phy-ieee802.3-c22"; reg = <0>; @@ -1824,7 +1824,7 @@ index fee5e7111..ea403de13 100644 &gpu { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi -index aba2748fe..e089e0c26 100644 +index 35a0fb73a..a6bae0a45 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi @@ -27,7 +27,7 @@ module_led: led-0 { @@ -76982,7 +76982,7 @@ index 1f95d0aca..2f4e970d7 100644 +MODULE_LICENSE("GPL"); +#endif diff --git a/drivers/cpufreq/Kconfig b/drivers/cpufreq/Kconfig -index f429b9b37..2533b01bd 100644 +index 7e773c47a..a870deefa 100644 --- a/drivers/cpufreq/Kconfig +++ b/drivers/cpufreq/Kconfig @@ -105,6 +105,17 @@ config CPU_FREQ_DEFAULT_GOV_SCHEDUTIL @@ -111202,7 +111202,7 @@ index e7f55c021..fc0db7790 100644 /* Charging external connector */ [EXTCON_CHG_USB_SDP] = { diff --git a/drivers/firmware/Kconfig b/drivers/firmware/Kconfig -index f0e9f2506..386c85da3 100644 +index 3f2f22e47..3489c3d2a 100644 --- a/drivers/firmware/Kconfig +++ b/drivers/firmware/Kconfig @@ -226,6 +226,13 @@ config QCOM_SCM_DOWNLOAD_MODE_DEFAULT @@ -906248,10 +906248,10 @@ index 000000000..bafe641cd + +#endif diff --git a/drivers/media/usb/uvc/uvc_video.c b/drivers/media/usb/uvc/uvc_video.c -index 91c350b25..4d81f3b07 100644 +index 9572fdfe7..c59a645ee 100644 --- a/drivers/media/usb/uvc/uvc_video.c +++ b/drivers/media/usb/uvc/uvc_video.c -@@ -23,6 +23,7 @@ +@@ -24,6 +24,7 @@ #include #include "uvcvideo.h" @@ -906259,7 +906259,7 @@ index 91c350b25..4d81f3b07 100644 /* ------------------------------------------------------------------------ * UVC Controls -@@ -2269,6 +2270,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) +@@ -2315,6 +2316,8 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) if (ret < 0) goto error_commit; @@ -906268,7 +906268,7 @@ index 91c350b25..4d81f3b07 100644 ret = uvc_video_start_transfer(stream, GFP_KERNEL); if (ret < 0) goto error_video; -@@ -2276,6 +2279,7 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) +@@ -2322,6 +2325,7 @@ int uvc_video_start_streaming(struct uvc_streaming *stream) return 0; error_video: @@ -906276,7 +906276,7 @@ index 91c350b25..4d81f3b07 100644 usb_set_interface(stream->dev->udev, stream->intfnum, 0); error_commit: uvc_video_clock_cleanup(stream); -@@ -2307,4 +2311,5 @@ void uvc_video_stop_streaming(struct uvc_streaming *stream) +@@ -2353,4 +2357,5 @@ void uvc_video_stop_streaming(struct uvc_streaming *stream) } uvc_video_clock_cleanup(stream); @@ -1350377,10 +1350377,10 @@ index 423baf089..aaaf802b7 100644 nvmem-sc27xx-efuse-y := sc27xx-efuse.o obj-$(CONFIG_NVMEM_SNVS_LPGPR) += nvmem_snvs_lpgpr.o diff --git a/drivers/nvmem/core.c b/drivers/nvmem/core.c -index f28c005c2..46706dafb 100644 +index 3ea94bc26..bdbd28597 100644 --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c -@@ -2154,6 +2154,11 @@ static void __exit nvmem_exit(void) +@@ -2134,6 +2134,11 @@ static void __exit nvmem_exit(void) bus_unregister(&nvmem_bus_type); } @@ -1800112,55 +1800112,50 @@ index 000000000..30757db43 +MODULE_DESCRIPTION("Blackbox for system"); +MODULE_AUTHOR("OHOS"); diff --git a/drivers/tee/optee/supp.c b/drivers/tee/optee/supp.c -index 322a543b8..2d556b79a 100644 +index d0f397c90..943aee563 100644 --- a/drivers/tee/optee/supp.c +++ b/drivers/tee/optee/supp.c -@@ -82,6 +82,9 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, +@@ -81,6 +81,8 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, + struct optee_supp *supp = &optee->supp; struct optee_supp_req *req; - bool interruptable; u32 ret; -+ unsigned long timeleft; + int id; + struct optee_supp_req *get_req; /* * Return in case there is no supplicant available and -@@ -114,8 +117,17 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, - * exclusive access again. +@@ -115,15 +117,29 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, + * gets hung for some reason. */ - while (wait_for_completion_interruptible(&req->c)) { + if (wait_for_completion_killable(&req->c)) { + pr_err("Warning, Interrupting an RPC to supplicant!\n"); -+ timeleft = wait_for_completion_timeout(&req->c, msecs_to_jiffies(2000)); -+ if (timeleft) { ++ if (wait_for_completion_timeout(&req->c, msecs_to_jiffies(2000))) { + /* get completion, it means tee-supplicant is alive. */ -+ break; -+ } else { -+ /* timeout, it means tee-supplicant is dead, interrupting an RPC. */ -+ interruptable = true; -+ } ++ goto out; + mutex_lock(&supp->mutex); -- interruptable = !supp->ctx; - if (interruptable) { - /* - * There's no supplicant available and since the -@@ -134,6 +146,14 @@ u32 optee_supp_thrd_req(struct tee_context *ctx, u32 func, size_t num_params, - list_del(&req->link); - req->in_queue = false; - } + if (req->in_queue) { + list_del(&req->link); + req->in_queue = false; + } + -+ idr_for_each_entry(&supp->idr, get_req, id) { -+ if (get_req == req) { -+ idr_remove(&supp->idr, id); -+ supp->req_id = -1; -+ break; -+ } ++ idr_for_each_entry(&supp->idr, get_req, id) { ++ if (get_req == req) { ++ idr_remove(&supp->idr, id); ++ supp->req_id = -1; ++ break; + } - } ++ } mutex_unlock(&supp->mutex); + req->ret = TEEC_ERROR_COMMUNICATION; + } + ++out: + ret = req->ret; + kfree(req); diff --git a/drivers/tty/serial/8250/8250.h b/drivers/tty/serial/8250/8250.h -index 1aa3e55c8..14a5cb640 100644 +index f76c9ecc5..2d59eaae6 100644 --- a/drivers/tty/serial/8250/8250.h +++ b/drivers/tty/serial/8250/8250.h @@ -51,6 +51,9 @@ struct uart_8250_dma { @@ -1800193,9 +1800188,9 @@ index 1aa3e55c8..14a5cb640 100644 serial_out(up, UART_IER, up->ier); return true; } -@@ -351,6 +360,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) - #ifdef CONFIG_SERIAL_8250_DMA +@@ -352,6 +361,9 @@ static inline int is_omap1510_8250(struct uart_8250_port *pt) extern int serial8250_tx_dma(struct uart_8250_port *); + extern void serial8250_tx_dma_flush(struct uart_8250_port *); extern int serial8250_rx_dma(struct uart_8250_port *); +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) +extern int serial8250_start_rx_dma(struct uart_8250_port *); @@ -1800203,7 +1800198,7 @@ index 1aa3e55c8..14a5cb640 100644 extern void serial8250_rx_dma_flush(struct uart_8250_port *); extern int serial8250_request_dma(struct uart_8250_port *); extern void serial8250_release_dma(struct uart_8250_port *); -@@ -386,6 +398,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) +@@ -388,6 +400,12 @@ static inline int serial8250_rx_dma(struct uart_8250_port *p) { return -1; } @@ -1801580,7 +1801575,7 @@ index 000000000..9853e356f +#endif +#endif diff --git a/drivers/tty/serial/8250/8250_dma.c b/drivers/tty/serial/8250/8250_dma.c -index 7fa665017..f48abcf66 100644 +index 62492cf10..29f336860 100644 --- a/drivers/tty/serial/8250/8250_dma.c +++ b/drivers/tty/serial/8250/8250_dma.c @@ -11,6 +11,13 @@ @@ -1801680,8 +1801675,8 @@ index 7fa665017..f48abcf66 100644 dma_async_issue_pending(dma->txchan); serial8250_clear_THRI(p); dma->tx_err = 0; -@@ -139,6 +184,64 @@ int serial8250_tx_dma(struct uart_8250_port *p) - return ret; +@@ -155,6 +200,64 @@ void serial8250_tx_dma_flush(struct uart_8250_port *p) + dmaengine_terminate_async(dma->txchan); } +#if defined(CONFIG_ARCH_ROCKCHIP) && defined(CONFIG_NO_GKI) @@ -1801745,7 +1801740,7 @@ index 7fa665017..f48abcf66 100644 int serial8250_rx_dma(struct uart_8250_port *p) { struct uart_8250_dma *dma = p->dma; -@@ -166,6 +269,8 @@ int serial8250_rx_dma(struct uart_8250_port *p) +@@ -182,6 +285,8 @@ int serial8250_rx_dma(struct uart_8250_port *p) return 0; } @@ -1801754,7 +1801749,7 @@ index 7fa665017..f48abcf66 100644 void serial8250_rx_dma_flush(struct uart_8250_port *p) { struct uart_8250_dma *dma = p->dma; -@@ -193,10 +298,19 @@ int serial8250_request_dma(struct uart_8250_port *p) +@@ -209,10 +314,19 @@ int serial8250_request_dma(struct uart_8250_port *p) dma->rxconf.direction = DMA_DEV_TO_MEM; dma->rxconf.src_addr_width = DMA_SLAVE_BUSWIDTH_1_BYTE; dma->rxconf.src_addr = rx_dma_addr + UART_RX; @@ -1801774,7 +1801769,7 @@ index 7fa665017..f48abcf66 100644 dma_cap_zero(mask); dma_cap_set(DMA_SLAVE, mask); -@@ -220,54 +334,52 @@ int serial8250_request_dma(struct uart_8250_port *p) +@@ -236,54 +350,52 @@ int serial8250_request_dma(struct uart_8250_port *p) dmaengine_slave_config(dma->rxchan, &dma->rxconf); @@ -1801862,7 +1801857,7 @@ index 7fa665017..f48abcf66 100644 release_rx: dma_release_channel(dma->rxchan); return ret; -@@ -287,14 +399,19 @@ void serial8250_release_dma(struct uart_8250_port *p) +@@ -303,14 +415,19 @@ void serial8250_release_dma(struct uart_8250_port *p) dma->rx_addr); dma_release_channel(dma->rxchan); dma->rxchan = NULL; @@ -1802859,7 +1802854,7 @@ index 8fc8b6753..994cd56af 100644 EXPORT_SYMBOL_GPL(dw8250_setup_port); +#endif diff --git a/drivers/tty/serial/8250/8250_port.c b/drivers/tty/serial/8250/8250_port.c -index 2b1b2928e..e0aaa4fac 100644 +index c2778300e..bf2a561e8 100644 --- a/drivers/tty/serial/8250/8250_port.c +++ b/drivers/tty/serial/8250/8250_port.c @@ -55,6 +55,7 @@ @@ -1803040,7 +1803035,7 @@ index 2b1b2928e..e0aaa4fac 100644 if (msg) { dev_warn_ratelimited(port->dev, "%s\n", msg); up->dma = NULL; -@@ -2649,6 +2709,9 @@ void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud, +@@ -2657,6 +2717,9 @@ void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud, { struct uart_8250_port *up = up_to_u8250p(port); @@ -1803050,7 +1803045,7 @@ index 2b1b2928e..e0aaa4fac 100644 /* Workaround to enable 115200 baud on OMAP1510 internal ports */ if (is_omap1510_8250(up)) { if (baud == 115200) { -@@ -2668,6 +2731,16 @@ void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud, +@@ -2676,6 +2739,16 @@ void serial8250_do_set_divisor(struct uart_port *port, unsigned int baud, serial_port_out(port, UART_LCR, up->lcr | UART_LCR_DLAB); serial_dl_write(up, quot); @@ -1803067,7 +1803062,7 @@ index 2b1b2928e..e0aaa4fac 100644 } EXPORT_SYMBOL_GPL(serial8250_do_set_divisor); -@@ -2848,6 +2921,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2856,6 +2929,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, if ((termios->c_cflag & CREAD) == 0) port->ignore_status_mask |= UART_LSR_DR; @@ -1803075,7 +1803070,7 @@ index 2b1b2928e..e0aaa4fac 100644 /* * CTS flow control flag and modem status interrupts */ -@@ -2861,6 +2935,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2869,6 +2943,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, up->ier |= UART_IER_RTOIE; serial_port_out(port, UART_IER, up->ier); @@ -1803083,7 +1803078,7 @@ index 2b1b2928e..e0aaa4fac 100644 if (up->capabilities & UART_CAP_EFR) { unsigned char efr = 0; -@@ -2879,8 +2954,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2887,8 +2962,23 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_EFR, efr); } @@ -1803107,7 +1803102,7 @@ index 2b1b2928e..e0aaa4fac 100644 /* * LCR DLAB must be set to enable 64-byte FIFO mode. If the FCR * is written without DLAB set, this mode will be disabled. -@@ -2889,6 +2979,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2897,6 +2987,7 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_FCR, up->fcr); serial_port_out(port, UART_LCR, up->lcr); /* reset DLAB */ @@ -1803115,7 +1803110,7 @@ index 2b1b2928e..e0aaa4fac 100644 if (port->type != PORT_16750) { /* emulated UARTs (Lucent Venus 167x) need two steps */ if (up->fcr & UART_FCR_ENABLE_FIFO) -@@ -2896,6 +2987,21 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, +@@ -2904,6 +2995,21 @@ serial8250_do_set_termios(struct uart_port *port, struct ktermios *termios, serial_port_out(port, UART_FCR, up->fcr); /* set fcr */ } serial8250_set_mctrl(port, port->mctrl); @@ -1806801,10 +1806796,10 @@ index 628b75be3..695f412af 100644 obj-$(CONFIG_SERIAL_8250_IOC3) += 8250_ioc3.o obj-$(CONFIG_SERIAL_8250_OMAP) += 8250_omap.o diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c -index 0944cfae8..0e1cea4bb 100644 +index 760283a54..7504d9a6c 100644 --- a/drivers/usb/core/hub.c +++ b/drivers/usb/core/hub.c -@@ -1865,7 +1865,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) +@@ -1876,7 +1876,8 @@ static int hub_probe(struct usb_interface *intf, const struct usb_device_id *id) * bus_resume methods. */ if (hdev->parent) { /* normal device */ @@ -1806815,7 +1806810,7 @@ index 0944cfae8..0e1cea4bb 100644 const struct hc_driver *drv = bus_to_hcd(hdev->bus)->driver; diff --git a/drivers/usb/core/quirks.c b/drivers/usb/core/quirks.c -index 13171454f..d3f23569d 100644 +index 6926bd639..34c8eeb36 100644 --- a/drivers/usb/core/quirks.c +++ b/drivers/usb/core/quirks.c @@ -325,6 +325,10 @@ static const struct usb_device_id usb_quirk_list[] = { @@ -1806829,7 +1806824,7 @@ index 13171454f..d3f23569d 100644 /* appletouch */ { USB_DEVICE(0x05ac, 0x021a), .driver_info = USB_QUIRK_RESET_RESUME }, -@@ -428,6 +432,11 @@ static const struct usb_device_id usb_quirk_list[] = { +@@ -432,6 +436,11 @@ static const struct usb_device_id usb_quirk_list[] = { /* Generic RTL8153 based ethernet adapters */ { USB_DEVICE(0x0bda, 0x8153), .driver_info = USB_QUIRK_NO_LPM }, @@ -1806841,7 +1806836,7 @@ index 13171454f..d3f23569d 100644 /* SONiX USB DEVICE Touchpad */ { USB_DEVICE(0x0c45, 0x7056), .driver_info = USB_QUIRK_IGNORE_REMOTE_WAKEUP }, -@@ -526,6 +535,9 @@ static const struct usb_device_id usb_quirk_list[] = { +@@ -536,6 +545,9 @@ static const struct usb_device_id usb_quirk_list[] = { { USB_DEVICE(0x2040, 0x7200), .driver_info = USB_QUIRK_CONFIG_INTF_STRINGS }, @@ -1892700,7 +1892695,7 @@ index 000000000..1781aa785 + +#endif diff --git a/include/asm-generic/vmlinux.lds.h b/include/asm-generic/vmlinux.lds.h -index 7e11ca6f8..7cd23a862 100644 +index cf3f8b9bf..89f3a5dca 100644 --- a/include/asm-generic/vmlinux.lds.h +++ b/include/asm-generic/vmlinux.lds.h @@ -888,6 +888,7 @@ @@ -1893057,10 +1893052,10 @@ index 5286a53a1..4844b7d01 100644 #endif /* __DW_MIPI_DSI__ */ diff --git a/include/drm/drm_connector.h b/include/drm/drm_connector.h -index d300fde6c..4a1e26591 100644 +index b2e9dc02f..89dda7a7a 100644 --- a/include/drm/drm_connector.h +++ b/include/drm/drm_connector.h -@@ -2018,8 +2018,17 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev); +@@ -2021,8 +2021,17 @@ int drm_mode_create_suggested_offset_properties(struct drm_device *dev); int drm_connector_set_path_property(struct drm_connector *connector, const char *path); int drm_connector_set_tile_property(struct drm_connector *connector); @@ -1906023,10 +1906018,10 @@ index 000000000..39c497774 + +#endif diff --git a/include/linux/sched.h b/include/linux/sched.h -index 19a464e0a..3656ac6cc 100644 +index f6de62c81..814d06a87 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h -@@ -843,6 +843,20 @@ struct kmap_ctrl { +@@ -846,6 +846,20 @@ struct kmap_ctrl { #endif }; @@ -1906047,7 +1906042,7 @@ index 19a464e0a..3656ac6cc 100644 struct task_struct { #ifdef CONFIG_THREAD_INFO_IN_TASK /* -@@ -1665,6 +1679,10 @@ struct task_struct { +@@ -1672,6 +1686,10 @@ struct task_struct { u64 ftoken; #endif @@ -1930445,7 +1930440,7 @@ index 000000000..c217380d1 + +#endif diff --git a/init/Kconfig b/init/Kconfig -index 2fb8d1ba7..f19080e52 100644 +index 486bd372b..d116d7c65 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -1382,6 +1382,12 @@ if BLK_DEV_INITRD @@ -1930484,10 +1930479,10 @@ index 148988bd8..8f9b63d85 100644 loff_t saved_offset = this_header; if (*buf == '0' && !(this_header & 3)) { diff --git a/init/main.c b/init/main.c -index c787e94cc..76d514af8 100644 +index 20fe61afe..fd18dacc9 100644 --- a/init/main.c +++ b/init/main.c -@@ -1546,6 +1546,10 @@ static noinline void __init kernel_init_freeable(void) +@@ -1552,6 +1552,10 @@ static noinline void __init kernel_init_freeable(void) smp_init(); sched_init_smp(); @@ -1932679,19 +1932674,19 @@ index 6c23c6af7..355b10611 100644 KBUILD_CPPFLAGS += $(CLANG_FLAGS) export CLANG_FLAGS diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn -index 16c750bb9..7ee30ec9b 100644 +index 0ea3281a9..ad400cd10 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn -@@ -145,6 +145,9 @@ KBUILD_CFLAGS += $(call cc-disable-warning, unaligned-access) - KBUILD_CFLAGS += $(call cc-disable-warning, cast-function-type-strict) - KBUILD_CFLAGS += -Wno-enum-compare-conditional +@@ -176,6 +176,9 @@ KBUILD_CFLAGS += -Wno-shift-negative-value + + ifdef CONFIG_CC_IS_CLANG KBUILD_CFLAGS += -Wno-enum-enum-conversion +KBUILD_CFLAGS += -Wno-declaration-after-statement +KBUILD_CFLAGS += -Wno-strict-prototypes +KBUILD_CFLAGS += -Wno-int-conversion endif - endif + ifdef CONFIG_CC_IS_CLANG diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 44f20b1b8..eaec22e10 100644 --- a/scripts/Makefile.lib