Skip to content

Commit 1247b52

Browse files
CFSworksCFSworks
committed
linux: begin upgrading to Linux 6.6
1 parent 07f216e commit 1247b52

17 files changed

+229
-5089
lines changed

‎tp2bmc/board/tp2bmc/boot.scr

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
# SPDX-License-Identifier: GPL-2.0+
22
# Copyright (C) 2023 Sam Edwards <[email protected]>
33

4-
fdt_filename="FDT_FILENAME_HERE"
4+
fdt_filename="sun8i-t113s-turingmachines-tp2-bmc.dtb"
55

66
# Set bootargs:
7-
setenv bootargs earlycon=uart8250,mmio32,0x02500c00 console=ttyS3,115200 \
8-
loglevel=8 cma=8M init=/sbin/preinit
7+
setenv bootargs loglevel=8 cma=8M init=/sbin/preinit rootwait=5
98

109
if test ${devtype} = mmc; then
1110
setenv bootargs ${bootargs} root=PARTUUID=${distro_bootpart_uuid}
@@ -14,7 +13,7 @@ if test ${devtype} = ubi; then
1413
setenv bootargs ${bootargs} ubi.mtd=ubi ubi.block=${devnum},${distro_bootpart} root=254:0
1514
fi
1615

17-
setenv bootargs ${bootargs} sunxi_gmac.mac_str=${ethaddr} ${bootmode}
16+
setenv bootargs ${bootargs} ${bootmode}
1817

1918
# Load image, FDT
2019
load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/zImage

‎tp2bmc/board/tp2bmc/install.scr

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if test "${bootmode}" != "safemode"; then
1212
if test -e ${devtype} ${devnum}:${distro_bootpart} ${installer_marker}; then
1313
echo ...exists: entering installer
1414

15-
fdt_filename="FDT_FILENAME_HERE"
15+
fdt_filename="sun8i-t113s-turingmachines-tp2-bmc.dtb"
1616
linux_bootpart=2
1717

1818
# Load image, initramfs, and FDT
@@ -22,9 +22,9 @@ if test "${bootmode}" != "safemode"; then
2222
then
2323
# Patch FDT to allow write access to the bootloader partition
2424
fdt addr ${fdt_addr_r}
25-
fdt rm flash_partitions/partition@0 read-only
25+
fdt rm flash0/partitions/partition@0 read-only
2626

27-
env set bootargs loglevel=4 console=ttyS3,115200
27+
env set bootargs loglevel=4
2828
bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}
2929
fi
3030
else

‎tp2bmc/board/tp2bmc/linux_defconfig

+60-81
Original file line numberDiff line numberDiff line change
@@ -10,25 +10,17 @@ CONFIG_IKCONFIG_PROC=y
1010
CONFIG_LOG_BUF_SHIFT=14
1111
CONFIG_BLK_DEV_INITRD=y
1212
CONFIG_CC_OPTIMIZE_FOR_SIZE=y
13-
# CONFIG_SYSFS_SYSCALL is not set
14-
CONFIG_KALLSYMS_ALL=y
15-
CONFIG_EMBEDDED=y
1613
# CONFIG_PERF_EVENTS is not set
17-
# CONFIG_COMPAT_BRK is not set
1814
CONFIG_PROFILING=y
1915
CONFIG_ARCH_SUNXI=y
2016
# CONFIG_MACH_SUN4I is not set
2117
# CONFIG_MACH_SUN5I is not set
2218
# CONFIG_MACH_SUN6I is not set
2319
# CONFIG_MACH_SUN7I is not set
24-
# CONFIG_MACH_SUN8I is not set
2520
# CONFIG_MACH_SUN9I is not set
26-
CONFIG_ARCH_SUN8IW20=y
27-
CONFIG_EVB_PLATFORM=y
28-
CONFIG_SUNXI_SOC_NAME="sun8iw20"
29-
# CONFIG_VDSO is not set
3021
CONFIG_SMP=y
3122
CONFIG_SCHED_MC=y
23+
CONFIG_HAVE_ARM_ARCH_TIMER=y
3224
CONFIG_ARM_PSCI=y
3325
CONFIG_OABI_COMPAT=y
3426
# CONFIG_ARM_MODULE_PLTS is not set
@@ -44,6 +36,7 @@ CONFIG_JUMP_LABEL=y
4436
CONFIG_MODULES=y
4537
CONFIG_MODULE_UNLOAD=y
4638
# CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
39+
# CONFIG_COMPAT_BRK is not set
4740
# CONFIG_COMPACTION is not set
4841
CONFIG_CMA=y
4942
CONFIG_NET=y
@@ -64,7 +57,7 @@ CONFIG_UEVENT_HELPER=y
6457
CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
6558
CONFIG_DEVTMPFS=y
6659
CONFIG_DEVTMPFS_MOUNT=y
67-
CONFIG_SUNXI_MBUS=y
60+
# CONFIG_SUNXI_RSB is not set
6861
CONFIG_MTD=y
6962
CONFIG_MTD_SPI_NAND=y
7063
CONFIG_MTD_UBI=y
@@ -74,30 +67,36 @@ CONFIG_SCSI=y
7467
CONFIG_BLK_DEV_SD=y
7568
CONFIG_NETDEVICES=y
7669
# CONFIG_NET_VENDOR_ALACRITECH is not set
77-
CONFIG_SUNXI_GMAC=y
70+
# CONFIG_NET_VENDOR_ALLWINNER is not set
7871
# CONFIG_NET_VENDOR_AMAZON is not set
7972
# CONFIG_NET_VENDOR_AQUANTIA is not set
8073
# CONFIG_NET_VENDOR_ARC is not set
81-
# CONFIG_NET_VENDOR_AURORA is not set
74+
# CONFIG_NET_VENDOR_ASIX is not set
8275
# CONFIG_NET_VENDOR_BROADCOM is not set
8376
# CONFIG_NET_VENDOR_CADENCE is not set
8477
# CONFIG_NET_VENDOR_CAVIUM is not set
8578
# CONFIG_NET_VENDOR_CIRRUS is not set
8679
# CONFIG_NET_VENDOR_CORTINA is not set
80+
# CONFIG_NET_VENDOR_DAVICOM is not set
81+
# CONFIG_NET_VENDOR_ENGLEDER is not set
8782
# CONFIG_NET_VENDOR_EZCHIP is not set
8883
# CONFIG_NET_VENDOR_FARADAY is not set
84+
# CONFIG_NET_VENDOR_FUNGIBLE is not set
8985
# CONFIG_NET_VENDOR_GOOGLE is not set
9086
# CONFIG_NET_VENDOR_HISILICON is not set
9187
# CONFIG_NET_VENDOR_HUAWEI is not set
9288
# CONFIG_NET_VENDOR_INTEL is not set
89+
# CONFIG_NET_VENDOR_ADI is not set
90+
# CONFIG_NET_VENDOR_LITEX is not set
9391
# CONFIG_NET_VENDOR_MARVELL is not set
9492
# CONFIG_NET_VENDOR_MELLANOX is not set
9593
# CONFIG_NET_VENDOR_MICREL is not set
9694
# CONFIG_NET_VENDOR_MICROCHIP is not set
9795
# CONFIG_NET_VENDOR_MICROSEMI is not set
96+
# CONFIG_NET_VENDOR_MICROSOFT is not set
97+
# CONFIG_NET_VENDOR_NI is not set
9898
# CONFIG_NET_VENDOR_NATSEMI is not set
9999
# CONFIG_NET_VENDOR_NETRONOME is not set
100-
# CONFIG_NET_VENDOR_NI is not set
101100
# CONFIG_NET_VENDOR_PENSANDO is not set
102101
# CONFIG_NET_VENDOR_QUALCOMM is not set
103102
# CONFIG_NET_VENDOR_RENESAS is not set
@@ -107,111 +106,99 @@ CONFIG_SUNXI_GMAC=y
107106
# CONFIG_NET_VENDOR_SOLARFLARE is not set
108107
# CONFIG_NET_VENDOR_SMSC is not set
109108
# CONFIG_NET_VENDOR_SOCIONEXT is not set
110-
# CONFIG_NET_VENDOR_STMICRO is not set
109+
CONFIG_STMMAC_ETH=y
110+
# CONFIG_DWMAC_SUNXI is not set
111111
# CONFIG_NET_VENDOR_SYNOPSYS is not set
112+
# CONFIG_NET_VENDOR_VERTEXCOM is not set
112113
# CONFIG_NET_VENDOR_VIA is not set
114+
# CONFIG_NET_VENDOR_WANGXUN is not set
113115
# CONFIG_NET_VENDOR_WIZNET is not set
114116
# CONFIG_NET_VENDOR_XILINX is not set
117+
CONFIG_REALTEK_PHY=y
115118
# CONFIG_USB_NET_DRIVERS is not set
116119
# CONFIG_WLAN is not set
117120
CONFIG_INPUT_EVDEV=y
118-
CONFIG_INPUT_SENSORINIT=y
119121
CONFIG_KEYBOARD_GPIO=y
120122
# CONFIG_INPUT_MOUSE is not set
121-
CONFIG_INPUT_SENSOR=y
122123
# CONFIG_LEGACY_PTYS is not set
123-
# CONFIG_HW_RANDOM is not set
124-
CONFIG_SUNXI_SYS_INFO=y
125-
CONFIG_SUNXI_SMC=y
124+
# CONFIG_LEGACY_TIOCSTI is not set
125+
CONFIG_SERIAL_8250=y
126+
CONFIG_SERIAL_8250_CONSOLE=y
127+
CONFIG_SERIAL_8250_NR_UARTS=8
128+
CONFIG_SERIAL_8250_DW=y
126129
CONFIG_I2C=y
127130
CONFIG_I2C_CHARDEV=y
128131
CONFIG_I2C_GPIO=y
132+
CONFIG_I2C_MV64XXX=y
129133
CONFIG_SPI=y
130-
CONFIG_SPI_SUNXI=y
134+
CONFIG_SPI_SUN6I=y
131135
CONFIG_SPI_SPIDEV=y
136+
# CONFIG_PINCTRL_SUN4I_A10 is not set
137+
# CONFIG_PINCTRL_SUN8I_A23 is not set
138+
# CONFIG_PINCTRL_SUN8I_A33 is not set
139+
# CONFIG_PINCTRL_SUN8I_A83T is not set
140+
# CONFIG_PINCTRL_SUN8I_A83T_R is not set
141+
# CONFIG_PINCTRL_SUN8I_A23_R is not set
142+
# CONFIG_PINCTRL_SUN8I_H3 is not set
143+
# CONFIG_PINCTRL_SUN8I_H3_R is not set
144+
# CONFIG_PINCTRL_SUN8I_V3S is not set
132145
CONFIG_GPIO_AGGREGATOR=y
133-
CONFIG_GPIO_SYSFS=y
134146
CONFIG_POWER_SUPPLY=y
135147
CONFIG_SENSORS_EMC2305=y
136-
CONFIG_SUNXI_THERMAL=y
148+
CONFIG_SUN8I_THERMAL=y
137149
CONFIG_WATCHDOG=y
138150
CONFIG_SUNXI_WATCHDOG=y
139151
CONFIG_REGULATOR=y
140-
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
141152
CONFIG_REGULATOR_FIXED_VOLTAGE=y
153+
CONFIG_REGULATOR_USERSPACE_CONSUMER=y
154+
CONFIG_REGULATOR_GPIO=y
142155
CONFIG_USB=y
143-
CONFIG_USB_ACM=y
144156
CONFIG_USB_EHCI_HCD=y
145-
CONFIG_USB_EHCI_HCD_SUNXI=y
157+
CONFIG_USB_EHCI_HCD_PLATFORM=y
146158
CONFIG_USB_OHCI_HCD=y
147-
CONFIG_USB_OHCI_HCD_SUNXI=y
148-
CONFIG_USB_SUNXI_HCD=y
149-
CONFIG_USB_SUNXI_HCI=y
150-
CONFIG_USB_SUNXI_EHCI0=y
151-
CONFIG_USB_SUNXI_EHCI1=y
152-
CONFIG_USB_SUNXI_OHCI0=y
153-
CONFIG_USB_SUNXI_OHCI1=y
159+
CONFIG_USB_OHCI_HCD_PLATFORM=y
160+
CONFIG_USB_ACM=y
154161
CONFIG_USB_STORAGE=y
155-
CONFIG_USB_STORAGE_REALTEK=y
156-
CONFIG_USB_STORAGE_DATAFAB=y
157-
CONFIG_USB_STORAGE_FREECOM=y
158-
CONFIG_USB_STORAGE_ISD200=y
159-
CONFIG_USB_STORAGE_USBAT=y
160-
CONFIG_USB_STORAGE_SDDR09=y
161-
CONFIG_USB_STORAGE_SDDR55=y
162-
CONFIG_USB_STORAGE_JUMPSHOT=y
163-
CONFIG_USB_STORAGE_ALAUDA=y
164-
CONFIG_USB_STORAGE_ONETOUCH=y
165-
CONFIG_USB_STORAGE_KARMA=y
166-
CONFIG_USB_STORAGE_CYPRESS_ATACB=y
167-
CONFIG_USB_STORAGE_ENE_UB6250=y
168-
CONFIG_USB_UAS=y
162+
CONFIG_USB_MUSB_HDRC=y
163+
CONFIG_USB_MUSB_SUNXI=y
164+
CONFIG_NOP_USB_XCEIV=y
169165
CONFIG_USB_GADGET=y
170-
CONFIG_USB_SUNXI_UDC0=y
171166
CONFIG_USB_CONFIGFS=y
172-
CONFIG_USB_CONFIGFS_ACM=y
173-
CONFIG_USB_CONFIGFS_UEVENT=y
174167
CONFIG_USB_CONFIGFS_SERIAL=y
168+
CONFIG_USB_CONFIGFS_ACM=y
175169
CONFIG_USB_CONFIGFS_RNDIS=y
176170
CONFIG_USB_CONFIGFS_MASS_STORAGE=y
177171
CONFIG_USB_CONFIGFS_F_FS=y
178172
CONFIG_USB_CONFIGFS_F_HID=y
179-
CONFIG_USB_SUNXI_USB=y
180-
CONFIG_USB_SUNXI_USB_MANAGER=y
181-
CONFIG_USB_SUNXI_USB_DEBUG=y
182-
CONFIG_USB_SUNXI_USB_ADB=y
183173
CONFIG_USB_ROLE_SWITCH=y
184174
CONFIG_MMC=y
185175
CONFIG_MMC_SUNXI=y
186176
CONFIG_NEW_LEDS=y
187177
CONFIG_LEDS_CLASS=y
188178
CONFIG_LEDS_GPIO=y
189179
CONFIG_RTC_CLASS=y
190-
CONFIG_RTC_DRV_SUNXI=y
191-
CONFIG_SUNXI_REBOOT_FLAG=y
192-
CONFIG_SUNXI_RTC_BOOTCOUNT=y
193180
CONFIG_DMADEVICES=y
194181
CONFIG_DMA_SUN6I=y
195182
# CONFIG_VIRTIO_MENU is not set
196183
CONFIG_STAGING=y
197-
CONFIG_ION=y
198-
CONFIG_ION_SYSTEM_HEAP=y
199-
CONFIG_ION_CMA_HEAP=y
200-
CONFIG_EXFAT_FS=y
201-
CONFIG_EXT4_FS=y
202-
CONFIG_F2FS_FS=y
203-
# CONFIG_COMMON_CLK_DEBUG is not set
204184
# CONFIG_CLK_SUNXI is not set
205-
# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
206-
CONFIG_SUNXI_IOMMU=y
207-
CONFIG_SUNXI_IOMMU_DEBUG=y
208-
CONFIG_SUNXI_IOMMU_TESTS=y
209-
CONFIG_SUNXI_SID=y
185+
# CONFIG_SUN8I_A23_CCU is not set
186+
# CONFIG_SUN8I_A33_CCU is not set
187+
# CONFIG_SUN8I_A83T_CCU is not set
188+
# CONFIG_SUN8I_H3_CCU is not set
189+
# CONFIG_SUN8I_V3S_CCU is not set
190+
# CONFIG_SUN8I_DE2_CCU is not set
191+
# CONFIG_SUN8I_R40_CCU is not set
192+
CONFIG_SUN20I_PPU=y
193+
CONFIG_PHY_SUN4I_USB=y
210194
CONFIG_NVMEM_SUNXI_SID=y
195+
CONFIG_EXT4_FS=y
196+
CONFIG_F2FS_FS=y
211197
# CONFIG_DNOTIFY is not set
212198
CONFIG_OVERLAY_FS=y
213199
CONFIG_MSDOS_FS=y
214200
CONFIG_VFAT_FS=y
201+
CONFIG_EXFAT_FS=y
215202
CONFIG_TMPFS=y
216203
CONFIG_TMPFS_POSIX_ACL=y
217204
CONFIG_UBIFS_FS=y
@@ -222,21 +209,13 @@ CONFIG_CRYPTO_USER_API_HASH=y
222209
CONFIG_CRYPTO_USER_API_SKCIPHER=y
223210
CONFIG_CRYPTO_USER_API_RNG=y
224211
CONFIG_CRYPTO_USER_API_AEAD=y
225-
CONFIG_CRYPTO_DEV_SUNXI=y
212+
CONFIG_CRYPTO_DEV_SUN8I_CE=y
213+
CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
214+
CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
215+
CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
226216
CONFIG_DMA_CMA=y
227217
CONFIG_PRINTK_TIME=y
228-
CONFIG_DEBUG_INFO=y
229218
CONFIG_FRAME_WARN=2048
230-
CONFIG_DEBUG_FS=y
231219
CONFIG_MAGIC_SYSRQ=y
232-
CONFIG_SLUB_DEBUG_ON=y
233-
CONFIG_DEBUG_VM=y
234-
# CONFIG_SCHED_DEBUG is not set
235-
CONFIG_DEBUG_MUTEXES=y
236-
CONFIG_STACKTRACE=y
237-
# CONFIG_FTRACE is not set
220+
CONFIG_DEBUG_FS=y
238221
CONFIG_ATOMIC64_SELFTEST=y
239-
CONFIG_DEBUG_LL=y
240-
CONFIG_DEBUG_UART_PHYS=0x02500000
241-
CONFIG_DEBUG_UART_VIRT=0xf2500000
242-
CONFIG_EARLY_PRINTK=y

‎tp2bmc/board/tp2bmc/overlay/etc/init.d/S11bmc-otg

-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ setup_configuration() {
3939
mkdir -p configs/c.1/strings/0x409
4040
echo "$name" > configs/c.1/strings/0x409/configuration
4141
ln -s functions/acm.usb0 configs/c.1
42-
43-
# enable udc, set the correct OTG role
44-
echo usb_device > /sys/bus/platform/devices/soc@3000000:usbc0@0/otg_role > /dev/null 2>&1
4542
}
4643

4744
case "$1" in

‎tp2bmc/board/tp2bmc/post_build.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
set -euo pipefail
44
cd "${0%/*}"
55

6-
FDT_FILENAME=$(basename $TARGET_DIR/boot/*.dtb)
7-
sed s/FDT_FILENAME_HERE/${FDT_FILENAME}/g < boot.scr > /tmp/boot.scr
8-
mkimage -A arm -T script -d /tmp/boot.scr $TARGET_DIR/boot/boot.scr.uimg
6+
mkimage -A arm -T script -d boot.scr $TARGET_DIR/boot/boot.scr.uimg
97

108
if [ -e ${TARGET_DIR}/etc/inittab ]; then
119
grep -qE '^GS0::' ${TARGET_DIR}/etc/inittab || \

‎tp2bmc/board/tp2bmc/post_image.sh

+1-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,7 @@ INITRAMFS_DIR=$STAGING_DIR/initramfs/install
1212

1313
# Prepare the SD image's FAT32 filesystem
1414
mkdir -p sdcard-bootpart/boot
15-
FDT_FILENAME=$(basename $TARGET_DIR/boot/*.dtb)
16-
sed s/FDT_FILENAME_HERE/${FDT_FILENAME}/g < $BOARD_DIR/install.scr > /tmp/install.scr
17-
mkimage -A arm -T script -d /tmp/install.scr sdcard-bootpart/boot/boot.scr.uimg
15+
mkimage -A arm -T script -d $BOARD_DIR/install.scr sdcard-bootpart/boot/boot.scr.uimg
1816
mkimage -A arm -T ramdisk -d installer.cpio.gz sdcard-bootpart/boot/install.img
1917
cp -r $BOARD_DIR/sdcard_overlay/* sdcard-bootpart/
2018

0 commit comments

Comments
 (0)