Skip to content

Commit d478142

Browse files
committed
Merge tag 'v2024.07-rc3' into next
Prepare v2024.07-rc3
2 parents 85854bc + a7f0154 commit d478142

File tree

4,620 files changed

+5903
-123598
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,620 files changed

+5903
-123598
lines changed

MAINTAINERS

Lines changed: 4 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -598,22 +598,6 @@ R: Marc Murphy <marc.murphy@sancloud.com>
598598
S: Supported
599599
F: arch/arm/dts/am335x-sancloud*
600600

601-
ARM SC5XX
602-
M: Nathan Barrett-Morrison <nathan.morrison@timesys.com>
603-
M: Greg Malysa <greg.malysa@timesys.com>
604-
M: Ian Roberts <ian.roberts@timesys.com>
605-
M: Vasileios Bimpikas <vasileios.bimpikas@analog.com>
606-
M: Utsav Agarwal <utsav.agarwal@analog.com>
607-
M: Arturs Artamonovs <arturs.artamonovs@analog.com>
608-
S: Supported
609-
T: git https://github.com/analogdevicesinc/lnxdsp-u-boot
610-
F: arch/arm/include/asm/arch-adi/
611-
F: arch/arm/mach-sc5xx/
612-
F: drivers/clk/adi/
613-
F: drivers/serial/serial_adi_uart4.c
614-
F: drivers/timer/adi_sc5xx_timer.c
615-
F: include/env/adi/
616-
617601
ARM SNAPDRAGON
618602
M: Caleb Connolly <caleb.connolly@linaro.org>
619603
M: Neil Armstrong <neil.armstrong@linaro.org>
@@ -1017,8 +1001,11 @@ F: common/update.c
10171001
F: doc/api/dfu.rst
10181002
F: doc/usage/dfu.rst
10191003
F: drivers/dfu/
1004+
F: drivers/usb/*/*gadget*
10201005
F: drivers/usb/gadget/
10211006
F: include/dfu.h
1007+
F: include/linux/usb/ch9.h
1008+
F: include/linux/usb/gadget.h
10221009

10231010
DRIVER MODEL
10241011
M: Simon Glass <sjg@chromium.org>
@@ -1118,6 +1105,7 @@ F: test/py/tests/test_event_dump.py
11181105
FASTBOOT
11191106
M: Mattijs Korpershoek <mkorpershoek@baylibre.com>
11201107
S: Maintained
1108+
T: git https://source.denx.de/u-boot/custodians/u-boot-dfu.git
11211109
F: cmd/fastboot.c
11221110
F: doc/android/fastboot*.rst
11231111
F: include/fastboot.h

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
VERSION = 2024
44
PATCHLEVEL = 07
55
SUBLEVEL =
6-
EXTRAVERSION = -rc2
6+
EXTRAVERSION = -rc3
77
NAME =
88

99
# *DOCUMENTATION*

api/api.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,11 @@
77

88
#include <config.h>
99
#include <command.h>
10+
#include <common.h>
1011
#include <env.h>
1112
#include <malloc.h>
12-
#include <time.h>
1313
#include <env_internal.h>
14-
#include <vsprintf.h>
1514
#include <linux/delay.h>
16-
#include <linux/errno.h>
1715
#include <linux/types.h>
1816
#include <api_public.h>
1917
#include <u-boot/crc.h>

api/api_display.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@
33
* Copyright (c) 2011 The Chromium OS Authors.
44
*/
55

6+
#include <common.h>
67
#include <api_public.h>
78
#include <log.h>
8-
#include <linux/types.h>
99

1010
/* TODO(clchiou): add support of video device */
1111

api/api_net.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77

88
#include <config.h>
9+
#include <common.h>
910
#include <net.h>
1011
#include <linux/types.h>
1112
#include <api_public.h>

api/api_platform-arm.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/types.h>
1313
#include <api_public.h>
1414

15+
#include <asm/u-boot.h>
1516
#include <asm/global_data.h>
1617

1718
#include "api_private.h"

api/api_platform-mips.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include <linux/types.h>
1010
#include <api_public.h>
1111

12+
#include <asm/u-boot.h>
1213
#include <asm/global_data.h>
1314

1415
#include "api_private.h"

api/api_platform-powerpc.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
#include <linux/types.h>
1313
#include <api_public.h>
1414

15+
#include <asm/u-boot.h>
1516
#include <asm/global_data.h>
1617

1718
#include "api_private.h"

api/api_storage.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66
*/
77

88
#include <config.h>
9+
#include <common.h>
910
#include <api_public.h>
1011
#include <part.h>
1112
#include <scsi.h>
12-
#include <linux/types.h>
1313

1414
#if defined(CONFIG_CMD_USB) && defined(CONFIG_USB_STORAGE)
1515
#include <usb.h>

arch/arc/include/asm/global_data.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
#ifndef __ASM_ARC_GLOBAL_DATA_H
77
#define __ASM_ARC_GLOBAL_DATA_H
88

9-
#include <asm/u-boot.h>
10-
119
#ifndef __ASSEMBLY__
1210
/* Architecture-specific global data */
1311
struct arch_global_data {

0 commit comments

Comments
 (0)