linux: begin upgrading to Linux 6.6

tp2bmc/board/tp2bmc/boot.scr

@@ -1,11 +1,10 @@
 # SPDX-License-Identifier: GPL-2.0+
 # Copyright (C) 2023 Sam Edwards <[email protected]>
 
-fdt_filename="FDT_FILENAME_HERE"
+fdt_filename="sun8i-t113s-turingmachines-tp2-bmc.dtb"
 
 # Set bootargs:
-setenv bootargs earlycon=uart8250,mmio32,0x02500c00 console=ttyS3,115200 \
-	loglevel=8 cma=8M init=/sbin/preinit
+setenv bootargs loglevel=8 cma=8M init=/sbin/preinit rootwait=5
 
 if test ${devtype} = mmc; then
 	setenv bootargs ${bootargs} root=PARTUUID=${distro_bootpart_uuid}
@@ -14,7 +13,7 @@ if test ${devtype} = ubi; then
 	setenv bootargs ${bootargs} ubi.mtd=ubi ubi.block=${devnum},${distro_bootpart} root=254:0
 fi
 
-setenv bootargs ${bootargs} sunxi_gmac.mac_str=${ethaddr} ${bootmode}
+setenv bootargs ${bootargs} ${bootmode}
 
 # Load image, FDT
 load ${devtype} ${devnum}:${distro_bootpart} ${loadaddr} /boot/zImage

tp2bmc/board/tp2bmc/install.scr

@@ -12,7 +12,7 @@ if test "${bootmode}" != "safemode"; then
 	if test -e ${devtype} ${devnum}:${distro_bootpart} ${installer_marker}; then
 		echo ...exists: entering installer
 
-		fdt_filename="FDT_FILENAME_HERE"
+		fdt_filename="sun8i-t113s-turingmachines-tp2-bmc.dtb"
 		linux_bootpart=2
 
 		# Load image, initramfs, and FDT
@@ -22,9 +22,9 @@ if test "${bootmode}" != "safemode"; then
 		then
 			# Patch FDT to allow write access to the bootloader partition
 			fdt addr ${fdt_addr_r}
-			fdt rm flash_partitions/partition@0 read-only
+			fdt rm flash0/partitions/partition@0 read-only
 
-			env set bootargs loglevel=4 console=ttyS3,115200
+			env set bootargs loglevel=4
 			bootz ${loadaddr} ${ramdisk_addr_r} ${fdt_addr_r}
 		fi
 	else

tp2bmc/board/tp2bmc/linux_defconfig

@@ -10,25 +10,17 @@ CONFIG_IKCONFIG_PROC=y
 CONFIG_LOG_BUF_SHIFT=14
 CONFIG_BLK_DEV_INITRD=y
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
-# CONFIG_SYSFS_SYSCALL is not set
-CONFIG_KALLSYMS_ALL=y
-CONFIG_EMBEDDED=y
 # CONFIG_PERF_EVENTS is not set
-# CONFIG_COMPAT_BRK is not set
 CONFIG_PROFILING=y
 CONFIG_ARCH_SUNXI=y
 # CONFIG_MACH_SUN4I is not set
 # CONFIG_MACH_SUN5I is not set
 # CONFIG_MACH_SUN6I is not set
 # CONFIG_MACH_SUN7I is not set
-# CONFIG_MACH_SUN8I is not set
 # CONFIG_MACH_SUN9I is not set
-CONFIG_ARCH_SUN8IW20=y
-CONFIG_EVB_PLATFORM=y
-CONFIG_SUNXI_SOC_NAME="sun8iw20"
-# CONFIG_VDSO is not set
 CONFIG_SMP=y
 CONFIG_SCHED_MC=y
+CONFIG_HAVE_ARM_ARCH_TIMER=y
 CONFIG_ARM_PSCI=y
 CONFIG_OABI_COMPAT=y
 # CONFIG_ARM_MODULE_PLTS is not set
@@ -44,6 +36,7 @@ CONFIG_JUMP_LABEL=y
 CONFIG_MODULES=y
 CONFIG_MODULE_UNLOAD=y
 # CONFIG_CORE_DUMP_DEFAULT_ELF_HEADERS is not set
+# CONFIG_COMPAT_BRK is not set
 # CONFIG_COMPACTION is not set
 CONFIG_CMA=y
 CONFIG_NET=y
@@ -64,7 +57,7 @@ CONFIG_UEVENT_HELPER=y
 CONFIG_UEVENT_HELPER_PATH="/sbin/hotplug"
 CONFIG_DEVTMPFS=y
 CONFIG_DEVTMPFS_MOUNT=y
-CONFIG_SUNXI_MBUS=y
+# CONFIG_SUNXI_RSB is not set
 CONFIG_MTD=y
 CONFIG_MTD_SPI_NAND=y
 CONFIG_MTD_UBI=y
@@ -74,30 +67,36 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_NETDEVICES=y
 # CONFIG_NET_VENDOR_ALACRITECH is not set
-CONFIG_SUNXI_GMAC=y
+# CONFIG_NET_VENDOR_ALLWINNER is not set
 # CONFIG_NET_VENDOR_AMAZON is not set
 # CONFIG_NET_VENDOR_AQUANTIA is not set
 # CONFIG_NET_VENDOR_ARC is not set
-# CONFIG_NET_VENDOR_AURORA is not set
+# CONFIG_NET_VENDOR_ASIX is not set
 # CONFIG_NET_VENDOR_BROADCOM is not set
 # CONFIG_NET_VENDOR_CADENCE is not set
 # CONFIG_NET_VENDOR_CAVIUM is not set
 # CONFIG_NET_VENDOR_CIRRUS is not set
 # CONFIG_NET_VENDOR_CORTINA is not set
+# CONFIG_NET_VENDOR_DAVICOM is not set
+# CONFIG_NET_VENDOR_ENGLEDER is not set
 # CONFIG_NET_VENDOR_EZCHIP is not set
 # CONFIG_NET_VENDOR_FARADAY is not set
+# CONFIG_NET_VENDOR_FUNGIBLE is not set
 # CONFIG_NET_VENDOR_GOOGLE is not set
 # CONFIG_NET_VENDOR_HISILICON is not set
 # CONFIG_NET_VENDOR_HUAWEI is not set
 # CONFIG_NET_VENDOR_INTEL is not set
+# CONFIG_NET_VENDOR_ADI is not set
+# CONFIG_NET_VENDOR_LITEX is not set
 # CONFIG_NET_VENDOR_MARVELL is not set
 # CONFIG_NET_VENDOR_MELLANOX is not set
 # CONFIG_NET_VENDOR_MICREL is not set
 # CONFIG_NET_VENDOR_MICROCHIP is not set
 # CONFIG_NET_VENDOR_MICROSEMI is not set
+# CONFIG_NET_VENDOR_MICROSOFT is not set
+# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_NATSEMI is not set
 # CONFIG_NET_VENDOR_NETRONOME is not set
-# CONFIG_NET_VENDOR_NI is not set
 # CONFIG_NET_VENDOR_PENSANDO is not set
 # CONFIG_NET_VENDOR_QUALCOMM is not set
 # CONFIG_NET_VENDOR_RENESAS is not set
@@ -107,111 +106,99 @@ CONFIG_SUNXI_GMAC=y
 # CONFIG_NET_VENDOR_SOLARFLARE is not set
 # CONFIG_NET_VENDOR_SMSC is not set
 # CONFIG_NET_VENDOR_SOCIONEXT is not set
-# CONFIG_NET_VENDOR_STMICRO is not set
+CONFIG_STMMAC_ETH=y
+# CONFIG_DWMAC_SUNXI is not set
 # CONFIG_NET_VENDOR_SYNOPSYS is not set
+# CONFIG_NET_VENDOR_VERTEXCOM is not set
 # CONFIG_NET_VENDOR_VIA is not set
+# CONFIG_NET_VENDOR_WANGXUN is not set
 # CONFIG_NET_VENDOR_WIZNET is not set
 # CONFIG_NET_VENDOR_XILINX is not set
+CONFIG_REALTEK_PHY=y
 # CONFIG_USB_NET_DRIVERS is not set
 # CONFIG_WLAN is not set
 CONFIG_INPUT_EVDEV=y
-CONFIG_INPUT_SENSORINIT=y
 CONFIG_KEYBOARD_GPIO=y
 # CONFIG_INPUT_MOUSE is not set
-CONFIG_INPUT_SENSOR=y
 # CONFIG_LEGACY_PTYS is not set
-# CONFIG_HW_RANDOM is not set
-CONFIG_SUNXI_SYS_INFO=y
-CONFIG_SUNXI_SMC=y
+# CONFIG_LEGACY_TIOCSTI is not set
+CONFIG_SERIAL_8250=y
+CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_SERIAL_8250_NR_UARTS=8
+CONFIG_SERIAL_8250_DW=y
 CONFIG_I2C=y
 CONFIG_I2C_CHARDEV=y
 CONFIG_I2C_GPIO=y
+CONFIG_I2C_MV64XXX=y
 CONFIG_SPI=y
-CONFIG_SPI_SUNXI=y
+CONFIG_SPI_SUN6I=y
 CONFIG_SPI_SPIDEV=y
+# CONFIG_PINCTRL_SUN4I_A10 is not set
+# CONFIG_PINCTRL_SUN8I_A23 is not set
+# CONFIG_PINCTRL_SUN8I_A33 is not set
+# CONFIG_PINCTRL_SUN8I_A83T is not set
+# CONFIG_PINCTRL_SUN8I_A83T_R is not set
+# CONFIG_PINCTRL_SUN8I_A23_R is not set
+# CONFIG_PINCTRL_SUN8I_H3 is not set
+# CONFIG_PINCTRL_SUN8I_H3_R is not set
+# CONFIG_PINCTRL_SUN8I_V3S is not set
 CONFIG_GPIO_AGGREGATOR=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_POWER_SUPPLY=y
 CONFIG_SENSORS_EMC2305=y
-CONFIG_SUNXI_THERMAL=y
+CONFIG_SUN8I_THERMAL=y
 CONFIG_WATCHDOG=y
 CONFIG_SUNXI_WATCHDOG=y
 CONFIG_REGULATOR=y
-CONFIG_REGULATOR_USERSPACE_CONSUMER=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
+CONFIG_REGULATOR_USERSPACE_CONSUMER=y
+CONFIG_REGULATOR_GPIO=y
 CONFIG_USB=y
-CONFIG_USB_ACM=y
 CONFIG_USB_EHCI_HCD=y
-CONFIG_USB_EHCI_HCD_SUNXI=y
+CONFIG_USB_EHCI_HCD_PLATFORM=y
 CONFIG_USB_OHCI_HCD=y
-CONFIG_USB_OHCI_HCD_SUNXI=y
-CONFIG_USB_SUNXI_HCD=y
-CONFIG_USB_SUNXI_HCI=y
-CONFIG_USB_SUNXI_EHCI0=y
-CONFIG_USB_SUNXI_EHCI1=y
-CONFIG_USB_SUNXI_OHCI0=y
-CONFIG_USB_SUNXI_OHCI1=y
+CONFIG_USB_OHCI_HCD_PLATFORM=y
+CONFIG_USB_ACM=y
 CONFIG_USB_STORAGE=y
-CONFIG_USB_STORAGE_REALTEK=y
-CONFIG_USB_STORAGE_DATAFAB=y
-CONFIG_USB_STORAGE_FREECOM=y
-CONFIG_USB_STORAGE_ISD200=y
-CONFIG_USB_STORAGE_USBAT=y
-CONFIG_USB_STORAGE_SDDR09=y
-CONFIG_USB_STORAGE_SDDR55=y
-CONFIG_USB_STORAGE_JUMPSHOT=y
-CONFIG_USB_STORAGE_ALAUDA=y
-CONFIG_USB_STORAGE_ONETOUCH=y
-CONFIG_USB_STORAGE_KARMA=y
-CONFIG_USB_STORAGE_CYPRESS_ATACB=y
-CONFIG_USB_STORAGE_ENE_UB6250=y
-CONFIG_USB_UAS=y
+CONFIG_USB_MUSB_HDRC=y
+CONFIG_USB_MUSB_SUNXI=y
+CONFIG_NOP_USB_XCEIV=y
 CONFIG_USB_GADGET=y
-CONFIG_USB_SUNXI_UDC0=y
 CONFIG_USB_CONFIGFS=y
-CONFIG_USB_CONFIGFS_ACM=y
-CONFIG_USB_CONFIGFS_UEVENT=y
 CONFIG_USB_CONFIGFS_SERIAL=y
+CONFIG_USB_CONFIGFS_ACM=y
 CONFIG_USB_CONFIGFS_RNDIS=y
 CONFIG_USB_CONFIGFS_MASS_STORAGE=y
 CONFIG_USB_CONFIGFS_F_FS=y
 CONFIG_USB_CONFIGFS_F_HID=y
-CONFIG_USB_SUNXI_USB=y
-CONFIG_USB_SUNXI_USB_MANAGER=y
-CONFIG_USB_SUNXI_USB_DEBUG=y
-CONFIG_USB_SUNXI_USB_ADB=y
 CONFIG_USB_ROLE_SWITCH=y
 CONFIG_MMC=y
 CONFIG_MMC_SUNXI=y
 CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_RTC_CLASS=y
-CONFIG_RTC_DRV_SUNXI=y
-CONFIG_SUNXI_REBOOT_FLAG=y
-CONFIG_SUNXI_RTC_BOOTCOUNT=y
 CONFIG_DMADEVICES=y
 CONFIG_DMA_SUN6I=y
 # CONFIG_VIRTIO_MENU is not set
 CONFIG_STAGING=y
-CONFIG_ION=y
-CONFIG_ION_SYSTEM_HEAP=y
-CONFIG_ION_CMA_HEAP=y
-CONFIG_EXFAT_FS=y
-CONFIG_EXT4_FS=y
-CONFIG_F2FS_FS=y
-# CONFIG_COMMON_CLK_DEBUG is not set
 # CONFIG_CLK_SUNXI is not set
-# CONFIG_ARM_ARCH_TIMER_EVTSTREAM is not set
-CONFIG_SUNXI_IOMMU=y
-CONFIG_SUNXI_IOMMU_DEBUG=y
-CONFIG_SUNXI_IOMMU_TESTS=y
-CONFIG_SUNXI_SID=y
+# CONFIG_SUN8I_A23_CCU is not set
+# CONFIG_SUN8I_A33_CCU is not set
+# CONFIG_SUN8I_A83T_CCU is not set
+# CONFIG_SUN8I_H3_CCU is not set
+# CONFIG_SUN8I_V3S_CCU is not set
+# CONFIG_SUN8I_DE2_CCU is not set
+# CONFIG_SUN8I_R40_CCU is not set
+CONFIG_SUN20I_PPU=y
+CONFIG_PHY_SUN4I_USB=y
 CONFIG_NVMEM_SUNXI_SID=y
+CONFIG_EXT4_FS=y
+CONFIG_F2FS_FS=y
 # CONFIG_DNOTIFY is not set
 CONFIG_OVERLAY_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
+CONFIG_EXFAT_FS=y
 CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_UBIFS_FS=y
@@ -222,21 +209,13 @@ CONFIG_CRYPTO_USER_API_HASH=y
 CONFIG_CRYPTO_USER_API_SKCIPHER=y
 CONFIG_CRYPTO_USER_API_RNG=y
 CONFIG_CRYPTO_USER_API_AEAD=y
-CONFIG_CRYPTO_DEV_SUNXI=y
+CONFIG_CRYPTO_DEV_SUN8I_CE=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_HASH=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_PRNG=y
+CONFIG_CRYPTO_DEV_SUN8I_CE_TRNG=y
 CONFIG_DMA_CMA=y
 CONFIG_PRINTK_TIME=y
-CONFIG_DEBUG_INFO=y
 CONFIG_FRAME_WARN=2048
-CONFIG_DEBUG_FS=y
 CONFIG_MAGIC_SYSRQ=y
-CONFIG_SLUB_DEBUG_ON=y
-CONFIG_DEBUG_VM=y
-# CONFIG_SCHED_DEBUG is not set
-CONFIG_DEBUG_MUTEXES=y
-CONFIG_STACKTRACE=y
-# CONFIG_FTRACE is not set
+CONFIG_DEBUG_FS=y
 CONFIG_ATOMIC64_SELFTEST=y
-CONFIG_DEBUG_LL=y
-CONFIG_DEBUG_UART_PHYS=0x02500000
-CONFIG_DEBUG_UART_VIRT=0xf2500000
-CONFIG_EARLY_PRINTK=y

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

@@ -39,9 +39,6 @@ setup_configuration() {
     mkdir -p configs/c.1/strings/0x409
     echo "$name" > configs/c.1/strings/0x409/configuration
     ln -s functions/acm.usb0 configs/c.1
-
-    # enable udc, set the correct OTG role
-    echo usb_device > /sys/bus/platform/devices/soc@3000000:usbc0@0/otg_role > /dev/null 2>&1
 }
 
 case "$1" in

tp2bmc/board/tp2bmc/post_build.sh

@@ -3,9 +3,7 @@
 set -euo pipefail
 cd "${0%/*}"
 
-FDT_FILENAME=$(basename $TARGET_DIR/boot/*.dtb)
-sed s/FDT_FILENAME_HERE/${FDT_FILENAME}/g < boot.scr > /tmp/boot.scr
-mkimage -A arm -T script -d /tmp/boot.scr $TARGET_DIR/boot/boot.scr.uimg
+mkimage -A arm -T script -d boot.scr $TARGET_DIR/boot/boot.scr.uimg
 
 if [ -e ${TARGET_DIR}/etc/inittab ]; then
 	grep -qE '^GS0::' ${TARGET_DIR}/etc/inittab || \

tp2bmc/board/tp2bmc/post_image.sh

@@ -12,9 +12,7 @@ INITRAMFS_DIR=$STAGING_DIR/initramfs/install
 
 # Prepare the SD image's FAT32 filesystem
 mkdir -p sdcard-bootpart/boot
-FDT_FILENAME=$(basename $TARGET_DIR/boot/*.dtb)
-sed s/FDT_FILENAME_HERE/${FDT_FILENAME}/g < $BOARD_DIR/install.scr > /tmp/install.scr
-mkimage -A arm -T script -d /tmp/install.scr sdcard-bootpart/boot/boot.scr.uimg
+mkimage -A arm -T script -d $BOARD_DIR/install.scr sdcard-bootpart/boot/boot.scr.uimg
 mkimage -A arm -T ramdisk -d installer.cpio.gz sdcard-bootpart/boot/install.img
 cp -r $BOARD_DIR/sdcard_overlay/* sdcard-bootpart/