diff --git a/target/linux/meson/Makefile b/target/linux/meson/Makefile index 3d7180431173d7..59d3d654a00c4b 100644 --- a/target/linux/meson/Makefile +++ b/target/linux/meson/Makefile @@ -1,18 +1,16 @@ -# SPDX-License-Identifier: GPL-2.0-or-later +# SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2017-2021 Stijn Tintel +# Copyright (C) 2006-2013 OpenWrt.org include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=meson BOARDNAME:=Amlogic Meson family -FEATURES:=audio boot-part ext4 fpu legacy-sdcard squashfs usbgadget -MAINTAINER:=Stijn Tintel -SUBTARGETS:=meson8b mesongx +FEATURES:=boot-part ext4 fpu legacy-sdcard squashfs usbgadget +SUBTARGETS:=meson8b -KERNEL_PATCHVER:=5.10 -KERNEL_TESTING_PATCHVER:=5.15 +KERNEL_PATCHVER:=6.1 define Target/Description Build firmware image for Amlogic Meson SoC devices. @@ -23,9 +21,11 @@ include $(INCLUDE_DIR)/target.mk DEFAULT_PACKAGES += \ e2fsprogs \ - kmod-sound-core \ - kmod-usb-hid \ mkf2fs \ + automount \ + resize2fs \ + parted \ + losetup \ partx-utils KERNELNAME:=Image dtbs diff --git a/target/linux/meson/image/Makefile b/target/linux/meson/image/Makefile index dfdb8c31791c94..ebb8c2d1c0c5c2 100644 --- a/target/linux/meson/image/Makefile +++ b/target/linux/meson/image/Makefile @@ -8,21 +8,19 @@ include $(INCLUDE_DIR)/image.mk FAT32_BLOCK_SIZE=1024 FAT32_BLOCKS=$(shell echo $$(($(CONFIG_TARGET_KERNEL_PARTSIZE)*1024*1024/$(FAT32_BLOCK_SIZE)))) -define Build/sdcard-img +define Build/boot-script + # Make an U-boot image and copy it to the boot partition + mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot.scr" -d boot.txt $(KDIR)/boot.scr +endef + +define Build/sdcard-common $(RM) -f $@.boot mkfs.fat -C $@.boot $(FAT32_BLOCKS) + mkdir -p $(KDIR)/boot.fat -#For S805 - mcopy -i $@.boot $(KDIR)/uInitrd :: - mcopy -i $@.boot $(KDIR)/s805_autoscript :: - mcopy -i $@.boot $(KDIR)/s805_autoscript.txt :: - mcopy -i $@.boot $(KDIR)/boot.scr :: - mcopy -i $@.boot $(KDIR)/boot.txt :: -#For S905 - mcopy -i $@.boot $(KDIR)/uEnv.ini :: - mcopy -i $@.boot $(KDIR)/s905_autoscript :: - mcopy -i $@.boot $(KDIR)/s905_autoscript.txt :: + $(CP) $(KDIR)/boot.scr $(KDIR)/boot.fat/boot.scr + mcopy -i $@.boot $(KDIR)/boot.scr :: $(CP) $(IMAGE_KERNEL) $(KDIR)/boot.fat/uImage mcopy -i $@.boot $(KDIR)/boot.fat/uImage :: @@ -33,92 +31,24 @@ define Build/sdcard-img ./gen_aml_sdcard_img.sh $@ $@.boot $(IMAGE_ROOTFS) \ $(CONFIG_TARGET_KERNEL_PARTSIZE) $(CONFIG_TARGET_ROOTFS_PARTSIZE) - -endef - -define Build/uImage-meson -#For S805 autoscript && boot.scr - $(RM) -rf $(KDIR)/uInitrd - $(RM) -rf $(KDIR)/s805_autoscript - $(RM) -rf $(KDIR)/s805_autoscript.txt - $(RM) -rf $(KDIR)/boot.scr - $(RM) -rf $(KDIR)/boot.txt - - -#For S905 autoscript - $(RM) -rf $(KDIR)/s905_autoscript - $(RM) -rf $(KDIR)/s905_autoscript.txt - $(RM) -rf $(KDIR)/uEnv.ini - - $(call Build/uImage,none) - -#For S805 autoscript && boot.scr - touch $(KDIR)/uInitrd - $(CP) s805_autoscript.txt $(KDIR)/s805_autoscript.txt - mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "s805_autoscript" -d s805_autoscript.txt $(KDIR)/s805_autoscript - $(CP) boot.txt $(KDIR)/boot.txt - mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "boot.scr" -d boot.txt $(KDIR)/boot.scr - -#For S905 autoscript - $(CP) uEnv.ini $(KDIR)/uEnv.ini - $(CP) s905_autoscript.txt $(KDIR)/s905_autoscript.txt - mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "s905_autoscript" -d s905_autoscript.txt $(KDIR)/s905_autoscript - endef ### Devices ### define Device/Default FILESYSTEMS := ext4 IMAGES := sdcard.img - IMAGE/sdcard.img := sdcard-img $$(DEVICE_NAME) KERNEL_DEPENDS = $$(wildcard $(DTS_DIR)/$$(DEVICE_DTS).dts) KERNEL_LOADADDR := 0x01080000 KERNEL_NAME := Image - KERNEL := kernel-bin | uImage-meson none + KERNEL := kernel-bin | uImage none PROFILES = Default $$(DEVICE_NAME) endef -define Device/odroid-c1 - DEVICE_DTS := meson8b-odroidc1 - DEVICE_PACKAGES += - DEVICE_TITLE := ODROID C1 - KERNEL_LOADADDR := 0x00208000 -endef -ifeq ($(SUBTARGET),meson8b) - TARGET_DEVICES += odroid-c1 -endif - -define Device/odroid-c2 - DEVICE_DTS := amlogic/meson-gxbb-odroidc2 - DEVICE_PACKAGES += - DEVICE_TITLE := ODROID C2 -endef -ifeq ($(SUBTARGET),mesongx) - TARGET_DEVICES += odroid-c2 -endif - -define Device/gxl-s905x-p212 - DEVICE_DTS := amlogic/meson-gxl-s905x-p212 - DEVICE_PACKAGES += - DEVICE_TITLE := S905X Design Reference Board -endef -ifeq ($(SUBTARGET),mesongx) - TARGET_DEVICES += gxl-s905x-p212 -endif - -define Device/gxm-q200 - DEVICE_DTS := amlogic/meson-gxm-q200 - DEVICE_PACKAGES += - DEVICE_TITLE := GXM Q200 Development Board -endef -ifeq ($(SUBTARGET),mesongx) - TARGET_DEVICES += gxm-q200 -endif - define Device/thunder-onecloud DEVICE_DTS := meson8b-onecloud DEVICE_TITLE := Thunder OneCloud KERNEL_LOADADDR := 0x00208000 + IMAGE/sdcard.img := boot-script onecloud | sdcard-common $$(DEVICE_NAME) endef ifeq ($(SUBTARGET),meson8b) TARGET_DEVICES += thunder-onecloud diff --git a/target/linux/meson/image/s805_autoscript.txt b/target/linux/meson/image/s805_autoscript.txt deleted file mode 100644 index 663d36db807e16..00000000000000 --- a/target/linux/meson/image/s805_autoscript.txt +++ /dev/null @@ -1,19 +0,0 @@ - -setenv condev "console=ttyAML0,115200n8 no_console_suspend consoleblank=0" -setenv bootargs "root=/dev/sda2 rootwait ro ${condev} fsck.repair=yes net.ifnames=0 mac=${mac}" -setenv bootargs_sd "root=/dev/mmcblk0p2 rootwait ro ${condev} fsck.repair=yes net.ifnames=0 mac=${mac}" -setenv kernel_loadaddr "0x00208000" -setenv dtb_loadaddr "0x21800000" -setenv initrd_loadaddr "0x22000000" -setenv dtb_name "dtb" -#setenv boot_start bootm ${kernel_loadaddr} ${initrd_loadaddr} ${dtb_loadaddr} -setenv boot_start bootm ${kernel_loadaddr} - ${dtb_loadaddr} - -if fatload usb 0 ${initrd_loadaddr} uInitrd; then if fatload usb 0 ${kernel_loadaddr} uImage; then if fatload usb 0 ${dtb_loadaddr} ${dtb_name}; then run boot_start; else imgread dtb boot ${loadaddr} ${dtb_loadaddr}; run boot_start;fi;fi;fi; -if fatload usb 1 ${initrd_loadaddr} uInitrd; then if fatload usb 1 ${kernel_loadaddr} uImage; then if fatload usb 1 ${dtb_loadaddr} ${dtb_name}; then run boot_start; else imgread dtb boot ${loadaddr} ${dtb_loadaddr}; run boot_start;fi;fi;fi; -if fatload usb 2 ${initrd_loadaddr} uInitrd; then if fatload usb 2 ${kernel_loadaddr} uImage; then if fatload usb 2 ${dtb_loadaddr} ${dtb_name}; then run boot_start; else imgread dtb boot ${loadaddr} ${dtb_loadaddr}; run boot_start;fi;fi;fi; -if fatload usb 3 ${initrd_loadaddr} uInitrd; then if fatload usb 3 ${kernel_loadaddr} uImage; then if fatload usb 3 ${dtb_loadaddr} ${dtb_name}; then run boot_start; else imgread dtb boot ${loadaddr} ${dtb_loadaddr}; run boot_start;fi;fi;fi; -if fatload mmc 0 ${initrd_loadaddr} uInitrd; setenv bootargs ${bootargs_sd}; then if fatload mmc 0 ${kernel_loadaddr} uImage; then if fatload mmc 0 ${dtb_loadaddr} ${dtb_name}; then run boot_start; else imgread dtb boot ${loadaddr} ${dtb_loadaddr}; run boot_start;fi;fi;fi; - -#rebuild -#mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "s805_autoscript" -d s805_autoscript.txt ./s805_autoscript diff --git a/target/linux/meson/image/s905_autoscript.txt b/target/linux/meson/image/s905_autoscript.txt deleted file mode 100644 index d1f589498d38b8..00000000000000 --- a/target/linux/meson/image/s905_autoscript.txt +++ /dev/null @@ -1,16 +0,0 @@ -setenv loadaddr "0x01080000" -setenv dtb_mem_addr "0x01000000" -setenv env_addr "0x1040000" -setenv boot_start 'bootm ${loadaddr} - ${dtb_mem_addr}' -setenv bootargs_ismmc 'if itest ${devtype} == mmc; then setenv bootargs ${bootargs_mmc}; fi' -setenv bootargs_isusb 'if itest ${devtype} == usb; then setenv bootargs ${bootargs_usb}; fi' -setenv try_boot_start 'if fatload ${devtype} ${devnum} ${loadaddr} uImage; then fatload ${devtype} ${devnum} ${env_addr} uEnv.ini && env import -t ${env_addr} ${filesize}; run bootargs_ismmc; run bootargs_isusb; printenv bootargs; fatload ${devtype} ${devnum} ${dtb_mem_addr} ${dtb_name} && run boot_start; fi' -setenv devtype mmc -setenv devnum 0 -run try_boot_start -setenv devtype usb -for devnum in 0 1 2 3 ; do run try_boot_start ; done - -#rebuild -#mkimage -A arm -O linux -T script -C none -a 0 -e 0 -n "s905_autoscript" -d s905_autoscript.txt ./s905_autoscript - diff --git a/target/linux/meson/image/uEnv.ini b/target/linux/meson/image/uEnv.ini deleted file mode 100644 index d758991737f95a..00000000000000 --- a/target/linux/meson/image/uEnv.ini +++ /dev/null @@ -1,3 +0,0 @@ -dtb_name=dtb -bootargs_mmc=root=/dev/mmcblk0p2 rootwait ro rootfstype=ext4,squashfs console=tty0, console=ttyAML0,115200 net.ifnames=0 -bootargs_usb=root=/dev/sda2 rootwait ro rootfstype=ext4,squashfs console=tty0 console=ttyAML0,115200 net.ifnames=0 diff --git a/target/linux/meson/meson8b/config-5.10 b/target/linux/meson/meson8b/config-5.10 deleted file mode 100644 index 3c467b3e116c3b..00000000000000 --- a/target/linux/meson/meson8b/config-5.10 +++ /dev/null @@ -1,482 +0,0 @@ -# CONFIG_AIO is not set -CONFIG_ALIGNMENT_TRAP=y -CONFIG_AMLOGIC_THERMAL=y -CONFIG_ARCH_32BIT_OFF_T=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_KEEP_MEMBLOCK=y -CONFIG_ARCH_MESON=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_ARCH_NR_GPIO=0 -CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y -CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM=y -CONFIG_ARM_GIC=y -CONFIG_ARM_CRYPTO=y -CONFIG_ARM_GLOBAL_TIMER=y -CONFIG_ARM_HAS_SG_CHAIN=y -CONFIG_ARM_HEAVY_MB=y -CONFIG_ARM_L1_CACHE_SHIFT=6 -CONFIG_ARM_L1_CACHE_SHIFT_6=y -CONFIG_ARM_PATCH_IDIV=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARM_THUMB=y -CONFIG_ARM_THUMBEE=y -CONFIG_ARM_UNWIND=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y -CONFIG_BLK_DEBUG_FS=y -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_PM=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_CACHE_L2X0=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y -CONFIG_CLKSRC_MMIO=y -CONFIG_CLK_QORIQ=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CLZ_TAB=y -CONFIG_CMA=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_SIZE_MBYTES=16 -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -CONFIG_COMMON_CLK=y -CONFIG_COMMON_CLK_CS2000_CP=y -CONFIG_COMMON_CLK_MESON8B=y -CONFIG_COMMON_CLK_MESON_MPLL=y -CONFIG_COMMON_CLK_MESON_PLL=y -CONFIG_COMMON_CLK_MESON_REGMAP=y -CONFIG_COMMON_CLK_PWM=y -CONFIG_COMPAT_32BIT_TIME=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CONTIG_ALLOC=y -CONFIG_COREDUMP=y -CONFIG_CPUFREQ_DT=y -CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -CONFIG_CPU_CACHE_V7=y -CONFIG_CPU_CACHE_VIPT=y -CONFIG_CPU_COPY_V6=y -CONFIG_CPU_CP15=y -CONFIG_CPU_CP15_MMU=y -CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_ONDEMAND=y -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -# CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_STAT is not set -CONFIG_CPU_FREQ_THERMAL=y -CONFIG_CPU_HAS_ASID=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_RMAP=y -CONFIG_CPU_SPECTRE=y -CONFIG_CPU_THERMAL=y -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_V7=y -CONFIG_CRC16=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_CRC32=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_SHA256=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -CONFIG_DMA_CMA=y -CONFIG_DMA_OPS=y -CONFIG_DMA_REMAP=y -CONFIG_DMA_SHARED_BUFFER=y -CONFIG_DRM=y -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_MALI_DISPLAY=y -# CONFIG_DRM_MESON is not set -CONFIG_DRM_PANEL=y -CONFIG_DRM_PANEL_BRIDGE=y -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y -CONFIG_DTC=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_DWMAC_DWC_QOS_ETH=y -# CONFIG_DWMAC_GENERIC is not set -CONFIG_DWMAC_MESON=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_ELF_CORE=y -# CONFIG_ENABLE_DEFAULT_TRACERS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_EXTCON=y -CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_FB=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_SYS_IMAGEBLIT=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -CONFIG_FONT_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FS_IOMAP=y -CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y -CONFIG_FTRACE=y -# CONFIG_FTRACE_SYSCALLS is not set -CONFIG_FW_LOADER_PAGED_BUF=y -CONFIG_GENERIC_ADC_THERMAL=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_ARCH_TOPOLOGY=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_CPU_VULNERABILITIES=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_GETTIMEOFDAY=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_MULTI_HANDLER=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_PHY=y -CONFIG_GENERIC_PINCONF=y -CONFIG_GENERIC_PINCTRL_GROUPS=y -CONFIG_GENERIC_PINMUX_FUNCTIONS=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GENERIC_VDSO_32=y -CONFIG_GLOB=y -CONFIG_GPIOLIB=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAVE_ARM_TWD=y -CONFIG_HAVE_SMP=y -CONFIG_HDMI=y -CONFIG_HWMON=y -CONFIG_HW_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MESON=y -CONFIG_HZ=100 -CONFIG_HZ_100=y -CONFIG_HZ_FIXED=0 -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_MESON=y -CONFIG_ICPLUS_PHY=y -CONFIG_IIO=y -CONFIG_INPUT=y -CONFIG_IPV6=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_IPV6_PIMSM_V2 is not set -CONFIG_IPV6_SUBTREES=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -# CONFIG_IR_IMON_RAW is not set -# CONFIG_IR_MESON is not set -# CONFIG_IR_SERIAL is not set -# CONFIG_IR_SIR is not set -# CONFIG_IR_TOY is not set -CONFIG_JBD2=y -CONFIG_KCMP=y -CONFIG_KEYS=y -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set -CONFIG_LEDS_GPIO=y -CONFIG_LIBFDT=y -CONFIG_LIB_MEMNEQ=y -# CONFIG_LIRC is not set -CONFIG_LOCK_DEBUGGING_SUPPORT=y -CONFIG_LOCK_SPIN_ON_OWNER=y -# CONFIG_MACH_MESON6 is not set -CONFIG_MACH_MESON8=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAILBOX=y -# CONFIG_MAILBOX_TEST is not set -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_BUS_MUX=y -# CONFIG_MDIO_BUS_MUX_MESON_G12A is not set -CONFIG_MDIO_BUS_MUX_MMIOREG=y -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_DEVRES=y -# CONFIG_MDIO_GPIO is not set -CONFIG_MEMFD_CREATE=y -CONFIG_MEMORY=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MESON6_TIMER=y -# CONFIG_MESON_CANVAS is not set -CONFIG_MESON_CLK_MEASURE=y -CONFIG_MESON_EE_PM_DOMAINS=y -# CONFIG_MESON_GXBB_WATCHDOG is not set -# CONFIG_MESON_GXL_PHY is not set -CONFIG_MESON_GX_PM_DOMAINS=y -# CONFIG_MESON_GX_SOCINFO is not set -CONFIG_MESON_IRQ_GPIO=y -CONFIG_MESON_MX_EFUSE=y -CONFIG_MESON_MX_SOCINFO=y -CONFIG_MESON_SARADC=y -CONFIG_MESON_WATCHDOG=y -# CONFIG_MFD_KHADAS_MCU is not set -CONFIG_MFD_SYSCON=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=32 -CONFIG_MMC_CQHCI=y -CONFIG_MMC_DW=y -# CONFIG_MMC_DW_BLUEFIELD is not set -# CONFIG_MMC_DW_EXYNOS is not set -# CONFIG_MMC_DW_HI3798CV200 is not set -CONFIG_MMC_DW_K3=y -CONFIG_MMC_DW_PLTFM=y -# CONFIG_MMC_MESON_GX is not set -CONFIG_MMC_MESON_MX_SDHC=y -CONFIG_MMC_MESON_MX_SDIO=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF_ARASAN=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MPILIB=y -CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEON=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_EMATCH=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NLS=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_NR_CPUS=4 -CONFIG_NVMEM=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_KOBJ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OID_REGISTRY=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_PADATA=y -CONFIG_PAGE_OFFSET=0xC0000000 -CONFIG_PAGE_POOL=y -CONFIG_PCS_XPCS=y -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -CONFIG_PHYLINK=y -CONFIG_PHY_MESON8B_USB2=y -# CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG is not set -# CONFIG_PHY_MESON_AXG_PCIE is not set -# CONFIG_PHY_MESON_G12A_USB2 is not set -# CONFIG_PHY_MESON_G12A_USB3_PCIE is not set -# CONFIG_PHY_MESON_GXL_USB2 is not set -CONFIG_PINCTRL=y -CONFIG_PINCTRL_MESON=y -CONFIG_PINCTRL_MESON8=y -CONFIG_PINCTRL_MESON8B=y -CONFIG_PINCTRL_MESON8_PMX=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set -CONFIG_PLATFORM_MHU=y -CONFIG_PM=y -CONFIG_PM_CLK=y -CONFIG_PM_GENERIC_DOMAINS=y -CONFIG_PM_GENERIC_DOMAINS_OF=y -CONFIG_PM_OPP=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_POWER_RESET=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_SUPPLY_HWMON=y -CONFIG_PPS=y -CONFIG_PRINTK_TIME=y -CONFIG_PTP_1588_CLOCK=y -CONFIG_PWM=y -CONFIG_PWM_MESON=y -CONFIG_PWM_SYSFS=y -CONFIG_RATIONAL=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RC_CORE=y -CONFIG_RC_DEVICES=y -# CONFIG_RC_XBOX_DVD is not set -CONFIG_REALTEK_AUTOPM=y -CONFIG_REALTEK_PHY=y -CONFIG_REGMAP=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y -CONFIG_REGULATOR_PWM=y -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_MESON=y -# CONFIG_RESET_MESON_AUDIO_ARB is not set -CONFIG_RFS_ACCEL=y -CONFIG_RPS=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_MESON=y -# CONFIG_RTC_DRV_MESON_VRTC is not set -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RTC_MC146818_LIB=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_SCHED_THERMAL_PRESSURE=y -CONFIG_SCSI=y -CONFIG_SDIO_UART=y -CONFIG_SENSORS_IIO_HWMON=y -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_MCTRL_GPIO=y -CONFIG_SERIAL_MESON=y -CONFIG_SERIAL_MESON_CONSOLE=y -CONFIG_SG_POOL=y -CONFIG_SMP=y -CONFIG_SMP_ON_UP=y -CONFIG_SOC_BUS=y -CONFIG_SPARSE_IRQ=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_MESON_SPICC=y -CONFIG_SPI_MESON_SPIFC=y -CONFIG_SRCU=y -CONFIG_STACKTRACE=y -CONFIG_STMMAC_ETH=y -CONFIG_STMMAC_PLATFORM=y -# CONFIG_STMMAC_SELFTESTS is not set -CONFIG_SWPHY=y -CONFIG_SWP_EMULATE=y -CONFIG_SYNC_FILE=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -CONFIG_THERMAL=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_OF=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TREE_RCU=y -CONFIG_TREE_SRCU=y -# CONFIG_UCLAMP_TASK is not set -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_UNWINDER_ARM=y -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_DUAL_ROLE=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_DUAL_ROLE=y -# CONFIG_USB_DWC3_GADGET is not set -# CONFIG_USB_DWC3_HOST is not set -# CONFIG_USB_DWC3_MESON_G12A is not set -CONFIG_USB_DWC3_OF_SIMPLE=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -# CONFIG_USB_ETH is not set -CONFIG_USB_GADGET=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_FSM=y -CONFIG_USB_PHY=y -CONFIG_USB_ROLE_SWITCH=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_REALTEK=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_ULPI=y -CONFIG_USB_ULPI_VIEWPORT=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PLATFORM=y -CONFIG_USE_OF=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_WATCHDOG_CORE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_XPS=y -CONFIG_ZBOOT_ROM_BSS=0 -CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y diff --git a/target/linux/meson/meson8b/config-5.15 b/target/linux/meson/meson8b/config-6.1 similarity index 81% rename from target/linux/meson/meson8b/config-5.15 rename to target/linux/meson/meson8b/config-6.1 index 3c467b3e116c3b..b577f16b840dc5 100644 --- a/target/linux/meson/meson8b/config-5.15 +++ b/target/linux/meson/meson8b/config-6.1 @@ -17,9 +17,9 @@ CONFIG_ARCH_SPARSEMEM_ENABLE=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARM=y CONFIG_ARM_GIC=y -CONFIG_ARM_CRYPTO=y CONFIG_ARM_GLOBAL_TIMER=y -CONFIG_ARM_HAS_SG_CHAIN=y +CONFIG_ARM_GT_INITIAL_PRESCALER_VAL=1 +CONFIG_ARM_HAS_GROUP_RELOCS=y CONFIG_ARM_HEAVY_MB=y CONFIG_ARM_L1_CACHE_SHIFT=6 CONFIG_ARM_L1_CACHE_SHIFT_6=y @@ -30,9 +30,6 @@ CONFIG_ARM_THUMBEE=y CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y CONFIG_AUTO_ZRELADDR=y CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEBUG_FS=y @@ -40,12 +37,12 @@ CONFIG_BLK_DEBUG_FS=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_PM=y -CONFIG_BLK_SCSI_REQUEST=y CONFIG_CACHE_L2X0=y -CONFIG_CLKDEV_LOOKUP=y +CONFIG_CC_HAVE_STACKPROTECTOR_TLS=y +CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5" +CONFIG_CC_NO_ARRAY_BOUNDS=y CONFIG_CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK=y CONFIG_CLKSRC_MMIO=y -CONFIG_CLK_QORIQ=y CONFIG_CLONE_BACKWARDS=y CONFIG_CLZ_TAB=y CONFIG_CMA=y @@ -58,6 +55,7 @@ CONFIG_CMA_SIZE_MBYTES=16 CONFIG_CMA_SIZE_SEL_MBYTES=y # CONFIG_CMA_SIZE_SEL_MIN is not set # CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set +CONFIG_CMA_SYSFS=y CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_CS2000_CP=y CONFIG_COMMON_CLK_MESON8B=y @@ -65,8 +63,11 @@ CONFIG_COMMON_CLK_MESON_MPLL=y CONFIG_COMMON_CLK_MESON_PLL=y CONFIG_COMMON_CLK_MESON_REGMAP=y CONFIG_COMMON_CLK_PWM=y +CONFIG_COMPACT_UNEVICTABLE_DEFAULT=1 CONFIG_COMPAT_32BIT_TIME=y CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_CONTEXT_TRACKING=y +CONFIG_CONTEXT_TRACKING_IDLE=y CONFIG_CONTIG_ALLOC=y CONFIG_COREDUMP=y CONFIG_CPUFREQ_DT=y @@ -80,19 +81,16 @@ CONFIG_CPU_COPY_V6=y CONFIG_CPU_CP15=y CONFIG_CPU_CP15_MMU=y CONFIG_CPU_FREQ=y -CONFIG_CPU_FREQ_DEFAULT_GOV_ONDEMAND=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -CONFIG_CPU_FREQ_GOV_COMMON=y +CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -CONFIG_CPU_FREQ_GOV_ONDEMAND=y +# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set CONFIG_CPU_FREQ_GOV_PERFORMANCE=y # CONFIG_CPU_FREQ_GOV_POWERSAVE is not set -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y # CONFIG_CPU_FREQ_GOV_USERSPACE is not set -# CONFIG_CPU_FREQ_STAT is not set +CONFIG_CPU_FREQ_STAT=y CONFIG_CPU_FREQ_THERMAL=y CONFIG_CPU_HAS_ASID=y +CONFIG_CPU_LITTLE_ENDIAN=y CONFIG_CPU_PABRT_V7=y CONFIG_CPU_RMAP=y CONFIG_CPU_SPECTRE=y @@ -109,34 +107,35 @@ CONFIG_CRYPTO_CRC32C=y CONFIG_CRYPTO_DRBG=y CONFIG_CRYPTO_DRBG_HMAC=y CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y +CONFIG_CRYPTO_LIB_SHA1=y CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_LIB_UTILS=y CONFIG_CRYPTO_RNG=y CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_RSA=y CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_SHA512=y +CONFIG_CURRENT_POINTER_IN_TPIDRURO=y CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_INFO=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DMA_CMA=y CONFIG_DMA_OPS=y -CONFIG_DMA_REMAP=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DRM=y CONFIG_DRM_BRIDGE=y CONFIG_DRM_FBDEV_EMULATION=y CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y +CONFIG_DRM_GEM_DMA_HELPER=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_MALI_DISPLAY=y # CONFIG_DRM_MESON is not set +CONFIG_DRM_NOMODESET=y CONFIG_DRM_PANEL=y CONFIG_DRM_PANEL_BRIDGE=y CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y @@ -149,6 +148,7 @@ CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_ELF_CORE=y # CONFIG_ENABLE_DEFAULT_TRACERS is not set +CONFIG_EXCLUSIVE_SYSTEM_RAM=y CONFIG_EXT4_FS=y CONFIG_EXT4_FS_SECURITY=y CONFIG_EXTCON=y @@ -169,6 +169,7 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_FONT_8x16=y CONFIG_FONT_8x8=y CONFIG_FONT_SUPPORT=y +# CONFIG_FORTIFY_SOURCE is not set CONFIG_FRAMEBUFFER_CONSOLE=y CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y # CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set @@ -177,7 +178,10 @@ CONFIG_FS_MBCACHE=y CONFIG_FS_POSIX_ACL=y CONFIG_FTRACE=y # CONFIG_FTRACE_SYSCALLS is not set +CONFIG_FWNODE_MDIO=y CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_FW_LOADER_SYSFS=y +CONFIG_GCC11_NO_ARRAY_BOUNDS=y CONFIG_GENERIC_ADC_THERMAL=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ARCH_TOPOLOGY=y @@ -194,6 +198,7 @@ CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_LIB_DEVMEM_IS_ALLOWED=y CONFIG_GENERIC_PCI_IOMAP=y CONFIG_GENERIC_PHY=y CONFIG_GENERIC_PINCONF=y @@ -206,22 +211,21 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GENERIC_TIME_VSYSCALL=y CONFIG_GENERIC_VDSO_32=y CONFIG_GLOB=y -CONFIG_GPIOLIB=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDEN_BRANCH_PREDICTOR=y +CONFIG_GPIO_CDEV=y +# CONFIG_HARDENED_USERCOPY is not set +# CONFIG_HARDEN_BRANCH_HISTORY is not set +# CONFIG_HARDEN_BRANCH_PREDICTOR is not set CONFIG_HARDIRQS_SW_RESEND=y CONFIG_HAS_DMA=y CONFIG_HAS_IOMEM=y CONFIG_HAS_IOPORT_MAP=y -CONFIG_HAVE_ARM_TWD=y CONFIG_HAVE_SMP=y CONFIG_HDMI=y +# CONFIG_HIST_TRIGGERS is not set CONFIG_HWMON=y CONFIG_HW_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_MESON=y -CONFIG_HZ=100 -CONFIG_HZ_100=y CONFIG_HZ_FIXED=0 CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y @@ -237,23 +241,18 @@ CONFIG_IPV6_MULTIPLE_TABLES=y CONFIG_IPV6_SUBTREES=y CONFIG_IP_MROUTE_COMMON=y CONFIG_IRQCHIP=y +CONFIG_IRQSTACKS=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_HIERARCHY=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y -# CONFIG_IR_IMON_RAW is not set # CONFIG_IR_MESON is not set -# CONFIG_IR_SERIAL is not set -# CONFIG_IR_SIR is not set -# CONFIG_IR_TOY is not set +CONFIG_IR_MESON_TX=y CONFIG_JBD2=y CONFIG_KCMP=y -CONFIG_KEYS=y # CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set CONFIG_LEDS_GPIO=y CONFIG_LIBFDT=y -CONFIG_LIB_MEMNEQ=y -# CONFIG_LIRC is not set CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y # CONFIG_MACH_MESON6 is not set @@ -279,9 +278,7 @@ CONFIG_MESON_EE_PM_DOMAINS=y # CONFIG_MESON_GXBB_WATCHDOG is not set # CONFIG_MESON_GXL_PHY is not set CONFIG_MESON_GX_PM_DOMAINS=y -# CONFIG_MESON_GX_SOCINFO is not set CONFIG_MESON_IRQ_GPIO=y -CONFIG_MESON_MX_EFUSE=y CONFIG_MESON_MX_SOCINFO=y CONFIG_MESON_SARADC=y CONFIG_MESON_WATCHDOG=y @@ -317,11 +314,13 @@ CONFIG_NET_CLS_ACT=y CONFIG_NET_EMATCH=y CONFIG_NET_FLOW_LIMIT=y CONFIG_NET_PTP_CLASSIFY=y +CONFIG_NET_SELFTESTS=y CONFIG_NLS=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NR_CPUS=4 CONFIG_NVMEM=y +CONFIG_NVMEM_MESON_MX_EFUSE=y CONFIG_OF=y CONFIG_OF_ADDRESS=y CONFIG_OF_EARLY_FLATTREE=y @@ -330,7 +329,6 @@ CONFIG_OF_GPIO=y CONFIG_OF_IRQ=y CONFIG_OF_KOBJ=y CONFIG_OF_MDIO=y -CONFIG_OF_NET=y CONFIG_OID_REGISTRY=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y @@ -339,14 +337,19 @@ CONFIG_OUTER_CACHE_SYNC=y CONFIG_PADATA=y CONFIG_PAGE_OFFSET=0xC0000000 CONFIG_PAGE_POOL=y +CONFIG_PAGE_SIZE_LESS_THAN_256KB=y +CONFIG_PAGE_SIZE_LESS_THAN_64KB=y CONFIG_PCS_XPCS=y CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y CONFIG_PHYLINK=y CONFIG_PHY_MESON8B_USB2=y +# CONFIG_PHY_MESON8_HDMI_TX is not set +# CONFIG_PHY_MESON_AXG_MIPI_DPHY is not set # CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG is not set # CONFIG_PHY_MESON_AXG_PCIE is not set +# CONFIG_PHY_MESON_G12A_MIPI_DPHY_ANALOG is not set # CONFIG_PHY_MESON_G12A_USB2 is not set # CONFIG_PHY_MESON_G12A_USB3_PCIE is not set # CONFIG_PHY_MESON_GXL_USB2 is not set @@ -355,8 +358,6 @@ CONFIG_PINCTRL_MESON=y CONFIG_PINCTRL_MESON8=y CONFIG_PINCTRL_MESON8B=y CONFIG_PINCTRL_MESON8_PMX=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set CONFIG_PLATFORM_MHU=y CONFIG_PM=y CONFIG_PM_CLK=y @@ -369,21 +370,23 @@ CONFIG_POWER_RESET=y CONFIG_POWER_SUPPLY=y CONFIG_POWER_SUPPLY_HWMON=y CONFIG_PPS=y +CONFIG_PREEMPT_NONE_BUILD=y CONFIG_PRINTK_TIME=y CONFIG_PTP_1588_CLOCK=y +CONFIG_PTP_1588_CLOCK_OPTIONAL=y CONFIG_PWM=y CONFIG_PWM_MESON=y CONFIG_PWM_SYSFS=y +CONFIG_RANDSTRUCT_NONE=y CONFIG_RATIONAL=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_STALL_COMMON=y CONFIG_RC_CORE=y CONFIG_RC_DEVICES=y -# CONFIG_RC_XBOX_DVD is not set CONFIG_REALTEK_AUTOPM=y CONFIG_REALTEK_PHY=y CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_SPI=y CONFIG_REGULATOR=y CONFIG_REGULATOR_FIXED_VOLTAGE=y CONFIG_REGULATOR_GPIO=y @@ -401,7 +404,9 @@ CONFIG_RTC_MC146818_LIB=y CONFIG_RWSEM_SPIN_ON_OWNER=y CONFIG_SCHED_THERMAL_PRESSURE=y CONFIG_SCSI=y +CONFIG_SCSI_COMMON=y CONFIG_SDIO_UART=y +# CONFIG_SECURITY_DMESG_RESTRICT is not set CONFIG_SENSORS_IIO_HWMON=y CONFIG_SERIAL_8250_FSL=y CONFIG_SERIAL_MCTRL_GPIO=y @@ -410,7 +415,31 @@ CONFIG_SERIAL_MESON_CONSOLE=y CONFIG_SG_POOL=y CONFIG_SMP=y CONFIG_SMP_ON_UP=y +CONFIG_SND=y +# CONFIG_SND_COMPRESS_OFFLOAD is not set +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +# CONFIG_SND_MESON_AIU is not set +# CONFIG_SND_MESON_AXG_FRDDR is not set +# CONFIG_SND_MESON_AXG_PDM is not set +# CONFIG_SND_MESON_AXG_SOUND_CARD is not set +# CONFIG_SND_MESON_AXG_SPDIFIN is not set +# CONFIG_SND_MESON_AXG_SPDIFOUT is not set +# CONFIG_SND_MESON_AXG_TDMIN is not set +# CONFIG_SND_MESON_AXG_TDMOUT is not set +# CONFIG_SND_MESON_AXG_TODDR is not set +# CONFIG_SND_MESON_G12A_TOACODEC is not set +# CONFIG_SND_MESON_G12A_TOHDMITX is not set +# CONFIG_SND_MESON_GX_SOUND_CARD is not set +CONFIG_SND_PCM=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_I2C_AND_SPI=y +# CONFIG_SND_SOC_MESON_T9015 is not set +CONFIG_SOCK_RX_QUEUE_MAPPING=y CONFIG_SOC_BUS=y +CONFIG_SOFTIRQ_ON_OWN_STACK=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_MASTER=y @@ -420,7 +449,6 @@ CONFIG_SRCU=y CONFIG_STACKTRACE=y CONFIG_STMMAC_ETH=y CONFIG_STMMAC_PLATFORM=y -# CONFIG_STMMAC_SELFTESTS is not set CONFIG_SWPHY=y CONFIG_SWP_EMULATE=y CONFIG_SYNC_FILE=y @@ -431,12 +459,12 @@ CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 CONFIG_THERMAL_GOV_STEP_WISE=y CONFIG_THERMAL_HWMON=y CONFIG_THERMAL_OF=y +CONFIG_THREAD_INFO_IN_TASK=y CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y CONFIG_TREE_RCU=y CONFIG_TREE_SRCU=y -# CONFIG_UCLAMP_TASK is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_UNWINDER_ARM=y CONFIG_USB=y @@ -451,7 +479,6 @@ CONFIG_USB_DWC3_DUAL_ROLE=y CONFIG_USB_DWC3_OF_SIMPLE=y CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD_PLATFORM=y -# CONFIG_USB_ETH is not set CONFIG_USB_GADGET=y CONFIG_USB_OHCI_HCD=y CONFIG_USB_OHCI_HCD_PLATFORM=y @@ -474,9 +501,7 @@ CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_HW_CONSOLE_BINDING=y CONFIG_WATCHDOG_CORE=y -CONFIG_X509_CERTIFICATE_PARSER=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_XPS=y CONFIG_ZBOOT_ROM_BSS=0 CONFIG_ZBOOT_ROM_TEXT=0 -CONFIG_IP_NF_TARGET_REDIRECT=y -CONFIG_IP_NF_TARGET_MASQUERADE=y diff --git a/target/linux/meson/meson8b/target.mk b/target/linux/meson/meson8b/target.mk index 9b8dba026ad025..75bf85120e4886 100644 --- a/target/linux/meson/meson8b/target.mk +++ b/target/linux/meson/meson8b/target.mk @@ -1,20 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-only # -# Copyright (C) 2020 ChalesYu <574249312@qq.com> -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# +# Copyright (C) 2006-2013 OpenWrt.org ARCH:=arm SUBTARGET:=meson8b BOARDNAME:=Amlogic S805 boards (32 bit) CPU_TYPE:=cortex-a5 CPU_SUBTYPE:=vfpv4 -MAINTAINER:=ChalesYu <574249312@qq.com> define Target/Description Build firmware image for Amlogic S805 SoC devices. This firmware features a 32 bit kernel. endef - diff --git a/target/linux/meson/mesongx/config-5.10 b/target/linux/meson/mesongx/config-5.10 deleted file mode 100644 index 6023a2b497d5e1..00000000000000 --- a/target/linux/meson/mesongx/config-5.10 +++ /dev/null @@ -1,518 +0,0 @@ -CONFIG_64BIT=y -# CONFIG_AIO is not set -CONFIG_AMLOGIC_THERMAL=y -CONFIG_ARCH_DMA_ADDR_T_64BIT=y -CONFIG_ARCH_KEEP_MEMBLOCK=y -CONFIG_ARCH_MESON=y -CONFIG_ARCH_MMAP_RND_BITS=18 -CONFIG_ARCH_MMAP_RND_BITS_MAX=33 -CONFIG_ARCH_MMAP_RND_BITS_MIN=18 -CONFIG_ARCH_MMAP_RND_COMPAT_BITS_MIN=11 -CONFIG_ARCH_PROC_KCORE_TEXT=y -CONFIG_ARCH_SELECT_MEMORY_MODEL=y -CONFIG_ARCH_SPARSEMEM_DEFAULT=y -CONFIG_ARCH_SPARSEMEM_ENABLE=y -CONFIG_ARCH_STACKWALK=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARM64=y -CONFIG_ARM64_4K_PAGES=y -CONFIG_ARM64_CNP=y -CONFIG_ARM64_ERRATUM_1165522=y -CONFIG_ARM64_ERRATUM_1286807=y -CONFIG_ARM64_ERRATUM_819472=y -CONFIG_ARM64_ERRATUM_824069=y -CONFIG_ARM64_ERRATUM_826319=y -CONFIG_ARM64_ERRATUM_827319=y -CONFIG_ARM64_ERRATUM_843419=y -CONFIG_ARM64_ERRATUM_858921=y -CONFIG_ARM64_HW_AFDBM=y -CONFIG_ARM64_MODULE_PLTS=y -CONFIG_ARM64_PAGE_SHIFT=12 -CONFIG_ARM64_PAN=y -CONFIG_ARM64_PA_BITS=48 -CONFIG_ARM64_PA_BITS_48=y -CONFIG_ARM64_PMEM=y -CONFIG_ARM64_PTR_AUTH=y -CONFIG_ARM64_SVE=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set -CONFIG_ARM64_TAGGED_ADDR_ABI=y -CONFIG_ARM64_UAO=y -CONFIG_ARM64_VA_BITS=48 -# CONFIG_ARM64_VA_BITS_39 is not set -CONFIG_ARM64_VA_BITS_48=y -CONFIG_ARM64_VHE=y -CONFIG_ARM64_WORKAROUND_CLEAN_CACHE=y -CONFIG_ARM64_WORKAROUND_REPEAT_TLBI=y -CONFIG_ARM64_WORKAROUND_SPECULATIVE_AT=y -CONFIG_ARM_AMBA=y -CONFIG_ARM_ARCH_TIMER=y -CONFIG_ARM_ARCH_TIMER_EVTSTREAM=y -CONFIG_ARM_ARCH_TIMER_OOL_WORKAROUND=y -CONFIG_ARM_GIC=y -CONFIG_ARM_GIC_V3=y -CONFIG_ARM_GIC_V3_ITS=y -CONFIG_ARM_PSCI_FW=y -CONFIG_ARM_SCPI_CPUFREQ=y -CONFIG_ARM_SCPI_POWER_DOMAIN=y -CONFIG_ARM_SCPI_PROTOCOL=y -CONFIG_ASN1=y -CONFIG_ASSOCIATIVE_ARRAY=y -CONFIG_ASYMMETRIC_KEY_TYPE=y -CONFIG_ASYMMETRIC_PUBLIC_KEY_SUBTYPE=y -CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -CONFIG_BLK_DEBUG_FS=y -# CONFIG_BLK_DEV_INITRD is not set -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_PM=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_CAVIUM_TX2_ERRATUM_219=y -CONFIG_CC_HAVE_STACKPROTECTOR_SYSREG=y -# CONFIG_CEC_CH7322 is not set -# CONFIG_CEC_MESON_AO is not set -# CONFIG_CEC_MESON_G12A_AO is not set -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLK_QORIQ=y -CONFIG_CLONE_BACKWARDS=y -CONFIG_CLZ_TAB=y -CONFIG_CMA=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_AREAS=7 -# CONFIG_CMA_DEBUG is not set -# CONFIG_CMA_DEBUGFS is not set -CONFIG_CMA_SIZE_MBYTES=16 -# CONFIG_CMA_SIZE_SEL_MAX is not set -CONFIG_CMA_SIZE_SEL_MBYTES=y -# CONFIG_CMA_SIZE_SEL_MIN is not set -# CONFIG_CMA_SIZE_SEL_PERCENTAGE is not set -CONFIG_COMMON_CLK=y -CONFIG_COMMON_CLK_AXG=y -# CONFIG_COMMON_CLK_AXG_AUDIO is not set -CONFIG_COMMON_CLK_CS2000_CP=y -CONFIG_COMMON_CLK_G12A=y -CONFIG_COMMON_CLK_GXBB=y -CONFIG_COMMON_CLK_MESON_AO_CLKC=y -CONFIG_COMMON_CLK_MESON_CPU_DYNDIV=y -CONFIG_COMMON_CLK_MESON_DUALDIV=y -CONFIG_COMMON_CLK_MESON_EE_CLKC=y -CONFIG_COMMON_CLK_MESON_MPLL=y -CONFIG_COMMON_CLK_MESON_PLL=y -CONFIG_COMMON_CLK_MESON_REGMAP=y -CONFIG_COMMON_CLK_MESON_VID_PLL_DIV=y -CONFIG_COMMON_CLK_PWM=y -CONFIG_COMMON_CLK_SCPI=y -CONFIG_COMMON_CLK_XGENE=y -# CONFIG_COMPAT_32BIT_TIME is not set -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_CONTIG_ALLOC=y -CONFIG_COREDUMP=y -CONFIG_CPUFREQ_DT=y -CONFIG_CPUFREQ_DT_PLATDEV=y -CONFIG_CPU_FREQ=y -# CONFIG_CPU_FREQ_DEFAULT_GOV_PERFORMANCE is not set -CONFIG_CPU_FREQ_DEFAULT_GOV_SCHEDUTIL=y -CONFIG_CPU_FREQ_GOV_ATTR_SET=y -# CONFIG_CPU_FREQ_GOV_CONSERVATIVE is not set -# CONFIG_CPU_FREQ_GOV_ONDEMAND is not set -CONFIG_CPU_FREQ_GOV_PERFORMANCE=y -CONFIG_CPU_FREQ_GOV_POWERSAVE=y -CONFIG_CPU_FREQ_GOV_SCHEDUTIL=y -# CONFIG_CPU_FREQ_GOV_USERSPACE is not set -CONFIG_CPU_FREQ_STAT=y -CONFIG_CPU_FREQ_THERMAL=y -CONFIG_CPU_RMAP=y -CONFIG_CPU_THERMAL=y -CONFIG_CRC16=y -CONFIG_CRC7=y -CONFIG_CRC_ITU_T=y -CONFIG_CRYPTO_CMAC=y -CONFIG_CRYPTO_CRC32=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_HASH_INFO=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_LIB_BLAKE2S_GENERIC=y -CONFIG_CRYPTO_LIB_SHA256=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_RSA=y -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_SHA256=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_DMA_CMA=y -CONFIG_DMA_DIRECT_REMAP=y -CONFIG_DMA_REMAP=y -CONFIG_DMA_SHARED_BUFFER=y -CONFIG_DRM=y -CONFIG_DRM_BRIDGE=y -CONFIG_DRM_DW_HDMI=y -# CONFIG_DRM_DW_HDMI_I2S_AUDIO is not set -CONFIG_DRM_FBDEV_EMULATION=y -CONFIG_DRM_FBDEV_OVERALLOC=100 -CONFIG_DRM_GEM_CMA_HELPER=y -CONFIG_DRM_KMS_CMA_HELPER=y -CONFIG_DRM_KMS_FB_HELPER=y -CONFIG_DRM_KMS_HELPER=y -CONFIG_DRM_MALI_DISPLAY=y -CONFIG_DRM_MESON=y -CONFIG_DRM_MESON_DW_HDMI=y -CONFIG_DRM_PANEL=y -CONFIG_DRM_PANEL_BRIDGE=y -CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y -CONFIG_DTC=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_DVB_CORE=y -CONFIG_DWMAC_DWC_QOS_ETH=y -# CONFIG_DWMAC_GENERIC is not set -CONFIG_DWMAC_MESON=y -CONFIG_EDAC_SUPPORT=y -CONFIG_ELF_CORE=y -# CONFIG_ENABLE_DEFAULT_TRACERS is not set -CONFIG_EXT4_FS=y -CONFIG_EXT4_FS_SECURITY=y -CONFIG_EXTCON=y -CONFIG_F2FS_FS=y -CONFIG_F2FS_FS_POSIX_ACL=y -CONFIG_FB=y -CONFIG_FB_CFB_COPYAREA=y -CONFIG_FB_CFB_FILLRECT=y -CONFIG_FB_CFB_IMAGEBLIT=y -CONFIG_FB_CMDLINE=y -CONFIG_FB_DEFERRED_IO=y -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_SYS_IMAGEBLIT=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -# CONFIG_FLATMEM_MANUAL is not set -CONFIG_FONT_8x16=y -CONFIG_FONT_8x8=y -CONFIG_FONT_SUPPORT=y -CONFIG_FRAMEBUFFER_CONSOLE=y -CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY=y -# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set -CONFIG_FRAME_POINTER=y -CONFIG_FSL_ERRATUM_A008585=y -CONFIG_FS_IOMAP=y -CONFIG_FS_MBCACHE=y -CONFIG_FS_POSIX_ACL=y -CONFIG_FTRACE=y -# CONFIG_FTRACE_SYSCALLS is not set -CONFIG_FUJITSU_ERRATUM_010001=y -CONFIG_FW_LOADER_PAGED_BUF=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_ARCH_TOPOLOGY=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CLOCKEVENTS_BROADCAST=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_CPU_VULNERABILITIES=y -CONFIG_GENERIC_CSUM=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_GETTIMEOFDAY=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y -CONFIG_GENERIC_IRQ_MULTI_HANDLER=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_MSI_IRQ=y -CONFIG_GENERIC_MSI_IRQ_DOMAIN=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_PHY=y -CONFIG_GENERIC_PINCONF=y -CONFIG_GENERIC_PINCTRL_GROUPS=y -CONFIG_GENERIC_PINMUX_FUNCTIONS=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GENERIC_TIME_VSYSCALL=y -CONFIG_GLOB=y -CONFIG_GPIOLIB=y -CONFIG_HANDLE_DOMAIN_IRQ=y -CONFIG_HARDIRQS_SW_RESEND=y -CONFIG_HAS_DMA=y -CONFIG_HAS_IOMEM=y -CONFIG_HDMI=y -# CONFIG_HIST_TRIGGERS is not set -CONFIG_HOLES_IN_ZONE=y -CONFIG_HWMON=y -CONFIG_HW_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_MESON=y -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_MESON=y -CONFIG_ICPLUS_PHY=y -CONFIG_IIO=y -CONFIG_ILLEGAL_POINTER_VALUE=0xdead000000000000 -CONFIG_INPUT=y -CONFIG_IPV6=y -CONFIG_IPV6_MROUTE=y -CONFIG_IPV6_MULTIPLE_TABLES=y -# CONFIG_IPV6_PIMSM_V2 is not set -CONFIG_IPV6_SUBTREES=y -CONFIG_IP_MROUTE_COMMON=y -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_HIERARCHY=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -# CONFIG_IR_IMON_RAW is not set -CONFIG_IR_MESON=y -# CONFIG_IR_SERIAL is not set -# CONFIG_IR_SIR is not set -# CONFIG_IR_TOY is not set -CONFIG_JBD2=y -CONFIG_KCMP=y -CONFIG_KEYS=y -# CONFIG_LEDS_BRIGHTNESS_HW_CHANGED is not set -CONFIG_LEDS_GPIO=y -CONFIG_LIBFDT=y -CONFIG_LIB_MEMNEQ=y -# CONFIG_LIRC is not set -CONFIG_LOCK_DEBUGGING_SUPPORT=y -CONFIG_LOCK_SPIN_ON_OWNER=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_MAILBOX=y -# CONFIG_MAILBOX_TEST is not set -CONFIG_MDIO_BITBANG=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_BUS_MUX=y -# CONFIG_MDIO_BUS_MUX_MESON_G12A is not set -CONFIG_MDIO_BUS_MUX_MMIOREG=y -CONFIG_MDIO_DEVICE=y -CONFIG_MDIO_DEVRES=y -# CONFIG_MDIO_GPIO is not set -CONFIG_MEDIA_ANALOG_TV_SUPPORT=y -CONFIG_MEDIA_ATTACH=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_CEC_SUPPORT=y -CONFIG_MEDIA_DIGITAL_TV_SUPPORT=y -CONFIG_MEDIA_PLATFORM_SUPPORT=y -CONFIG_MEDIA_RADIO_SUPPORT=y -CONFIG_MEDIA_SDR_SUPPORT=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_TEST_SUPPORT=y -CONFIG_MEDIA_TUNER=y -CONFIG_MEMFD_CREATE=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MESON_CANVAS=y -CONFIG_MESON_CLK_MEASURE=y -CONFIG_MESON_EE_PM_DOMAINS=y -CONFIG_MESON_EFUSE=y -CONFIG_MESON_GXBB_WATCHDOG=y -CONFIG_MESON_GXL_PHY=y -CONFIG_MESON_GX_PM_DOMAINS=y -CONFIG_MESON_GX_SOCINFO=y -CONFIG_MESON_IRQ_GPIO=y -# CONFIG_MESON_MX_EFUSE is not set -CONFIG_MESON_MX_SOCINFO=y -CONFIG_MESON_SARADC=y -CONFIG_MESON_SECURE_PM_DOMAINS=y -CONFIG_MESON_SM=y -CONFIG_MESON_WATCHDOG=y -# CONFIG_MFD_KHADAS_MCU is not set -CONFIG_MFD_SYSCON=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_ARMMMCI=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_BLOCK_MINORS=32 -CONFIG_MMC_CQHCI=y -CONFIG_MMC_DW=y -# CONFIG_MMC_DW_BLUEFIELD is not set -# CONFIG_MMC_DW_EXYNOS is not set -# CONFIG_MMC_DW_HI3798CV200 is not set -CONFIG_MMC_DW_K3=y -CONFIG_MMC_DW_PLTFM=y -CONFIG_MMC_MESON_GX=y -# CONFIG_MMC_MESON_MX_SDIO is not set -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF_ARASAN=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -CONFIG_MMC_STM32_SDMMC=y -CONFIG_MODULES_USE_ELF_RELA=y -CONFIG_MPILIB=y -CONFIG_MQ_IOSCHED_DEADLINE=y -CONFIG_MQ_IOSCHED_KYBER=y -CONFIG_MUTEX_SPIN_ON_OWNER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_SG_DMA_LENGTH=y -CONFIG_NET_CLS_ACT=y -CONFIG_NET_EMATCH=y -CONFIG_NET_FLOW_LIMIT=y -CONFIG_NET_PTP_CLASSIFY=y -CONFIG_NLS=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_NO_IOPORT_MAP=y -CONFIG_NR_CPUS=8 -CONFIG_NVMEM=y -CONFIG_OF=y -CONFIG_OF_ADDRESS=y -CONFIG_OF_EARLY_FLATTREE=y -CONFIG_OF_FLATTREE=y -CONFIG_OF_GPIO=y -CONFIG_OF_IRQ=y -CONFIG_OF_KOBJ=y -CONFIG_OF_MDIO=y -CONFIG_OF_NET=y -CONFIG_OID_REGISTRY=y -CONFIG_PADATA=y -CONFIG_PAGE_POOL=y -CONFIG_PARTITION_PERCPU=y -CONFIG_PCS_XPCS=y -CONFIG_PGTABLE_LEVELS=4 -CONFIG_PHYLIB=y -CONFIG_PHYLINK=y -CONFIG_PHYS_ADDR_T_64BIT=y -CONFIG_PHY_MESON8B_USB2=y -CONFIG_PHY_MESON_AXG_MIPI_PCIE_ANALOG=y -CONFIG_PHY_MESON_AXG_PCIE=y -# CONFIG_PHY_MESON_G12A_USB2 is not set -# CONFIG_PHY_MESON_G12A_USB3_PCIE is not set -CONFIG_PHY_MESON_GXL_USB2=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_MESON=y -CONFIG_PINCTRL_MESON8_PMX=y -# CONFIG_PINCTRL_MESON_A1 is not set -# CONFIG_PINCTRL_MESON_AXG is not set -# CONFIG_PINCTRL_MESON_G12A is not set -CONFIG_PINCTRL_MESON_GXBB=y -CONFIG_PINCTRL_MESON_GXL=y -CONFIG_PKCS7_MESSAGE_PARSER=y -# CONFIG_PKCS8_PRIVATE_KEY_PARSER is not set -CONFIG_PLATFORM_MHU=y -CONFIG_PM=y -CONFIG_PM_CLK=y -CONFIG_PM_GENERIC_DOMAINS=y -CONFIG_PM_GENERIC_DOMAINS_OF=y -CONFIG_PM_OPP=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_POWER_RESET=y -CONFIG_POWER_SUPPLY=y -CONFIG_POWER_SUPPLY_HWMON=y -CONFIG_PPS=y -CONFIG_PRINTK_TIME=y -CONFIG_PTP_1588_CLOCK=y -CONFIG_PWM=y -CONFIG_PWM_MESON=y -CONFIG_PWM_SYSFS=y -CONFIG_QUEUED_RWLOCKS=y -CONFIG_QUEUED_SPINLOCKS=y -CONFIG_RATIONAL=y -CONFIG_RCU_NEED_SEGCBLIST=y -CONFIG_RCU_STALL_COMMON=y -CONFIG_RC_CORE=y -CONFIG_RC_DEVICES=y -# CONFIG_RC_XBOX_DVD is not set -CONFIG_REALTEK_AUTOPM=y -CONFIG_REALTEK_PHY=y -CONFIG_REGMAP=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_REGULATOR_GPIO=y -CONFIG_REGULATOR_PWM=y -CONFIG_RESET_CONTROLLER=y -CONFIG_RESET_MESON=y -# CONFIG_RESET_MESON_AUDIO_ARB is not set -CONFIG_RFS_ACCEL=y -CONFIG_RODATA_FULL_DEFAULT_ENABLED=y -CONFIG_RPS=y -CONFIG_RWSEM_SPIN_ON_OWNER=y -CONFIG_SCHED_THERMAL_PRESSURE=y -CONFIG_SCSI=y -CONFIG_SDIO_UART=y -CONFIG_SENSORS_ARM_SCPI=y -CONFIG_SERIAL_8250_FSL=y -CONFIG_SERIAL_MCTRL_GPIO=y -CONFIG_SERIAL_MESON=y -CONFIG_SERIAL_MESON_CONSOLE=y -CONFIG_SG_POOL=y -CONFIG_SMP=y -CONFIG_SOC_BUS=y -CONFIG_SPARSEMEM=y -CONFIG_SPARSEMEM_EXTREME=y -CONFIG_SPARSEMEM_MANUAL=y -CONFIG_SPARSEMEM_VMEMMAP=y -CONFIG_SPARSEMEM_VMEMMAP_ENABLE=y -CONFIG_SPARSE_IRQ=y -CONFIG_SPI=y -CONFIG_SPI_MASTER=y -CONFIG_SPI_MESON_SPICC=y -CONFIG_SPI_MESON_SPIFC=y -CONFIG_SRCU=y -CONFIG_STACKTRACE=y -CONFIG_STMMAC_ETH=y -CONFIG_STMMAC_PLATFORM=y -# CONFIG_STMMAC_SELFTESTS is not set -CONFIG_SWIOTLB=y -CONFIG_SWPHY=y -CONFIG_SYNC_FILE=y -CONFIG_SYSCTL_EXCEPTION_TRACE=y -CONFIG_SYS_SUPPORTS_HUGETLBFS=y -CONFIG_THERMAL=y -CONFIG_THERMAL_DEFAULT_GOV_STEP_WISE=y -CONFIG_THERMAL_EMERGENCY_POWEROFF_DELAY_MS=0 -CONFIG_THERMAL_GOV_STEP_WISE=y -CONFIG_THERMAL_HWMON=y -CONFIG_THERMAL_OF=y -CONFIG_THREAD_INFO_IN_TASK=y -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TREE_RCU=y -CONFIG_TREE_SRCU=y -# CONFIG_UCLAMP_TASK is not set -CONFIG_UNMAP_KERNEL_AT_EL0=y -CONFIG_USB=y -CONFIG_USB_COMMON=y -CONFIG_USB_DWC2=y -CONFIG_USB_DWC2_DUAL_ROLE=y -CONFIG_USB_DWC3=y -CONFIG_USB_DWC3_DUAL_ROLE=y -# CONFIG_USB_DWC3_GADGET is not set -# CONFIG_USB_DWC3_HOST is not set -CONFIG_USB_DWC3_MESON_G12A=y -CONFIG_USB_DWC3_OF_SIMPLE=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_PLATFORM=y -# CONFIG_USB_ETH is not set -CONFIG_USB_GADGET=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -CONFIG_USB_OTG=y -CONFIG_USB_OTG_FSM=y -CONFIG_USB_PHY=y -# CONFIG_USB_PULSE8_CEC is not set -# CONFIG_USB_RAINSHADOW_CEC is not set -CONFIG_USB_ROLE_SWITCH=y -CONFIG_USB_STORAGE=y -CONFIG_USB_STORAGE_REALTEK=y -CONFIG_USB_SUPPORT=y -CONFIG_USB_ULPI=y -CONFIG_USB_ULPI_VIEWPORT=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_XHCI_PLATFORM=y -CONFIG_VIDEOMODE_HELPERS=y -CONFIG_VMAP_STACK=y -CONFIG_VT=y -CONFIG_VT_CONSOLE=y -CONFIG_VT_HW_CONSOLE_BINDING=y -CONFIG_WATCHDOG_CORE=y -CONFIG_X509_CERTIFICATE_PARSER=y -CONFIG_XPS=y -CONFIG_ZONE_DMA32=y diff --git a/target/linux/meson/mesongx/target.mk b/target/linux/meson/mesongx/target.mk deleted file mode 100644 index aad4b8bc0db49d..00000000000000 --- a/target/linux/meson/mesongx/target.mk +++ /dev/null @@ -1,16 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0-only -# -# This is free software, licensed under the GNU General Public License v2. -# See /LICENSE for more information. -# - -ARCH:=aarch64 -SUBTARGET:=mesongx -BOARDNAME:=Amlogic S9 SoC family (64 bit) -CPU_TYPE:=cortex-a53 -MAINTAINER:=Stijn Tintel - -define Target/Description - Build firmware image for Amlogic S9 SoC devices. - This firmware features a 64 bit kernel. -endef diff --git a/target/linux/meson/patches-5.10/001-v5.12-ARM-dts-meson-move-iio-hwmon-for-the-SoC.patch b/target/linux/meson/patches-5.10/001-v5.12-ARM-dts-meson-move-iio-hwmon-for-the-SoC.patch deleted file mode 100644 index 7e8a1ec601b884..00000000000000 --- a/target/linux/meson/patches-5.10/001-v5.12-ARM-dts-meson-move-iio-hwmon-for-the-SoC.patch +++ /dev/null @@ -1,94 +0,0 @@ -From e9ced25e41588a2ff95280b4d3dabf3a0865513b Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 21 Dec 2020 19:13:02 +0100 -Subject: [PATCH] ARM: dts: meson: move iio-hwmon for the SoC temperature to - meson.dtsi - -The SoC temperature can be retrieved from ADC channel 8 on all 32-bit -SoCs (Meson6, Meson8, Meson8b and Meson8m2). Move the iio-hwmon instance -to meson.dtsi instead of duplicating it in all board.dts. -If the temperature sensor calibration data is missing for a board then -iio-hwmon will simply not probe. - -Signed-off-by: Martin Blumenstingl -Reviewed-by: Neil Armstrong -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20201221181306.904272-2-martin.blumenstingl@googlemail.com ---- - arch/arm/boot/dts/meson.dtsi | 5 +++++ - arch/arm/boot/dts/meson8b-ec100.dts | 5 ----- - arch/arm/boot/dts/meson8b-mxq.dts | 5 ----- - arch/arm/boot/dts/meson8b-odroidc1.dts | 5 ----- - arch/arm/boot/dts/meson8m2-mxiii-plus.dts | 5 ----- - 5 files changed, 5 insertions(+), 20 deletions(-) - ---- a/arch/arm/boot/dts/meson.dtsi -+++ b/arch/arm/boot/dts/meson.dtsi -@@ -11,6 +11,11 @@ - #size-cells = <1>; - interrupt-parent = <&gic>; - -+ iio-hwmon { -+ compatible = "iio-hwmon"; -+ io-channels = <&saradc 8>; -+ }; -+ - soc { - compatible = "simple-bus"; - #address-cells = <1>; ---- a/arch/arm/boot/dts/meson8b-ec100.dts -+++ b/arch/arm/boot/dts/meson8b-ec100.dts -@@ -70,11 +70,6 @@ - timeout-ms = <20000>; - }; - -- iio-hwmon { -- compatible = "iio-hwmon"; -- io-channels = <&saradc 8>; -- }; -- - leds { - compatible = "gpio-leds"; - ---- a/arch/arm/boot/dts/meson8b-mxq.dts -+++ b/arch/arm/boot/dts/meson8b-mxq.dts -@@ -27,11 +27,6 @@ - reg = <0x40000000 0x40000000>; - }; - -- iio-hwmon { -- compatible = "iio-hwmon"; -- io-channels = <&saradc 8>; -- }; -- - vcck: regulator-vcck { - compatible = "pwm-regulator"; - ---- a/arch/arm/boot/dts/meson8b-odroidc1.dts -+++ b/arch/arm/boot/dts/meson8b-odroidc1.dts -@@ -85,11 +85,6 @@ - 1800000 1>; - }; - -- iio-hwmon { -- compatible = "iio-hwmon"; -- io-channels = <&saradc 8>; -- }; -- - rtc32k_xtal: rtc32k-xtal-clk { - /* X3 in the schematics */ - compatible = "fixed-clock"; ---- a/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -+++ b/arch/arm/boot/dts/meson8m2-mxiii-plus.dts -@@ -45,11 +45,6 @@ - }; - }; - -- iio-hwmon { -- compatible = "iio-hwmon"; -- io-channels = <&saradc 8>; -- }; -- - vcc_3v3: regulator-vcc3v3 { - compatible = "regulator-fixed"; - regulator-name = "VCC3V3"; diff --git a/target/linux/meson/patches-5.10/002-v5.12-ARM-dts-meson-add-the-ADC-thermal-sensor.patch b/target/linux/meson/patches-5.10/002-v5.12-ARM-dts-meson-add-the-ADC-thermal-sensor.patch deleted file mode 100644 index 5fc217033ed978..00000000000000 --- a/target/linux/meson/patches-5.10/002-v5.12-ARM-dts-meson-add-the-ADC-thermal-sensor.patch +++ /dev/null @@ -1,36 +0,0 @@ -From c8559511107120403f7810428f50fc68fd77ed5a Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 21 Dec 2020 19:13:03 +0100 -Subject: [PATCH] ARM: dts: meson: add the ADC thermal sensor to meson.dtsi - -The SoC temperature can be retrieved from ADC channel 8 on all 32-bit -SoCs (Meson6, Meson8, Meson8b and Meson8m2). Add a "generic-adc-thermal" -instance to meson.dtsi so the thermal sensor is available for all SoCs. -If the temperature sensor calibration data is missing for a board then -the "generic-adc-thermal" will not probe and not register a thermal -sensor. - -Signed-off-by: Martin Blumenstingl -Reviewed-by: Neil Armstrong -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20201221181306.904272-3-martin.blumenstingl@googlemail.com ---- - arch/arm/boot/dts/meson.dtsi | 7 +++++++ - 1 file changed, 7 insertions(+) - ---- a/arch/arm/boot/dts/meson.dtsi -+++ b/arch/arm/boot/dts/meson.dtsi -@@ -298,6 +298,13 @@ - }; - }; - -+ thermal_sensor: thermal-sensor { -+ compatible = "generic-adc-thermal"; -+ #thermal-sensor-cells = <0>; -+ io-channels = <&saradc 8>; -+ io-channel-names = "sensor-channel"; -+ }; -+ - xtal: xtal-clk { - compatible = "fixed-clock"; - clock-frequency = <24000000>; diff --git a/target/linux/meson/patches-5.10/003-v5.12-ARM-dts-meson8b-add-the-thermal-zones-with.patch b/target/linux/meson/patches-5.10/003-v5.12-ARM-dts-meson8b-add-the-thermal-zones-with.patch deleted file mode 100644 index 01b7ae16664ef4..00000000000000 --- a/target/linux/meson/patches-5.10/003-v5.12-ARM-dts-meson8b-add-the-thermal-zones-with.patch +++ /dev/null @@ -1,145 +0,0 @@ -From 9073f694efd8733b0e7c97d3396d81161bd05582 Mon Sep 17 00:00:00 2001 -From: Martin Blumenstingl -Date: Mon, 21 Dec 2020 19:13:05 +0100 -Subject: [PATCH] ARM: dts: meson8b: add the thermal-zones with cooling - configuration -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The vendor kernel uses the following thermal-zone settings: -<= 70°C: -- CPU frequency limited to 1.488GHz -- GPU limited to 511MHz and 2 cores (pixel processors) - -<= 80°C: -- CPU frequency limited to 1.2GHz -- GPU limited to 435MHz and 2 cores (pixel processors) - -<= 90°C: -- CPU frequency limited to 0.804GHz -- GPU limited to 328MHz and 1 core (pixel processor) - -Add simplified thermal configuration which is taken from the -GXBB/GXL/GXM SoC family (which uses the same manufacturing process and -has the same maximum junction temperature of 125°C). With this the -thermal framework will try to keep the SoC temperature at or below 80°C -which is identical to the vendor kernel (with the exception of one CPU -frequency step from 1.488GHz to 1.536GHz). - -The number of GPU cores are not taken into account as this is not -supported. - -Signed-off-by: Martin Blumenstingl -Reviewed-by: Neil Armstrong -Signed-off-by: Kevin Hilman -Link: https://lore.kernel.org/r/20201221181306.904272-5-martin.blumenstingl@googlemail.com ---- - arch/arm/boot/dts/meson8b.dtsi | 54 ++++++++++++++++++++++++++++++++++ - 1 file changed, 54 insertions(+) - ---- a/arch/arm/boot/dts/meson8b.dtsi -+++ b/arch/arm/boot/dts/meson8b.dtsi -@@ -10,6 +10,7 @@ - #include - #include - #include -+#include - #include "meson.dtsi" - - / { -@@ -26,6 +27,7 @@ - resets = <&clkc CLKC_RESET_CPU0_SOFT_RESET>; - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -+ #cooling-cells = <2>; /* min followed by max */ - }; - - cpu1: cpu@201 { -@@ -37,6 +39,7 @@ - resets = <&clkc CLKC_RESET_CPU1_SOFT_RESET>; - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -+ #cooling-cells = <2>; /* min followed by max */ - }; - - cpu2: cpu@202 { -@@ -48,6 +51,7 @@ - resets = <&clkc CLKC_RESET_CPU2_SOFT_RESET>; - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -+ #cooling-cells = <2>; /* min followed by max */ - }; - - cpu3: cpu@203 { -@@ -59,6 +63,7 @@ - resets = <&clkc CLKC_RESET_CPU3_SOFT_RESET>; - operating-points-v2 = <&cpu_opp_table>; - clocks = <&clkc CLKID_CPUCLK>; -+ #cooling-cells = <2>; /* min followed by max */ - }; - }; - -@@ -167,6 +172,54 @@ - }; - }; - -+ thermal-zones { -+ soc { -+ polling-delay-passive = <250>; /* milliseconds */ -+ polling-delay = <1000>; /* milliseconds */ -+ thermal-sensors = <&thermal_sensor>; -+ -+ cooling-maps { -+ map0 { -+ trip = <&soc_passive>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ -+ map1 { -+ trip = <&soc_hot>; -+ cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu2 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&cpu3 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>, -+ <&mali THERMAL_NO_LIMIT THERMAL_NO_LIMIT>; -+ }; -+ }; -+ -+ trips { -+ soc_passive: soc-passive { -+ temperature = <80000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "passive"; -+ }; -+ -+ soc_hot: soc-hot { -+ temperature = <90000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "hot"; -+ }; -+ -+ soc_critical: soc-critical { -+ temperature = <110000>; /* millicelsius */ -+ hysteresis = <2000>; /* millicelsius */ -+ type = "critical"; -+ }; -+ }; -+ }; -+ }; -+ - mmcbus: bus@c8000000 { - compatible = "simple-bus"; - reg = <0xc8000000 0x8000>; -@@ -221,6 +274,7 @@ - clocks = <&clkc CLKID_CLK81>, <&clkc CLKID_MALI>; - clock-names = "bus", "core"; - operating-points-v2 = <&gpu_opp_table>; -+ #cooling-cells = <2>; /* min followed by max */ - }; - }; - }; /* end of / */ diff --git a/target/linux/meson/patches-5.10/901-arm-boot-add-dts-files.patch b/target/linux/meson/patches-5.10/901-arm-boot-add-dts-files.patch deleted file mode 100644 index eaa3c4c5bcd824..00000000000000 --- a/target/linux/meson/patches-5.10/901-arm-boot-add-dts-files.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -348,6 +348,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ - meson8b-ec100.dtb \ - meson8b-mxq.dtb \ - meson8b-odroidc1.dtb \ -+ meson8b-onecloud.dtb \ - meson8m2-mxiii-plus.dtb - dtb-$(CONFIG_ARCH_MMP) += \ - pxa168-aspenite.dtb \ diff --git a/target/linux/meson/patches-5.10/903-Support-for-EMMC.patch b/target/linux/meson/patches-5.10/903-Support-for-EMMC.patch deleted file mode 100644 index 1c1d43096b1ca6..00000000000000 --- a/target/linux/meson/patches-5.10/903-Support-for-EMMC.patch +++ /dev/null @@ -1,48 +0,0 @@ ---- a/drivers/mmc/core/mmc.c -+++ b/drivers/mmc/core/mmc.c -@@ -1383,12 +1383,13 @@ static int mmc_select_hs400es(struct mmc - * SEND_STATUS reliably at the initial frequency. - */ - mmc_set_timing(host, MMC_TIMING_MMC_HS); -- mmc_set_bus_speed(card); - - err = mmc_switch_status(card, true); - if (err) - goto out_err; - -+ mmc_set_clock(host, card->ext_csd.hs_max_dtr); -+ - /* Switch card to DDR with strobe bit */ - val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE; - err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, -@@ -1446,7 +1447,7 @@ out_err: - static int mmc_select_hs200(struct mmc_card *card) - { - struct mmc_host *host = card->host; -- unsigned int old_timing, old_signal_voltage, old_clock; -+ unsigned int old_timing, old_signal_voltage; - int err = -EINVAL; - u8 val; - -@@ -1485,9 +1486,7 @@ static int mmc_select_hs200(struct mmc_c - * successfully switched over. - */ - old_timing = host->ios.timing; -- old_clock = host->ios.clock; - mmc_set_timing(host, MMC_TIMING_MMC_HS200); -- mmc_set_clock(card->host, card->ext_csd.hs_max_dtr); - - /* - * For HS200, CRC errors are not a reliable way to know the -@@ -1500,10 +1499,8 @@ static int mmc_select_hs200(struct mmc_c - * mmc_select_timing() assumes timing has not changed if - * it is a switch error. - */ -- if (err == -EBADMSG) { -- mmc_set_clock(host, old_clock); -+ if (err == -EBADMSG) - mmc_set_timing(host, old_timing); -- } - } - err: - if (err) { diff --git a/target/linux/meson/patches-5.10/904-usb-disable-ACA-check.patch b/target/linux/meson/patches-5.10/904-usb-disable-ACA-check.patch deleted file mode 100644 index 422d9676644a8e..00000000000000 --- a/target/linux/meson/patches-5.10/904-usb-disable-ACA-check.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/drivers/phy/amlogic/phy-meson8b-usb2.c -+++ b/drivers/phy/amlogic/phy-meson8b-usb2.c -@@ -195,12 +195,12 @@ static int phy_meson8b_usb2_power_on(str - udelay(ACA_ENABLE_COMPLETE_TIME); - - regmap_read(priv->regmap, REG_ADP_BC, ®); -- if (reg & REG_ADP_BC_ACA_PIN_FLOAT) { -+ /*if (reg & REG_ADP_BC_ACA_PIN_FLOAT) { - dev_warn(&phy->dev, "USB ID detect failed!\n"); - clk_disable_unprepare(priv->clk_usb); - clk_disable_unprepare(priv->clk_usb_general); - return -EINVAL; -- } -+ }*/ - } - } - diff --git a/target/linux/meson/patches-5.15/902-use-system-LED-for-OpenWrt.patch b/target/linux/meson/patches-5.15/902-use-system-LED-for-OpenWrt.patch deleted file mode 100644 index a387fde89a51b2..00000000000000 --- a/target/linux/meson/patches-5.15/902-use-system-LED-for-OpenWrt.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- a/arch/arm/boot/dts/meson8b-onecloud.dts -+++ b/arch/arm/boot/dts/meson8b-onecloud.dts -@@ -13,6 +13,11 @@ - serial0 = &uart_AO; - mmc0 = &sd_card_slot; - mmc1 = &sdhc; -+ -+ led-boot = &led_status_red; -+ led-failsafe = &led_status_red; -+ led-running = &led_status_blue; -+ led-upgrade = &led_status_green; - }; - - chosen { diff --git a/target/linux/meson/patches-5.10/902-use-system-LED-for-OpenWrt.patch b/target/linux/meson/patches-6.1/902-use-system-LED-for-OpenWrt.patch similarity index 100% rename from target/linux/meson/patches-5.10/902-use-system-LED-for-OpenWrt.patch rename to target/linux/meson/patches-6.1/902-use-system-LED-for-OpenWrt.patch diff --git a/target/linux/meson/patches-5.15/903-Support-for-EMMC.patch b/target/linux/meson/patches-6.1/903-add-dts-and-identify-emmc.patch similarity index 84% rename from target/linux/meson/patches-5.15/903-Support-for-EMMC.patch rename to target/linux/meson/patches-6.1/903-add-dts-and-identify-emmc.patch index da689353bb3f5f..5065be6589be8b 100644 --- a/target/linux/meson/patches-5.15/903-Support-for-EMMC.patch +++ b/target/linux/meson/patches-6.1/903-add-dts-and-identify-emmc.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -365,6 +365,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ +@@ -402,6 +402,7 @@ dtb-$(CONFIG_MACH_MESON8) += \ meson8b-ec100.dtb \ meson8b-mxq.dtb \ meson8b-odroidc1.dtb \ @@ -10,7 +10,7 @@ pxa168-aspenite.dtb \ --- a/drivers/mmc/core/mmc.c +++ b/drivers/mmc/core/mmc.c -@@ -1386,12 +1386,13 @@ static int mmc_select_hs400es(struct mmc +@@ -1396,12 +1396,13 @@ static int mmc_select_hs400es(struct mmc * SEND_STATUS reliably at the initial frequency. */ mmc_set_timing(host, MMC_TIMING_MMC_HS); @@ -25,7 +25,7 @@ /* Switch card to DDR with strobe bit */ val = EXT_CSD_DDR_BUS_WIDTH_8 | EXT_CSD_BUS_WIDTH_STROBE; err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL, -@@ -1449,7 +1450,7 @@ out_err: +@@ -1459,7 +1460,7 @@ out_err: static int mmc_select_hs200(struct mmc_card *card) { struct mmc_host *host = card->host; @@ -34,7 +34,7 @@ int err = -EINVAL; u8 val; -@@ -1488,9 +1489,7 @@ static int mmc_select_hs200(struct mmc_c +@@ -1498,9 +1499,7 @@ static int mmc_select_hs200(struct mmc_c * successfully switched over. */ old_timing = host->ios.timing; @@ -44,7 +44,7 @@ /* * For HS200, CRC errors are not a reliable way to know the -@@ -1503,10 +1502,8 @@ static int mmc_select_hs200(struct mmc_c +@@ -1513,10 +1512,8 @@ static int mmc_select_hs200(struct mmc_c * mmc_select_timing() assumes timing has not changed if * it is a switch error. */ diff --git a/target/linux/meson/patches-5.15/904-usb-disable-ACA-check.patch b/target/linux/meson/patches-6.1/904-usb-disable-ACA-check.patch similarity index 100% rename from target/linux/meson/patches-5.15/904-usb-disable-ACA-check.patch rename to target/linux/meson/patches-6.1/904-usb-disable-ACA-check.patch