From e12ac405525c29a6b6195e6259d769715919560c Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Mon, 24 Aug 2020 10:36:36 +0200 Subject: [PATCH 01/11] mt76: update to the latest version f0beb7cbc443 mt76: mt7663u: fix memory leaks in mt7663u_probe 90c8422d3f56 mt76: mt7915: fix typo in function name 9cbbe4a30eaf mac80211: simplify TX aggregation start 974486ec2642 util: in worker setup, only overwrite function pointer if not NULL 519510277a8b mt76: initialize tx worker function earlier 3c361b1e3f4e mt76: mt7663u: fix dma header initialization e8d489647c7f mt76: usb: fix use of q->head and q->tail 8124daf53130 mt76: sdio: fix use of q->head and q->tail 3c2cd8580377 mt76: unify queue tx cleanup code 780cdabb8659 mt76: remove qid argument to drv->tx_complete_skb 05aa857861fc mt76: remove swq from struct mt76_sw_queue e861cb051833 mt76: rely on AQL for burst size limits on tx queueing 3218b914a2fb mt76: remove struct mt76_sw_queue 23529b5e93c1 mt76: mt7603: tune tx ring size f6ca436ebea4 mt76: mt76x02: tune tx ring size 97e65131440c mt76: mt7603: check for single-stream EEPROM configuration 957b6c5ac273 mt76: mt7615: fix MT_ANT_SWITCH_CON register definition 96a541eedda9 mt76: mt7615: fix antenna selection for testmode tx_frames b36d7ae096a3 mt76: mt7603: move number of streams detection to eeprom init Signed-off-by: Felix Fietkau --- package/kernel/mt76/Makefile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/kernel/mt76/Makefile b/package/kernel/mt76/Makefile index 61c59cab3d..54a77bda3a 100644 --- a/package/kernel/mt76/Makefile +++ b/package/kernel/mt76/Makefile @@ -8,9 +8,9 @@ PKG_LICENSE_FILES:= PKG_SOURCE_URL:=https://github.com/openwrt/mt76 PKG_SOURCE_PROTO:=git -PKG_SOURCE_DATE:=2020-08-22 -PKG_SOURCE_VERSION:=8c7c1a207d25cd880c7f54d3fe86e82f14d6ecda -PKG_MIRROR_HASH:=0411bc634cb4065f748754e02758c172a4c65298696667f198c41d580d165d69 +PKG_SOURCE_DATE:=2020-08-25 +PKG_SOURCE_VERSION:=b36d7ae096a3d8c7d6a8a246f2e8a471a467041e +PKG_MIRROR_HASH:=da35e999f1bd50ce7061125ccb976129c8485e3593521206831380846953d3cf PKG_MAINTAINER:=Felix Fietkau PKG_BUILD_PARALLEL:=1 From 81ac2a73bc227484888a2a715f8e4e2e8043804e Mon Sep 17 00:00:00 2001 From: Pawel Dembicki Date: Thu, 13 Aug 2020 11:15:56 +0200 Subject: [PATCH 02/11] layerscape: add flashing manual for LS1012FRDM LS1012FRDM is supported but there's no flashing instruction in README. This patch adds it. While at it, add a missing saveenv for MAC address setup. Signed-off-by: Pawel Dembicki [add comment about saveenv] Signed-off-by: Adrian Schmutzler --- target/linux/layerscape/README | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/target/linux/layerscape/README b/target/linux/layerscape/README index 951f3e8984..8cbf05bd15 100644 --- a/target/linux/layerscape/README +++ b/target/linux/layerscape/README @@ -71,6 +71,16 @@ from SD card. 3.2 Program firmware.bin to flash --------------------------------- +* LS1012FRDM (QSPI flash) + Board have only one nor flash bank. Those commands will replace stock + bootloader and firmware. Please refer point 4 for MAC recovery. + + => tftp a0000000 -firmware.bin + => sf probe 0:0 + => sf erase 0 +$filesize + => sf write a0000000 0 $filesize + => reset + * LS1012ARDB (QSPI flash) Start up from bank1, and program firmware to bank2 with below commands. Switch to bank2 to start up OpenWrt. @@ -155,6 +165,7 @@ from SD card. => setenv ethaddr 00:04:9F:04:65:4b => setenv eth1addr 00:04:9F:04:65:4c + => saveenv 5. Other references From a070e2ee42bb2f1c8c20ca62eac608f526640112 Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker M Date: Sat, 22 Aug 2020 12:55:47 -0700 Subject: [PATCH 03/11] at91: bump linux version to 5.4 Move patches to 5.4, put config only in subtarget directories. Signed-off-by: Sandeep Sheriker M [refresh patches, add commit message] Signed-off-by: Adrian Schmutzler --- target/linux/at91/Makefile | 2 +- target/linux/at91/config-4.14 | 561 ----------------- .../100-ARM-at91-build-dtb-for-LMU5000.patch | 10 - ...RM-at91-build-dtb-for-sama5d2-ptc-Ek.patch | 434 ------------- .../101-ARM-at91-build-dtb-for-q5xr5.patch | 4 +- .../102-ARM-at91-build-dtb-for-wb45n.patch | 4 +- ...2-ARM-at91-wb45n-fix-duplicate-label.patch | 20 + .../103-ARM-at91-build-dtb-for-wb50n.patch | 2 +- ...3-ARM-at91-wb50n-fix-duplicate-label.patch | 39 ++ target/linux/at91/sam9x/config-default | 13 +- target/linux/at91/sama5/config-default | 572 ++++++++++++++++++ 11 files changed, 649 insertions(+), 1012 deletions(-) delete mode 100644 target/linux/at91/config-4.14 delete mode 100644 target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch delete mode 100644 target/linux/at91/patches-4.14/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch rename target/linux/at91/{patches-4.14 => patches-5.4}/101-ARM-at91-build-dtb-for-q5xr5.patch (74%) rename target/linux/at91/{patches-4.14 => patches-5.4}/102-ARM-at91-build-dtb-for-wb45n.patch (74%) create mode 100644 target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch rename target/linux/at91/{patches-4.14 => patches-5.4}/103-ARM-at91-build-dtb-for-wb50n.patch (85%) create mode 100644 target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 4780210f36..e941f34669 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -12,7 +12,7 @@ BOARDNAME:=Microchip (Atmel AT91) FEATURES:=ext4 squashfs targz usb usbgadget ubifs SUBTARGETS:=sama5 sam9x -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=5.4 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/config-4.14 b/target/linux/at91/config-4.14 deleted file mode 100644 index b4fc644015..0000000000 --- a/target/linux/at91/config-4.14 +++ /dev/null @@ -1,561 +0,0 @@ -CONFIG_ALIGNMENT_TRAP=y -CONFIG_ARCH_AT91=y -CONFIG_ARCH_CLOCKSOURCE_DATA=y -CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y -CONFIG_ARCH_HAS_ELF_RANDOMIZE=y -CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y -CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y -CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y -CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y -CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y -CONFIG_ARCH_HIBERNATION_POSSIBLE=y -CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y -CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set -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 is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set -CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y -CONFIG_ARCH_SUPPORTS_UPROBES=y -CONFIG_ARCH_SUSPEND_POSSIBLE=y -CONFIG_ARCH_USE_BUILTIN_BSWAP=y -CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y -CONFIG_ARCH_WANT_GENERAL_HUGETLB=y -CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y -CONFIG_ARM=y -CONFIG_ARM_AT91_CPUIDLE=y -CONFIG_ARM_CPU_SUSPEND=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_LPAE is not set -CONFIG_ARM_PATCH_IDIV=y -CONFIG_ARM_PATCH_PHYS_VIRT=y -CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set -CONFIG_ARM_UNWIND=y -CONFIG_ARM_VIRT_EXT=y -CONFIG_AT91SAM9X_WATCHDOG=y -CONFIG_AT91_ADC=y -CONFIG_AT91_SAMA5D2_ADC=y -CONFIG_AT91_SOC_ID=y -CONFIG_ATMEL_AIC5_IRQ=y -CONFIG_ATMEL_EBI=y -CONFIG_ATMEL_PIT=y -CONFIG_ATMEL_PM=y -CONFIG_ATMEL_SDRAMC=y -CONFIG_ATMEL_SSC=y -CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 -CONFIG_ATMEL_TCLIB=y -CONFIG_AT_HDMAC=y -CONFIG_AT_XDMAC=y -CONFIG_AUTO_ZRELADDR=y -CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y -CONFIG_BACKLIGHT_PWM=y -CONFIG_BATTERY_ACT8945A=y -CONFIG_BLK_DEV_LOOP=y -CONFIG_BLK_DEV_RAM=y -CONFIG_BLK_DEV_RAM_COUNT=4 -CONFIG_BLK_DEV_RAM_SIZE=8192 -CONFIG_BLK_DEV_SD=y -CONFIG_BLK_SCSI_REQUEST=y -CONFIG_CACHE_L2X0=y -CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLONE_BACKWARDS=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_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" -CONFIG_COMMON_CLK=y -CONFIG_COMMON_CLK_AT91=y -CONFIG_CONFIGFS_FS=y -CONFIG_CONSOLE_TRANSLATIONS=y -CONFIG_COREDUMP=y -CONFIG_CPU_32v6K=y -CONFIG_CPU_32v7=y -CONFIG_CPU_ABRT_EV7=y -# CONFIG_CPU_BPREDICT_DISABLE is not set -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_HAS_ASID=y -# CONFIG_CPU_ICACHE_DISABLE is not set -CONFIG_CPU_IDLE=y -CONFIG_CPU_IDLE_GOV_LADDER=y -CONFIG_CPU_IDLE_GOV_MENU=y -CONFIG_CPU_PABRT_V7=y -CONFIG_CPU_PM=y -CONFIG_CPU_SPECTRE=y -CONFIG_CPU_THUMB_CAPABLE=y -CONFIG_CPU_TLB_V7=y -CONFIG_CPU_V7=y -CONFIG_CRASH_CORE=y -CONFIG_CRASH_DUMP=y -CONFIG_CRC16=y -# CONFIG_CRC32_SARWATE is not set -CONFIG_CRC32_SLICEBY8=y -CONFIG_CROSS_MEMORY_ATTACH=y -CONFIG_CRYPTO_ACOMP2=y -CONFIG_CRYPTO_AEAD=y -CONFIG_CRYPTO_AEAD2=y -CONFIG_CRYPTO_CCM=y -CONFIG_CRYPTO_CRC32C=y -CONFIG_CRYPTO_CTR=y -CONFIG_CRYPTO_DEFLATE=y -CONFIG_CRYPTO_DRBG=y -CONFIG_CRYPTO_DRBG_HMAC=y -CONFIG_CRYPTO_DRBG_MENU=y -CONFIG_CRYPTO_GCM=y -CONFIG_CRYPTO_GF128MUL=y -CONFIG_CRYPTO_GHASH=y -CONFIG_CRYPTO_HASH=y -CONFIG_CRYPTO_HASH2=y -CONFIG_CRYPTO_HMAC=y -CONFIG_CRYPTO_JITTERENTROPY=y -CONFIG_CRYPTO_LZO=y -CONFIG_CRYPTO_MANAGER=y -CONFIG_CRYPTO_MANAGER2=y -CONFIG_CRYPTO_NULL=y -CONFIG_CRYPTO_NULL2=y -CONFIG_CRYPTO_RNG=y -CONFIG_CRYPTO_RNG2=y -CONFIG_CRYPTO_RNG_DEFAULT=y -CONFIG_CRYPTO_SEQIV=y -CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_WORKQUEUE=y -CONFIG_DCACHE_WORD_ACCESS=y -CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" -CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_DEBUG_USER=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_DEFAULT_NOOP=y -CONFIG_DMADEVICES=y -CONFIG_DMA_CMA=y -CONFIG_DMA_ENGINE=y -CONFIG_DMA_OF=y -CONFIG_DMA_SHARED_BUFFER=y -CONFIG_DNOTIFY=y -CONFIG_DRM=y -CONFIG_DRM_ATMEL_HLCDC=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_PANEL=y -CONFIG_DRM_PANEL_BRIDGE=y -CONFIG_DRM_PANEL_SIMPLE=y -CONFIG_DTC=y -CONFIG_DUMMY_CONSOLE=y -CONFIG_EDAC_ATOMIC_SCRUB=y -CONFIG_EDAC_SUPPORT=y -CONFIG_EEPROM_AT24=y -CONFIG_ELF_CORE=y -CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXT4_FS=y -CONFIG_FAT_FS=y -CONFIG_FB=y -# CONFIG_FB_ATMEL is not set -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_PROVIDE_GET_FB_UNMAPPED_AREA is not set -CONFIG_FB_SYS_COPYAREA=y -CONFIG_FB_SYS_FILLRECT=y -CONFIG_FB_SYS_FOPS=y -CONFIG_FB_SYS_IMAGEBLIT=y -CONFIG_FIRMWARE_IN_KERNEL=y -CONFIG_FIXED_PHY=y -CONFIG_FIX_EARLYCON_MEM=y -CONFIG_FORCE_MAX_ZONEORDER=15 -CONFIG_FREEZER=y -CONFIG_FS_MBCACHE=y -CONFIG_GENERIC_ALLOCATOR=y -CONFIG_GENERIC_BUG=y -CONFIG_GENERIC_CLOCKEVENTS=y -CONFIG_GENERIC_CPU_AUTOPROBE=y -CONFIG_GENERIC_EARLY_IOREMAP=y -CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y -CONFIG_GENERIC_IRQ_CHIP=y -CONFIG_GENERIC_IRQ_SHOW=y -CONFIG_GENERIC_IRQ_SHOW_LEVEL=y -CONFIG_GENERIC_PCI_IOMAP=y -CONFIG_GENERIC_PINCONF=y -CONFIG_GENERIC_SCHED_CLOCK=y -CONFIG_GENERIC_SMP_IDLE_THREAD=y -CONFIG_GENERIC_STRNCPY_FROM_USER=y -CONFIG_GENERIC_STRNLEN_USER=y -CONFIG_GLOB=y -CONFIG_GPIOLIB=y -CONFIG_GPIOLIB_IRQCHIP=y -# CONFIG_GRO_CELLS is not set -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_64BIT_ALIGNED_ACCESS is not set -CONFIG_HAVE_ARCH_AUDITSYSCALL=y -CONFIG_HAVE_ARCH_BITREVERSE=y -CONFIG_HAVE_ARCH_JUMP_LABEL=y -CONFIG_HAVE_ARCH_KGDB=y -CONFIG_HAVE_ARCH_PFN_VALID=y -CONFIG_HAVE_ARCH_SECCOMP_FILTER=y -CONFIG_HAVE_ARCH_TRACEHOOK=y -CONFIG_HAVE_ARM_SMCCC=y -CONFIG_HAVE_AT91_AUDIO_PLL=y -CONFIG_HAVE_AT91_GENERATED_CLK=y -CONFIG_HAVE_AT91_H32MX=y -CONFIG_HAVE_AT91_SMD=y -CONFIG_HAVE_AT91_USB_CLK=y -CONFIG_HAVE_AT91_UTMI=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y -CONFIG_HAVE_CLK=y -CONFIG_HAVE_CLK_PREPARE=y -CONFIG_HAVE_CONTEXT_TRACKING=y -CONFIG_HAVE_C_RECORDMCOUNT=y -CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y -CONFIG_HAVE_DMA_CONTIGUOUS=y -CONFIG_HAVE_DYNAMIC_FTRACE=y -CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y -CONFIG_HAVE_EBPF_JIT=y -CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FB_ATMEL=y -CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y -CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y -CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y -CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y -CONFIG_HAVE_MOD_ARCH_SPECIFIC=y -CONFIG_HAVE_NET_DSA=y -CONFIG_HAVE_OPROFILE=y -CONFIG_HAVE_OPTPROBES=y -CONFIG_HAVE_PERF_EVENTS=y -CONFIG_HAVE_PERF_REGS=y -CONFIG_HAVE_PERF_USER_STACK_DUMP=y -CONFIG_HAVE_PROC_CPU=y -CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y -CONFIG_HAVE_SMP=y -CONFIG_HAVE_SYSCALL_TRACEPOINTS=y -CONFIG_HAVE_UID16=y -CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y -CONFIG_HDMI=y -CONFIG_HID=y -CONFIG_HID_GENERIC=y -CONFIG_HW_CONSOLE=y -CONFIG_HW_RANDOM=y -CONFIG_HW_RANDOM_ATMEL=y -CONFIG_HZ_FIXED=0 -CONFIG_I2C=y -CONFIG_I2C_ALGOBIT=y -CONFIG_I2C_AT91=y -CONFIG_I2C_BOARDINFO=y -CONFIG_I2C_CHARDEV=y -CONFIG_I2C_COMPAT=y -CONFIG_I2C_GPIO=y -CONFIG_I2C_HELPER_AUTO=y -CONFIG_IIO=y -CONFIG_IIO_BUFFER=y -CONFIG_IIO_KFIFO_BUF=y -CONFIG_IIO_TRIGGER=y -CONFIG_IIO_TRIGGERED_BUFFER=y -CONFIG_INITRAMFS_SOURCE="" -CONFIG_INPUT=y -CONFIG_INPUT_EVDEV=y -CONFIG_INPUT_KEYBOARD=y -CONFIG_INPUT_LEDS=y -CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IOMMU_HELPER=y -# CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IRQCHIP=y -CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_DEBUG=y -CONFIG_IRQ_FORCED_THREADING=y -CONFIG_IRQ_WORK=y -CONFIG_JBD2=y -# CONFIG_JFFS2_FS is not set -CONFIG_KERNEL_GZIP=y -# CONFIG_KERNEL_XZ is not set -CONFIG_KEXEC=y -CONFIG_KEXEC_CORE=y -CONFIG_KEYBOARD_GPIO=y -CONFIG_KEYBOARD_QT1070=y -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_LEDS_GPIO=y -CONFIG_LEDS_PWM=y -CONFIG_LEDS_TRIGGER_CPU=y -# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set -CONFIG_LEDS_TRIGGER_GPIO=y -CONFIG_LEDS_TRIGGER_HEARTBEAT=y -CONFIG_LIBFDT=y -CONFIG_LOCALVERSION_AUTO=y -CONFIG_LOG_BUF_SHIFT=16 -CONFIG_LZO_COMPRESS=y -CONFIG_LZO_DECOMPRESS=y -CONFIG_MACB=y -CONFIG_MACB_USE_HWSTAMP=y -CONFIG_MAGIC_SYSRQ=y -CONFIG_MANDATORY_FILE_LOCKING=y -CONFIG_MDIO_BUS=y -CONFIG_MDIO_DEVICE=y -CONFIG_MEDIA_CAMERA_SUPPORT=y -CONFIG_MEDIA_SUPPORT=y -CONFIG_MEDIA_USB_SUPPORT=y -CONFIG_MEMORY=y -CONFIG_MEMORY_ISOLATION=y -CONFIG_MFD_ACT8945A=y -CONFIG_MFD_ATMEL_FLEXCOM=y -CONFIG_MFD_ATMEL_HLCDC=y -CONFIG_MFD_ATMEL_SMC=y -CONFIG_MFD_CORE=y -CONFIG_MFD_SYSCON=y -CONFIG_MICREL_PHY=y -CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y -CONFIG_MIGRATION=y -CONFIG_MMC=y -CONFIG_MMC_ATMELMCI=y -CONFIG_MMC_BLOCK=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_OF_AT91=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MODULES_USE_ELF_REL=y -# CONFIG_MTD_CFI_AMDSTD is not set -# CONFIG_MTD_CFI_INTELEXT is not set -CONFIG_MTD_CMDLINE_PARTS=y -# CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ECC=y -# CONFIG_MTD_PHYSMAP_OF is not set -CONFIG_MTD_SPI_NOR=y -CONFIG_MTD_UBI=y -CONFIG_MTD_UBI_BEB_LIMIT=20 -# CONFIG_MTD_UBI_BLOCK is not set -CONFIG_MTD_UBI_FASTMAP=y -# CONFIG_MTD_UBI_GLUEBI is not set -CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MULTI_IRQ_HANDLER=y -CONFIG_NEED_DMA_MAP_STATE=y -CONFIG_NEED_PER_CPU_KM=y -CONFIG_NEON=y -CONFIG_NLS=y -CONFIG_NLS_CODEPAGE_437=y -CONFIG_NLS_CODEPAGE_850=y -CONFIG_NLS_ISO8859_1=y -CONFIG_NLS_UTF8=y -CONFIG_NO_BOOTMEM=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -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_MDIO=y -CONFIG_OF_NET=y -CONFIG_OF_RESERVED_MEM=y -CONFIG_OLD_SIGACTION=y -CONFIG_OLD_SIGSUSPEND3=y -CONFIG_OUTER_CACHE=y -CONFIG_OUTER_CACHE_SYNC=y -CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PARTITION_ADVANCED is not set -# CONFIG_PCI_DOMAINS_GENERIC is not set -# CONFIG_PCI_SYSCALL is not set -CONFIG_PERF_USE_VMALLOC=y -CONFIG_PGTABLE_LEVELS=2 -CONFIG_PHYLIB=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_AT91=y -CONFIG_PINCTRL_AT91PIO4=y -# CONFIG_PINCTRL_SINGLE is not set -# CONFIG_PL310_ERRATA_588369 is not set -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_PL310_ERRATA_753970 is not set -# CONFIG_PL310_ERRATA_769419 is not set -CONFIG_PM=y -CONFIG_PM_ADVANCED_DEBUG=y -CONFIG_PM_CLK=y -CONFIG_PM_DEBUG=y -CONFIG_PM_SLEEP=y -CONFIG_PM_SLEEP_DEBUG=y -# CONFIG_PM_TEST_SUSPEND is not set -CONFIG_POWER_RESET=y -CONFIG_POWER_RESET_AT91_POWEROFF=y -CONFIG_POWER_RESET_AT91_RESET=y -CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y -CONFIG_POWER_SUPPLY=y -# CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_PRINTK_TIME=y -CONFIG_PROC_VMCORE=y -CONFIG_PWM=y -CONFIG_PWM_ATMEL=y -CONFIG_PWM_ATMEL_HLCDC_PWM=y -CONFIG_PWM_ATMEL_TCB=y -CONFIG_PWM_SYSFS=y -CONFIG_RATIONAL=y -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set -CONFIG_REGMAP=y -CONFIG_REGMAP_I2C=y -CONFIG_REGMAP_MMIO=y -CONFIG_REGMAP_SPI=y -CONFIG_REGULATOR=y -CONFIG_REGULATOR_ACT8865=y -CONFIG_REGULATOR_ACT8945A=y -CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_RTC_CLASS=y -CONFIG_RTC_DRV_AT91RM9200=y -# CONFIG_RTC_DRV_AT91SAM9 is not set -# CONFIG_RTC_DRV_CMOS is not set -CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y -CONFIG_SAMA5D4_WATCHDOG=y -# CONFIG_SCHED_INFO is not set -CONFIG_SCSI=y -# CONFIG_SCSI_LOWLEVEL is not set -# CONFIG_SERIAL_8250 is not set -CONFIG_SERIAL_ATMEL=y -CONFIG_SERIAL_ATMEL_CONSOLE=y -CONFIG_SERIAL_ATMEL_PDC=y -# CONFIG_SERIAL_ATMEL_TTYAT is not set -CONFIG_SERIAL_MCTRL_GPIO=y -CONFIG_SG_POOL=y -CONFIG_SND=y -CONFIG_SND_ARM=y -# CONFIG_SND_AT73C213 is not set -# CONFIG_SND_AT91_SOC_SAM9G20_WM8731 is not set -# CONFIG_SND_AT91_SOC_SAM9X5_WM8731 is not set -CONFIG_SND_ATMEL_SOC=y -CONFIG_SND_ATMEL_SOC_CLASSD=y -CONFIG_SND_ATMEL_SOC_DMA=y -# CONFIG_SND_ATMEL_SOC_PDMIC is not set -CONFIG_SND_ATMEL_SOC_SSC=y -CONFIG_SND_ATMEL_SOC_SSC_DMA=y -# CONFIG_SND_ATMEL_SOC_TSE850_PCM5142 is not set -CONFIG_SND_ATMEL_SOC_WM8904=y -# CONFIG_SND_COMPRESS_OFFLOAD is not set -CONFIG_SND_DMAENGINE_PCM=y -CONFIG_SND_JACK=y -CONFIG_SND_JACK_INPUT_DEV=y -CONFIG_SND_PCM=y -CONFIG_SND_PCM_TIMER=y -CONFIG_SND_SOC=y -CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y -CONFIG_SND_SOC_I2C_AND_SPI=y -CONFIG_SND_SOC_WM8904=y -CONFIG_SND_SPI=y -CONFIG_SND_SUPPORT_OLD_API=y -CONFIG_SND_TIMER=y -CONFIG_SOC_BUS=y -CONFIG_SOC_SAMA5=y -CONFIG_SOC_SAMA5D2=y -CONFIG_SOC_SAMA5D3=y -CONFIG_SOC_SAMA5D4=y -CONFIG_SOC_SAM_V7=y -CONFIG_SOUND=y -CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set -CONFIG_SPARSE_IRQ=y -CONFIG_SPI=y -CONFIG_SPI_ATMEL=y -CONFIG_SPI_ATMEL_QUADSPI=y -CONFIG_SPI_BITBANG=y -CONFIG_SPI_GPIO=y -CONFIG_SPI_MASTER=y -# CONFIG_SQUASHFS is not set -CONFIG_SRAM=y -CONFIG_SRAM_EXEC=y -CONFIG_SRCU=y -# CONFIG_STANDALONE is not set -CONFIG_SUSPEND=y -CONFIG_SUSPEND_FREEZER=y -CONFIG_SWIOTLB=y -CONFIG_SWPHY=y -# CONFIG_SWP_EMULATE is not set -CONFIG_SYNC_FILE=y -CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_THUMB2_KERNEL is not set -CONFIG_TICK_CPU_ACCOUNTING=y -CONFIG_TIMER_OF=y -CONFIG_TIMER_PROBE=y -CONFIG_TINY_SRCU=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y -CONFIG_TOUCHSCREEN_PROPERTIES=y -CONFIG_UACCESS_WITH_MEMCPY=y -CONFIG_UBIFS_FS=y -CONFIG_UBIFS_FS_ADVANCED_COMPR=y -CONFIG_UBIFS_FS_LZO=y -CONFIG_UBIFS_FS_ZLIB=y -CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" -CONFIG_USB=y -CONFIG_USB_ACM=y -CONFIG_USB_ANNOUNCE_NEW_DEVICES=y -# CONFIG_USB_AT91 is not set -# CONFIG_USB_ATMEL_USBA is not set -CONFIG_USB_COMMON=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_EHCI_HCD_AT91=y -# CONFIG_USB_EHCI_HCD_PLATFORM is not set -# CONFIG_USB_EHCI_ROOT_HUB_TT is not set -CONFIG_USB_GADGET=y -CONFIG_USB_HID=y -CONFIG_USB_OHCI_HCD=y -CONFIG_USB_OHCI_HCD_AT91=y -CONFIG_USB_OHCI_HCD_PLATFORM=y -# CONFIG_USB_PWC is not set -CONFIG_USB_SERIAL=y -# CONFIG_USB_SERIAL_CONSOLE is not set -CONFIG_USB_SERIAL_FTDI_SIO=y -CONFIG_USB_SERIAL_PL2303=y -CONFIG_USB_STORAGE=y -CONFIG_USB_SUPPORT=y -CONFIG_USE_OF=y -CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VECTORS_BASE=0xffff0000 -CONFIG_VFAT_FS=y -CONFIG_VFP=y -CONFIG_VFPv3=y -CONFIG_VIDEOMODE_HELPERS=y -# CONFIG_VIDEO_ATMEL_ISI is not set -# CONFIG_VIDEO_CPIA2 is not set -CONFIG_VIDEO_DEV=y -CONFIG_VIDEO_V4L2=y -CONFIG_VM_EVENT_COUNTERS=y -CONFIG_WATCHDOG_CORE=y -# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set -CONFIG_ZBOOT_ROM_BSS=0x0 -CONFIG_ZBOOT_ROM_TEXT=0x0 -CONFIG_ZLIB_DEFLATE=y -CONFIG_ZLIB_INFLATE=y diff --git a/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch deleted file mode 100644 index c0eb6dafb2..0000000000 --- a/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -33,6 +33,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ - usb_a9g20.dtb \ - usb_a9g20_lpw.dtb \ - at91sam9m10g45ek.dtb \ -+ lmu5000.dtb \ - pm9g45.dtb \ - at91sam9n12ek.dtb \ - at91sam9rlek.dtb \ diff --git a/target/linux/at91/patches-4.14/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch b/target/linux/at91/patches-4.14/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch deleted file mode 100644 index b3bede41dc..0000000000 --- a/target/linux/at91/patches-4.14/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch +++ /dev/null @@ -1,434 +0,0 @@ ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -50,6 +50,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ - wb45n.dtb - dtb-$(CONFIG_SOC_SAM_V7) += \ - at91-kizbox2.dtb \ -+ at91-sama5d2_ptc_ek.dtb \ - at91-sama5d27_som1_ek.dtb \ - at91-sama5d2_xplained.dtb \ - at91-sama5d3_xplained.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts -@@ -0,0 +1,421 @@ -+// SPDX-License-Identifier: (GPL-2.0+ OR X11) -+/* -+ * at91-sama5d2_ptc_ek.dts - Device Tree file for SAMA5D2 PTC EK board -+ * -+ * Copyright (C) 2017 Microchip/Atmel, -+ * 2017 Wenyou Yang -+ * 2017 Ludovic Desroches -+ */ -+/dts-v1/; -+#include "sama5d2.dtsi" -+#include "sama5d2-pinfunc.h" -+#include -+#include -+#include -+ -+/ { -+ model = "Atmel SAMA5D2 PTC EK"; -+ compatible = "atmel,sama5d2-ptc_ek", "atmel,sama5d2", "atmel,sama5"; -+ -+ aliases { -+ serial0 = &uart0; -+ i2c0 = &i2c0; -+ i2c1 = &i2c1; -+ i2c2 = &i2c2; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ memory { -+ reg = <0x20000000 0x80000>; -+ }; -+ -+ clocks { -+ slow_xtal { -+ clock-frequency = <32768>; -+ }; -+ -+ main_xtal { -+ clock-frequency = <24000000>; -+ }; -+ }; -+ -+ ahb { -+ usb0: gadget@00300000 { -+ atmel,vbus-gpio = <&pioA PIN_PB11 GPIO_ACTIVE_HIGH>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usba_vbus>; -+ status = "okay"; -+ }; -+ -+ usb1: ohci@00400000 { -+ num-ports = <3>; -+ atmel,vbus-gpio = <0 -+ &pioA PIN_PB12 GPIO_ACTIVE_HIGH -+ 0 -+ >; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usb_default>; -+ status = "okay"; -+ }; -+ -+ usb2: ehci@00500000 { -+ status = "okay"; -+ }; -+ -+ nand0: nand@80000000 { -+ nand-bus-width = <8>; -+ nand-ecc-mode = "hw"; -+ nand-on-flash-bbt; -+ atmel,has-pmecc; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_nand_default>; -+ status = "okay"; /* conflicts with sdmmc1 and qspi0 */ -+ -+ at91bootstrap@0 { -+ label = "bootstrap"; -+ reg = <0x0 0x40000>; -+ }; -+ -+ bootloader@40000 { -+ label = "bootloader"; -+ reg = <0x40000 0xc0000>; -+ }; -+ -+ bootloaderenv@0x100000 { -+ label = "bootloader env"; -+ reg = <0x100000 0x40000>; -+ }; -+ -+ bootloaderenvred@0x140000 { -+ label = "bootloader env redundant"; -+ reg = <0x140000 0x40000>; -+ }; -+ -+ dtb@180000 { -+ label = "device tree"; -+ reg = <0x180000 0x80000>; -+ }; -+ -+ kernel@200000 { -+ label = "kernel"; -+ reg = <0x200000 0x600000>; -+ }; -+ -+ rootfs@800000 { -+ label = "rootfs"; -+ reg = <0x800000 0x1f800000>; -+ }; -+ }; -+ -+ sdmmc0: sdio-host@a0000000 { -+ bus-width = <8>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_sdmmc0_default>; -+ status = "okay"; -+ }; -+ -+ apb { -+ pmc: pmc@f0014000 { -+ pmc_fast_restart { -+ compatible = "atmel,sama5d2-pmc-fast-startup"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ -+ atmel,wakeup-rtc-timer; -+ -+ wkpin: input@0 { -+ reg = <0>; -+ }; -+ -+ gmac_wol: input@10 { -+ reg = <10>; -+ atmel,wakeup-active-high; -+ }; -+ }; -+ }; -+ -+ spi0: spi@f8000000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_spi0_default>; -+ status = "okay"; -+ -+ /* -+ m25p80@0 { -+ compatible = "atmel,at25df321a"; -+ reg = <0>; -+ spi-max-frequency = <50000000>; -+ }; -+ */ -+ }; -+ -+ macb0: ethernet@f8008000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_macb0_default &pinctrl_macb0_phy_irq>; -+ phy-mode = "rmii"; -+ status = "okay"; -+ -+ ethernet-phy@1 { -+ reg = <0x1>; -+ interrupt-parent = <&pioA>; -+ interrupts = <56 IRQ_TYPE_LEVEL_LOW>; -+ }; -+ }; -+ -+ uart0: serial@f801c000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart0_default>; -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ status = "okay"; -+ }; -+ -+ uart2: serial@f8024000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart2_default>; -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ status = "okay"; -+ }; -+ -+ i2c0: i2c@f8028000 { -+ dmas = <0>, <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_i2c0_default>; -+ i2c-sda-hold-time-ns = <350>; -+ status = "okay"; -+ }; -+ -+ flx0: flexcom@f8034000 { -+ atmel,flexcom-mode = ; -+ status = "okay"; -+ -+ i2c2: i2c@600 { -+ compatible = "atmel,sama5d2-i2c"; -+ reg = <0x600 0x200>; -+ interrupts = <19 IRQ_TYPE_LEVEL_HIGH 7>; -+ dmas = <0>, <0>; -+ dma-names = "tx", "rx"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clocks = <&flx0_clk>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_flx0_default>; -+ atmel,fifo-size = <16>; -+ status = "okay"; -+ }; -+ }; -+ -+ shdwc@f8048010 { -+ atmel,shdwc-debouncer = <976>; -+ -+ input@0 { -+ reg = <0>; -+ atmel,wakeup-type = "low"; -+ }; -+ }; -+ -+ watchdog@f8048040 { -+ status = "okay"; -+ }; -+ -+ spi1: spi@fc000000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_spi1_default>; -+ status = "okay"; -+ }; -+ -+ i2c1: i2c@fc028000 { -+ dmas = <0>, <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_i2c1_default>; -+ status = "okay"; -+ -+ at24@50 { -+ compatible = "24c02"; -+ reg = <0x50>; -+ pagesize = <8>; -+ }; -+ }; -+ -+ pinctrl@fc038000 { -+ pinctrl_flx0_default: flx0_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_i2c0_default: i2c0_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_i2c1_default: i2c1_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_key_gpio_default: key_gpio_default { -+ pinmux = ; -+ bias-pull-up; -+ }; -+ -+ pinctrl_led_gpio_default: led_gpio_default { -+ pinmux = , -+ , -+ ; -+ bias-pull-up; -+ }; -+ -+ pinctrl_macb0_default: macb0_default { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_macb0_phy_irq: macb0_phy_irq { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_nand_default: nand_default { -+ re_we_data { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-pull-up; -+ }; -+ -+ ale_cle_rdy_cs { -+ pinmux = , -+ , -+ , -+ ; -+ bias-pull-up; -+ }; -+ }; -+ -+ pinctrl_sdmmc0_default: sdmmc0_default { -+ cmd_data { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-pull-up; -+ }; -+ -+ ck_cd_vddsel { -+ pinmux = , -+ , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_spi0_default: spi0_default { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_spi1_default: spi1_default { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_uart0_default: uart0_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_uart2_default: uart2_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_usb_default: usb_default { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_usba_vbus: usba_vbus { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ }; -+ -+ ptc@fc060000 { -+ status = "okay"; -+ }; -+ }; -+ }; -+ -+ gpio_keys { -+ compatible = "gpio-keys"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_key_gpio_default>; -+ -+ bp1 { -+ label = "PB_USER"; -+ gpios = <&pioA PIN_PA10 GPIO_ACTIVE_LOW>; -+ linux,code = <0x104>; -+ wakeup-source; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led_gpio_default>; -+ status = "okay"; -+ -+ red { -+ label = "red"; -+ gpios = <&pioA PIN_PB10 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ green { -+ label = "green"; -+ gpios = <&pioA PIN_PB8 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ blue { -+ label = "blue"; -+ gpios = <&pioA PIN_PB6 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+}; diff --git a/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch similarity index 74% rename from target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch rename to target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch index 6c84c9401b..b736b99f7f 100644 --- a/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch +++ b/target/linux/at91/patches-5.4/101-ARM-at91-build-dtb-for-q5xr5.patch @@ -1,10 +1,10 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -41,6 +41,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -38,6 +38,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91-ariettag25.dtb \ at91-cosino_mega2560.dtb \ at91-kizboxmini.dtb \ + at91-q5xr5.dtb \ + at91-wb45n.dtb \ at91sam9g15ek.dtb \ at91sam9g25ek.dtb \ - at91sam9g35ek.dtb \ diff --git a/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch similarity index 74% rename from target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch rename to target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch index f6190c4959..c35ecc510a 100644 --- a/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch +++ b/target/linux/at91/patches-5.4/102-ARM-at91-build-dtb-for-wb45n.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -46,7 +46,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -44,7 +44,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91sam9g25ek.dtb \ at91sam9g35ek.dtb \ at91sam9x25ek.dtb \ @@ -9,4 +9,4 @@ + wb45n.dtb dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox2.dtb \ - at91-sama5d27_som1_ek.dtb \ + at91-nattis-2-natte-2.dtb \ diff --git a/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch new file mode 100644 index 0000000000..9d060426ec --- /dev/null +++ b/target/linux/at91/patches-5.4/102-ARM-at91-wb45n-fix-duplicate-label.patch @@ -0,0 +1,20 @@ +--- a/arch/arm/boot/dts/wb45n.dts ++++ b/arch/arm/boot/dts/wb45n.dts +@@ -126,7 +126,7 @@ + }; + }; + +- usb0: ohci@00600000 { ++ usb0: ohci@600000 { + status = "okay"; + num-ports = <2>; + atmel,vbus-gpio = < +@@ -136,7 +136,7 @@ + atmel,oc-gpio = <&pioB 13 GPIO_ACTIVE_LOW>; + }; + +- usb1: ehci@00700000 { ++ usb1: ehci@700000 { + status = "okay"; + }; + diff --git a/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch similarity index 85% rename from target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch rename to target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch index 324017c517..ab5d7afcbb 100644 --- a/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch +++ b/target/linux/at91/patches-5.4/103-ARM-at91-build-dtb-for-wb50n.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -63,7 +63,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ +@@ -66,7 +66,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ at91-sama5d4ek.dtb \ diff --git a/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch b/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch new file mode 100644 index 0000000000..bfe6e5a9ba --- /dev/null +++ b/target/linux/at91/patches-5.4/103-ARM-at91-wb50n-fix-duplicate-label.patch @@ -0,0 +1,39 @@ +--- a/arch/arm/boot/dts/wb50n.dts ++++ b/arch/arm/boot/dts/wb50n.dts +@@ -60,15 +60,15 @@ + }; + }; + +- usb0: gadget@00500000 { ++ usb0: gadget@500000 { + status = "okay"; + }; + +- usb1: ohci@00600000 { ++ usb1: ohci@600000 { + status = "okay"; + }; + +- usb2: ehci@00700000 { ++ usb2: ehci@700000 { + status = "okay"; + }; + }; +--- a/arch/arm/boot/dts/wb50n.dtsi ++++ b/arch/arm/boot/dts/wb50n.dtsi +@@ -185,13 +185,13 @@ + + }; + +- usb0: gadget@00500000 { ++ usb0: gadget@500000 { + atmel,vbus-gpio = <&pioB 13 GPIO_ACTIVE_LOW>; + pinctrl-names = "default"; + pinctrl-0 = <&pinctrl_usba_vbus>; + }; + +- usb1: ohci@00600000 { ++ usb1: ohci@600000 { + num-ports = <3>; + atmel,vbus-gpio = <&pioA 2 GPIO_ACTIVE_LOW>; + atmel,oc-gpio = <&pioA 4 GPIO_ACTIVE_LOW>; diff --git a/target/linux/at91/sam9x/config-default b/target/linux/at91/sam9x/config-default index a8923a6efe..08506f40f9 100644 --- a/target/linux/at91/sam9x/config-default +++ b/target/linux/at91/sam9x/config-default @@ -6,6 +6,7 @@ CONFIG_ARCH_MULTI_V5=y # CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set # CONFIG_ARM_AT91_CPUIDLE is not set CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_THUMB=y # CONFIG_AT91RM9200_WATCHDOG is not set # CONFIG_AT91_SAMA5D2_ADC is not set CONFIG_ATMEL_AIC_IRQ=y @@ -43,7 +44,12 @@ CONFIG_HZ_FIXED=128 CONFIG_HZ_PERIODIC=y # CONFIG_MFD_ACT8945A is not set # CONFIG_MFD_ATMEL_FLEXCOM is not set -# CONFIG_MMC_SDHCI is not set +CONFIG_MMC=y +CONFIG_MMC_ATMELMCI=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_OF_AT91=y +CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MMC_SPI=y # CONFIG_MTD_SPI_NOR is not set CONFIG_NEED_KUSER_HELPERS=y @@ -62,3 +68,8 @@ CONFIG_SOC_SAM_V4_V5=y CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_TOUCHSCREEN_ADS7846=y # CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ZBOOT_ROM_TEXT=0x0 +# CONFIG_VFP is not set +# CONFIG_UNWINDER_FRAME_POINTER is not set +CONFIG_UNWINDER_ARM=y diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default index e69de29bb2..140f6dd4f4 100644 --- a/target/linux/at91/sama5/config-default +++ b/target/linux/at91/sama5/config-default @@ -0,0 +1,572 @@ +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_AT91=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_SG_CHAIN=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MULTIPLATFORM=y +# CONFIG_ARCH_MULTI_CPU_AUTO is not set +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 is not set +# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +CONFIG_ARM_AT91_CPUIDLE=y +CONFIG_ARM_CPU_SUSPEND=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_LPAE is not set +CONFIG_ARM_PATCH_IDIV=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_ARM_THUMB=y +# CONFIG_ARM_THUMBEE is not set +CONFIG_ARM_UNWIND=y +CONFIG_ARM_VIRT_EXT=y +CONFIG_AT91SAM9X_WATCHDOG=y +CONFIG_AT91_ADC=y +CONFIG_AT91_SAMA5D2_ADC=y +CONFIG_AT91_SOC_ID=y +CONFIG_ATMEL_AIC5_IRQ=y +CONFIG_ATMEL_EBI=y +CONFIG_ATMEL_PIT=y +CONFIG_ATMEL_PM=y +CONFIG_ATMEL_SDRAMC=y +CONFIG_ATMEL_SSC=y +CONFIG_ATMEL_TCB_CLKSRC=y +CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 +CONFIG_ATMEL_TCLIB=y +CONFIG_AT_HDMAC=y +CONFIG_AT_XDMAC=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_BACKLIGHT_PWM=y +CONFIG_BATTERY_ACT8945A=y +CONFIG_BLK_DEV_LOOP=y +CONFIG_BLK_DEV_RAM=y +CONFIG_BLK_DEV_RAM_COUNT=4 +CONFIG_BLK_DEV_RAM_SIZE=8192 +CONFIG_BLK_DEV_SD=y +CONFIG_BLK_SCSI_REQUEST=y +CONFIG_CACHE_L2X0=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLONE_BACKWARDS=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_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" +CONFIG_COMMON_CLK=y +CONFIG_COMMON_CLK_AT91=y +CONFIG_CONFIGFS_FS=y +CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_COREDUMP=y +CONFIG_CPU_32v6K=y +CONFIG_CPU_32v7=y +CONFIG_CPU_ABRT_EV7=y +# CONFIG_CPU_BPREDICT_DISABLE is not set +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_HAS_ASID=y +# CONFIG_CPU_ICACHE_DISABLE is not set +CONFIG_CPU_IDLE=y +CONFIG_CPU_IDLE_GOV_LADDER=y +CONFIG_CPU_IDLE_GOV_MENU=y +CONFIG_CPU_PABRT_V7=y +CONFIG_CPU_PM=y +CONFIG_CPU_SPECTRE=y +CONFIG_CPU_THUMB_CAPABLE=y +CONFIG_CPU_TLB_V7=y +CONFIG_CPU_V7=y +CONFIG_CRASH_CORE=y +CONFIG_CRASH_DUMP=y +CONFIG_CRC16=y +# CONFIG_CRC32_SARWATE is not set +CONFIG_CRC32_SLICEBY8=y +CONFIG_CROSS_MEMORY_ATTACH=y +CONFIG_CRYPTO_ACOMP2=y +CONFIG_CRYPTO_AEAD=y +CONFIG_CRYPTO_AEAD2=y +CONFIG_CRYPTO_CCM=y +CONFIG_CRYPTO_CRC32C=y +CONFIG_CRYPTO_CTR=y +CONFIG_CRYPTO_DEFLATE=y +CONFIG_CRYPTO_DRBG=y +CONFIG_CRYPTO_DRBG_HMAC=y +CONFIG_CRYPTO_DRBG_MENU=y +CONFIG_CRYPTO_GCM=y +CONFIG_CRYPTO_GF128MUL=y +CONFIG_CRYPTO_GHASH=y +CONFIG_CRYPTO_HASH=y +CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HMAC=y +CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LZO=y +CONFIG_CRYPTO_MANAGER=y +CONFIG_CRYPTO_MANAGER2=y +CONFIG_CRYPTO_NULL=y +CONFIG_CRYPTO_NULL2=y +CONFIG_CRYPTO_RNG=y +CONFIG_CRYPTO_RNG2=y +CONFIG_CRYPTO_RNG_DEFAULT=y +CONFIG_CRYPTO_SEQIV=y +CONFIG_CRYPTO_SHA256=y +CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_DCACHE_WORD_ACCESS=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_DEBUG_MEMORY_INIT=y +# CONFIG_DEBUG_UART_8250 is not set +CONFIG_UNWINDER_ARM=y +CONFIG_DEBUG_USER=y +CONFIG_DEFAULT_IOSCHED="noop" +CONFIG_DEFAULT_NOOP=y +CONFIG_DMADEVICES=y +CONFIG_DMA_CMA=y +CONFIG_DMA_ENGINE=y +CONFIG_DMA_OF=y +CONFIG_DMA_SHARED_BUFFER=y +CONFIG_DNOTIFY=y +CONFIG_DRM=y +CONFIG_DRM_ATMEL_HLCDC=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_PANEL=y +CONFIG_DRM_PANEL_BRIDGE=y +CONFIG_DRM_PANEL_SIMPLE=y +# CONFIG_DRM_TVE200 is not set +CONFIG_DTC=y +CONFIG_DUMMY_CONSOLE=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_EEPROM_AT24=y +CONFIG_ELF_CORE=y +CONFIG_ENABLE_MUST_CHECK=y +CONFIG_EXT4_FS=y +CONFIG_FAT_FS=y +CONFIG_FB=y +# CONFIG_FB_ATMEL is not set +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_PROVIDE_GET_FB_UNMAPPED_AREA is not set +CONFIG_FB_SYS_COPYAREA=y +CONFIG_FB_SYS_FILLRECT=y +CONFIG_FB_SYS_FOPS=y +CONFIG_FB_SYS_IMAGEBLIT=y +CONFIG_FIRMWARE_IN_KERNEL=y +CONFIG_FIXED_PHY=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FORCE_MAX_ZONEORDER=15 +CONFIG_FREEZER=y +CONFIG_FS_MBCACHE=y +CONFIG_GENERIC_ALLOCATOR=y +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_GENERIC_IDLE_POLL_SETUP=y +CONFIG_GENERIC_IO=y +CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_SHOW=y +CONFIG_GENERIC_IRQ_SHOW_LEVEL=y +CONFIG_GENERIC_PCI_IOMAP=y +CONFIG_GENERIC_PINCONF=y +CONFIG_GENERIC_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_GLOB=y +CONFIG_GPIOLIB=y +CONFIG_GPIOLIB_IRQCHIP=y +CONFIG_GPIO_SYSFS=y +# CONFIG_GRO_CELLS is not set +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_64BIT_ALIGNED_ACCESS is not set +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_HAVE_ARCH_BITREVERSE=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_ARM_SMCCC=y +CONFIG_HAVE_AT91_AUDIO_PLL=y +CONFIG_HAVE_AT91_GENERATED_CLK=y +CONFIG_HAVE_AT91_H32MX=y +CONFIG_HAVE_AT91_SMD=y +CONFIG_HAVE_AT91_USB_CLK=y +CONFIG_HAVE_AT91_UTMI=y +# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set +CONFIG_HAVE_CC_STACKPROTECTOR=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_API_DEBUG=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y +CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y +CONFIG_HAVE_FB_ATMEL=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_GENERIC_DMA_COHERENT=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_SMP=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HDMI=y +CONFIG_HID=y +CONFIG_HID_GENERIC=y +CONFIG_HW_CONSOLE=y +CONFIG_HW_RANDOM=y +CONFIG_HW_RANDOM_ATMEL=y +CONFIG_HZ_FIXED=0 +CONFIG_I2C=y +CONFIG_I2C_ALGOBIT=y +CONFIG_I2C_AT91=y +# CONFIG_I2C_AT91_SLAVE_EXPERIMENTAL is not set +CONFIG_I2C_BOARDINFO=y +CONFIG_I2C_CHARDEV=y +CONFIG_I2C_COMPAT=y +CONFIG_I2C_GPIO=y +CONFIG_I2C_HELPER_AUTO=y +CONFIG_IIO=y +CONFIG_IIO_BUFFER=y +CONFIG_IIO_KFIFO_BUF=y +CONFIG_IIO_TRIGGER=y +CONFIG_IIO_TRIGGERED_BUFFER=y +CONFIG_INITRAMFS_SOURCE="" +CONFIG_INPUT=y +CONFIG_INPUT_EVDEV=y +CONFIG_INPUT_KEYBOARD=y +CONFIG_INPUT_LEDS=y +CONFIG_INPUT_TOUCHSCREEN=y +CONFIG_IOMMU_HELPER=y +# CONFIG_IOSCHED_DEADLINE is not set +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_DOMAIN_DEBUG=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_JBD2=y +# CONFIG_JFFS2_FS is not set +CONFIG_KERNEL_GZIP=y +# CONFIG_KERNEL_XZ is not set +CONFIG_KEXEC=y +CONFIG_KEXEC_CORE=y +CONFIG_KEYBOARD_GPIO=y +CONFIG_KEYBOARD_QT1070=y +# CONFIG_LCD_CLASS_DEVICE is not set +CONFIG_LEDS_GPIO=y +CONFIG_LEDS_PWM=y +CONFIG_LEDS_TRIGGER_CPU=y +# CONFIG_LEDS_TRIGGER_DEFAULT_ON is not set +CONFIG_LEDS_TRIGGER_GPIO=y +CONFIG_LEDS_TRIGGER_HEARTBEAT=y +CONFIG_LIBFDT=y +CONFIG_LOCALVERSION_AUTO=y +CONFIG_LOG_BUF_SHIFT=16 +CONFIG_LZO_COMPRESS=y +CONFIG_LZO_DECOMPRESS=y +CONFIG_MACB=y +CONFIG_MACB_USE_HWSTAMP=y +CONFIG_MAGIC_SYSRQ=y +CONFIG_MANDATORY_FILE_LOCKING=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y +CONFIG_MEDIA_CAMERA_SUPPORT=y +CONFIG_MEDIA_SUPPORT=y +CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_MEMORY=y +CONFIG_MEMORY_ISOLATION=y +CONFIG_MFD_ACT8945A=y +CONFIG_MFD_ATMEL_FLEXCOM=y +CONFIG_MFD_ATMEL_HLCDC=y +CONFIG_MFD_ATMEL_SMC=y +CONFIG_MFD_CORE=y +CONFIG_MFD_SYSCON=y +CONFIG_MICREL_PHY=y +CONFIG_MIGHT_HAVE_CACHE_L2X0=y +CONFIG_MIGHT_HAVE_PCI=y +CONFIG_MIGRATION=y +CONFIG_MMC=y +CONFIG_MMC_ATMELMCI=y +CONFIG_MMC_BLOCK=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_OF_AT91=y +CONFIG_MMC_SDHCI_PLTFM=y +CONFIG_MODULES_USE_ELF_REL=y +# CONFIG_MTD_CFI_AMDSTD is not set +# CONFIG_MTD_CFI_INTELEXT is not set +CONFIG_MTD_CMDLINE_PARTS=y +# CONFIG_MTD_COMPLEX_MAPPINGS is not set +CONFIG_MTD_M25P80=y +CONFIG_MTD_NAND=y +CONFIG_MTD_NAND_ATMEL=y +CONFIG_MTD_NAND_ECC=y +# CONFIG_MTD_PHYSMAP_OF is not set +CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_UBI=y +CONFIG_MTD_UBI_BEB_LIMIT=20 +# CONFIG_MTD_UBI_BLOCK is not set +CONFIG_MTD_UBI_FASTMAP=y +# CONFIG_MTD_UBI_GLUEBI is not set +CONFIG_MTD_UBI_WL_THRESHOLD=4096 +CONFIG_MULTI_IRQ_HANDLER=y +CONFIG_NEED_DMA_MAP_STATE=y +CONFIG_NEED_PER_CPU_KM=y +CONFIG_NLS=y +CONFIG_NLS_CODEPAGE_437=y +CONFIG_NLS_CODEPAGE_850=y +CONFIG_NLS_ISO8859_1=y +CONFIG_NLS_UTF8=y +CONFIG_NO_BOOTMEM=y +CONFIG_NO_HZ_COMMON=y +CONFIG_NO_HZ_IDLE=y +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_MDIO=y +CONFIG_OF_NET=y +CONFIG_OF_RESERVED_MEM=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_OUTER_CACHE=y +CONFIG_OUTER_CACHE_SYNC=y +CONFIG_PAGE_OFFSET=0xC0000000 +# CONFIG_PARTITION_ADVANCED is not set +# CONFIG_PCI_DOMAINS_GENERIC is not set +# CONFIG_PCI_SYSCALL is not set +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_PHYLIB=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_AT91=y +CONFIG_PINCTRL_AT91PIO4=y +# CONFIG_PINCTRL_SINGLE is not set +# CONFIG_PL310_ERRATA_588369 is not set +# CONFIG_PL310_ERRATA_727915 is not set +# CONFIG_PL310_ERRATA_753970 is not set +# CONFIG_PL310_ERRATA_769419 is not set +CONFIG_PM=y +CONFIG_PM_ADVANCED_DEBUG=y +CONFIG_PM_CLK=y +CONFIG_PM_DEBUG=y +CONFIG_PM_SLEEP=y +CONFIG_PM_SLEEP_DEBUG=y +# CONFIG_PM_TEST_SUSPEND is not set +CONFIG_POWER_RESET=y +CONFIG_POWER_RESET_AT91_POWEROFF=y +CONFIG_POWER_RESET_AT91_RESET=y +CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y +CONFIG_POWER_SUPPLY=y +# CONFIG_PREVENT_FIRMWARE_BUILD is not set +CONFIG_PRINTK_TIME=y +CONFIG_PROC_VMCORE=y +CONFIG_PWM=y +CONFIG_PWM_ATMEL=y +CONFIG_PWM_ATMEL_HLCDC_PWM=y +CONFIG_PWM_ATMEL_TCB=y +CONFIG_PWM_SYSFS=y +CONFIG_RATIONAL=y +# CONFIG_RCU_NEED_SEGCBLIST is not set +# CONFIG_RCU_STALL_COMMON is not set +CONFIG_REGMAP=y +CONFIG_REGMAP_I2C=y +CONFIG_REGMAP_MMIO=y +CONFIG_REGMAP_SPI=y +CONFIG_REGULATOR=y +CONFIG_REGULATOR_ACT8865=y +CONFIG_REGULATOR_ACT8945A=y +CONFIG_REGULATOR_FIXED_VOLTAGE=y +CONFIG_RTC_CLASS=y +CONFIG_RTC_DRV_AT91RM9200=y +# CONFIG_RTC_DRV_AT91SAM9 is not set +# CONFIG_RTC_DRV_CMOS is not set +CONFIG_RTC_I2C_AND_SPI=y +CONFIG_RWSEM_XCHGADD_ALGORITHM=y +CONFIG_SAMA5D4_WATCHDOG=y +# CONFIG_SCHED_INFO is not set +CONFIG_SCSI=y +# CONFIG_SCSI_LOWLEVEL is not set +# CONFIG_SERIAL_8250 is not set +CONFIG_SERIAL_ATMEL=y +CONFIG_SERIAL_ATMEL_CONSOLE=y +CONFIG_SERIAL_ATMEL_PDC=y +# CONFIG_SERIAL_ATMEL_TTYAT is not set +CONFIG_SERIAL_MCTRL_GPIO=y +CONFIG_SG_POOL=y +CONFIG_SND=y +CONFIG_SND_ARM=y +# CONFIG_SND_AT73C213 is not set +# CONFIG_SND_AT91_SOC_SAM9G20_WM8731 is not set +# CONFIG_SND_AT91_SOC_SAM9X5_WM8731 is not set +CONFIG_SND_ATMEL_SOC=y +CONFIG_SND_ATMEL_SOC_CLASSD=y +CONFIG_SND_ATMEL_SOC_DMA=y +# CONFIG_SND_ATMEL_SOC_PDMIC is not set +CONFIG_SND_ATMEL_SOC_SSC=y +# CONFIG_SND_ATMEL_SOC_SSC_PDC is not set +CONFIG_SND_ATMEL_SOC_SSC_DMA=y +# CONFIG_SND_ATMEL_SOC_TSE850_PCM5142 is not set +CONFIG_SND_ATMEL_SOC_I2S=y +CONFIG_SND_SOC_MIKROE_PROTO=y +# CONFIG_SND_MCHP_SOC_I2S_MCC is not set +CONFIG_SND_ATMEL_SOC_WM8904=y +# CONFIG_SND_COMPRESS_OFFLOAD is not set +CONFIG_SND_DMAENGINE_PCM=y +CONFIG_SND_JACK=y +CONFIG_SND_JACK_INPUT_DEV=y +CONFIG_SND_PCM=y +CONFIG_SND_PCM_TIMER=y +CONFIG_SND_SOC=y +CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y +CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_WM8904=y +CONFIG_SND_SPI=y +CONFIG_SND_SUPPORT_OLD_API=y +CONFIG_SND_TIMER=y +CONFIG_SOC_BUS=y +CONFIG_SOC_SAMA5=y +CONFIG_SOC_SAMA5D2=y +CONFIG_SOC_SAMA5D3=y +CONFIG_SOC_SAMA5D4=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set +CONFIG_ATMEL_CLOCKSOURCE_TCB=y +CONFIG_SOC_SAM_V7=y +CONFIG_SOUND=y +CONFIG_SOUND_OSS_CORE=y +# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set +CONFIG_SPARSE_IRQ=y +CONFIG_SPI=y +CONFIG_SPI_ATMEL=y +# CONFIG_SPI_AT91_USART is not set +CONFIG_SPI_ATMEL_QUADSPI=y +CONFIG_SPI_BITBANG=y +CONFIG_SPI_GPIO=y +CONFIG_SPI_MASTER=y +# CONFIG_SQUASHFS is not set +CONFIG_SRAM=y +CONFIG_SRAM_EXEC=y +CONFIG_SRCU=y +# CONFIG_STANDALONE is not set +CONFIG_SUSPEND=y +CONFIG_SUSPEND_FREEZER=y +CONFIG_SWIOTLB=y +CONFIG_SWPHY=y +# CONFIG_SWP_EMULATE is not set +CONFIG_SYNC_FILE=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +# CONFIG_THUMB2_KERNEL is not set +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_TINY_SRCU=y +CONFIG_TOUCHSCREEN_ATMEL_MXT=y +CONFIG_TOUCHSCREEN_PROPERTIES=y +CONFIG_UACCESS_WITH_MEMCPY=y +CONFIG_UBIFS_FS=y +CONFIG_UBIFS_FS_ADVANCED_COMPR=y +CONFIG_UBIFS_FS_LZO=y +CONFIG_UBIFS_FS_ZLIB=y +CONFIG_UBIFS_FS_ZSTD=y +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_USB=y +CONFIG_USB_ACM=y +CONFIG_USB_ANNOUNCE_NEW_DEVICES=y +# CONFIG_USB_AT91 is not set +# CONFIG_USB_ATMEL_USBA is not set +CONFIG_USB_COMMON=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_EHCI_HCD_AT91=y +# CONFIG_USB_EHCI_HCD_PLATFORM is not set +# CONFIG_USB_EHCI_ROOT_HUB_TT is not set +CONFIG_USB_GADGET=y +CONFIG_USB_HID=y +CONFIG_USB_OHCI_HCD=y +CONFIG_USB_OHCI_HCD_AT91=y +CONFIG_USB_OHCI_HCD_PLATFORM=y +# CONFIG_USB_PWC is not set +CONFIG_USB_SERIAL=y +# CONFIG_USB_SERIAL_CONSOLE is not set +CONFIG_USB_SERIAL_FTDI_SIO=y +CONFIG_USB_SERIAL_PL2303=y +CONFIG_USB_STORAGE=y +CONFIG_USB_SUPPORT=y +CONFIG_USE_OF=y +CONFIG_V4L_PLATFORM_DRIVERS=y +CONFIG_VECTORS_BASE=0xffff0000 +CONFIG_VFAT_FS=y +CONFIG_VFP=y +CONFIG_VFPv3=y +CONFIG_VIDEOMODE_HELPERS=y +# CONFIG_VIDEO_ATMEL_ISI is not set +# CONFIG_VIDEO_CPIA2 is not set +CONFIG_VIDEO_DEV=y +CONFIG_VIDEO_V4L2=y +CONFIG_VM_EVENT_COUNTERS=y +CONFIG_WATCHDOG_CORE=y +# CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_ZBOOT_ROM_BSS=0x0 +CONFIG_ZBOOT_ROM_TEXT=0x0 +CONFIG_ZLIB_DEFLATE=y +CONFIG_ZLIB_INFLATE=y From 9b36ca80322a77a9938f28ba5d618f37d42dd903 Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker M Date: Sat, 22 Aug 2020 12:55:48 -0700 Subject: [PATCH 04/11] at91bootstrap: bump version to v3.9.3 Signed-off-by: Sandeep Sheriker M --- package/boot/at91bootstrap/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index c4edddf848..eaec26b4a1 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at91bootstrap -PKG_VERSION:=v3.8.12 +PKG_VERSION:=v3.9.3 PKG_RELEASE:= PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git -PKG_SOURCE_VERSION:=28e15d07e9f24efb04b87bb0baa211a0c5640ef1 +PKG_SOURCE_VERSION:=d96833a4b6680b237708eb4dc9f10708b9e709d8 PKG_BUILD_DIR = \ $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) From abf6c288c1434c4f7b946c48cc8d91ddab94958e Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker M Date: Sat, 22 Aug 2020 12:55:49 -0700 Subject: [PATCH 05/11] uboot-at91: bump version to linux4sam-2020.04 Bump version to linux4sam-2020.04 and add patch to fix Wformat-security warnings. Signed-off-by: Sandeep Sheriker M --- package/boot/uboot-at91/Makefile | 4 +-- .../patches/001-fix-Wformat-security.patch | 34 ++++++++++++++++--- 2 files changed, 32 insertions(+), 6 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 547b72f8d9..1fb32d4a89 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -7,12 +7,12 @@ include $(TOPDIR)/rules.mk -PKG_VERSION:=linux4sam_6.0 +PKG_VERSION:=linux4sam-2020.04 PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git -PKG_SOURCE_VERSION:=1e7d2e5973c1fb780e55e28a801c6c574158ac14 +PKG_SOURCE_VERSION:=0e1d1b6efb7f8e27c372279a906fcd2524df09da include $(INCLUDE_DIR)/u-boot.mk include $(INCLUDE_DIR)/package.mk diff --git a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch index 18f9af742c..23cb5828b3 100644 --- a/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch +++ b/package/boot/uboot-at91/patches/001-fix-Wformat-security.patch @@ -1,13 +1,39 @@ diff --git a/cmd/version.c b/cmd/version.c -index b2fffe9..bcbbeb1 100644 +index b2fffe99..bcbbeb18 100644 --- a/cmd/version.c +++ b/cmd/version.c @@ -18,7 +18,7 @@ static int do_version(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[]) { - char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; - + char buf[DISPLAY_OPTIONS_BANNER_LENGTH]; + - printf(display_options_get_banner(false, buf, sizeof(buf))); + printf("%s",display_options_get_banner(false, buf, sizeof(buf))); #ifdef CC_VERSION_STRING - puts(CC_VERSION_STRING "\n"); + puts(CC_VERSION_STRING "\n"); #endif +diff --git a/drivers/pinctrl/pinctrl-uclass.c b/drivers/pinctrl/pinctrl-uclass.c +index 3425ed11..8c2e1d5c 100644 +--- a/drivers/pinctrl/pinctrl-uclass.c ++++ b/drivers/pinctrl/pinctrl-uclass.c +@@ -368,7 +368,7 @@ int pinctrl_get_pin_name(struct udevice *dev, int selector, char *buf, + if (!ops->get_pin_name) + return -ENOSYS; + +- snprintf(buf, size, ops->get_pin_name(dev, selector)); ++ snprintf(buf, size, "%s", ops->get_pin_name(dev, selector)); + + return 0; + } +diff --git a/lib/efi_loader/efi_variable.c b/lib/efi_loader/efi_variable.c +index c316bdfe..5fe8129c 100644 +--- a/lib/efi_loader/efi_variable.c ++++ b/lib/efi_loader/efi_variable.c +@@ -522,7 +522,7 @@ efi_status_t EFIAPI efi_set_variable(u16 *variable_name, + + if (old_size) + /* APPEND_WRITE */ +- s += sprintf(s, old_val); ++ s += sprintf(s, "%s", old_val); + else + s += sprintf(s, "(blob)"); + From 0d0a0d6649a9e92c58a20e488d90f39e6334d2f4 Mon Sep 17 00:00:00 2001 From: Sandeep Sheriker M Date: Sat, 22 Aug 2020 12:55:50 -0700 Subject: [PATCH 06/11] at91: change dtb file path Changing dtb file path since the dtb files are build in KDIR folder with image- prefix. Signed-off-by: Sandeep Sheriker M [remove commented lines] Signed-off-by: Adrian Schmutzler --- target/linux/at91/image/Makefile | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index ff801dae86..959b1cb0a3 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -55,17 +55,14 @@ endef define Device/evaluation-dtb $(Device/evaluation) $(Device/dtb) - $(Device/evaluation-zImage) - IMAGES += dtb - IMAGE/dtb := install-dtb KERNEL_SUFFIX := -fit-zImage.itb - KERNEL := kernel-bin | gzip | fit gzip $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb endef define Device/evaluation-fit $(Device/evaluation) KERNEL_SUFFIX := -fit-uImage.itb - KERNEL := kernel-bin | lzma | fit lzma $$(DTS_DIR)/$$(DEVICE_DTS).dtb + KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb endef define Device/production From 186569e2e8aac5847ee125c127d500ba024fde0e Mon Sep 17 00:00:00 2001 From: Hauke Mehrtens Date: Sun, 23 Aug 2020 12:34:47 +0200 Subject: [PATCH 07/11] at91: Refresh kernel config This was done by running: make kernel_oldconfig CONFIG_TARGET=subtarget Signed-off-by: Hauke Mehrtens --- target/linux/at91/sam9x/config-default | 190 ++++++++++++++++++++----- target/linux/at91/sama5/config-default | 121 +++++++--------- 2 files changed, 206 insertions(+), 105 deletions(-) diff --git a/target/linux/at91/sam9x/config-default b/target/linux/at91/sam9x/config-default index 08506f40f9..43e2a02dd9 100644 --- a/target/linux/at91/sam9x/config-default +++ b/target/linux/at91/sam9x/config-default @@ -1,19 +1,53 @@ +CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_32BIT_OFF_T=y +CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_BINFMT_FLAT=y +CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y +CONFIG_ARCH_HAS_DMA_WRITE_COMBINE=y +CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y +CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_KCOV=y +CONFIG_ARCH_HAS_KEEPINITRD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y +CONFIG_ARCH_HAS_SET_MEMORY=y +CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y +CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y +CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y +CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_KEEP_MEMBLOCK=y +CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y +CONFIG_ARCH_MULTIPLATFORM=y # CONFIG_ARCH_MULTI_V4 is not set CONFIG_ARCH_MULTI_V4T=y CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_MULTI_V5=y -# CONFIG_ARCH_MULTI_V7 is not set -# CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT is not set -# CONFIG_ARM_AT91_CPUIDLE is not set +CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y +CONFIG_ARCH_SUPPORTS_UPROBES=y +CONFIG_ARCH_SUSPEND_POSSIBLE=y +CONFIG_ARCH_USE_BUILTIN_BSWAP=y +CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y +CONFIG_ARCH_WANT_GENERAL_HUGETLB=y +CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y +CONFIG_ARM=y +CONFIG_ARM_HAS_SG_CHAIN=y CONFIG_ARM_L1_CACHE_SHIFT=5 +CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y -# CONFIG_AT91RM9200_WATCHDOG is not set -# CONFIG_AT91_SAMA5D2_ADC is not set -CONFIG_ATMEL_AIC_IRQ=y -CONFIG_ATMEL_ST=y -CONFIG_BACKLIGHT_ATMEL_LCDC=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CMA_DEBUGFS=y +CONFIG_ARM_UNWIND=y +CONFIG_AUTO_ZRELADDR=y +CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y +CONFIG_CC_HAS_KASAN_GENERIC=y +CONFIG_CLKDEV_LOOKUP=y +CONFIG_CLONE_BACKWARDS=y +CONFIG_COMMON_CLK=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CPU_32v4T=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV4T=y @@ -24,52 +58,130 @@ CONFIG_CPU_ARM926T=y CONFIG_CPU_CACHE_V4WT=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_V4WB=y +CONFIG_CPU_CP15=y +CONFIG_CPU_CP15_MMU=y # CONFIG_CPU_DCACHE_WRITETHROUGH is not set -# CONFIG_CPU_IDLE_GOV_MENU is not set CONFIG_CPU_NO_EFFICIENT_FFS=y CONFIG_CPU_PABRT_LEGACY=y +CONFIG_CPU_THUMB_CAPABLE=y CONFIG_CPU_TLB_V4WBI=y CONFIG_CPU_USE_DOMAINS=y CONFIG_CRC7=y CONFIG_CRC_CCITT=y CONFIG_CRC_ITU_T=y +CONFIG_CRYPTO_RNG2=y CONFIG_DEBUG_INFO=y -CONFIG_FB_ATMEL=y -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y +CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" +CONFIG_DMA_REMAP=y +CONFIG_DTC=y +CONFIG_EDAC_ATOMIC_SCRUB=y +CONFIG_EDAC_SUPPORT=y +CONFIG_FIX_EARLYCON_MEM=y +CONFIG_FW_LOADER_PAGED_BUF=y +CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_ATOMIC64=y -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HZ=128 -CONFIG_HZ_FIXED=128 +CONFIG_GENERIC_BUG=y +CONFIG_GENERIC_CLOCKEVENTS=y +CONFIG_GENERIC_CPU_AUTOPROBE=y +CONFIG_GENERIC_EARLY_IOREMAP=y +CONFIG_GENERIC_IDLE_POLL_SETUP=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_SCHED_CLOCK=y +CONFIG_GENERIC_SMP_IDLE_THREAD=y +CONFIG_GENERIC_STRNCPY_FROM_USER=y +CONFIG_GENERIC_STRNLEN_USER=y +CONFIG_HANDLE_DOMAIN_IRQ=y +CONFIG_HARDIRQS_SW_RESEND=y +CONFIG_HAS_DMA=y +CONFIG_HAS_IOMEM=y +CONFIG_HAS_IOPORT_MAP=y +CONFIG_HAVE_ARCH_AUDITSYSCALL=y +CONFIG_HAVE_ARCH_JUMP_LABEL=y +CONFIG_HAVE_ARCH_KGDB=y +CONFIG_HAVE_ARCH_PFN_VALID=y +CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y +CONFIG_HAVE_ARCH_TRACEHOOK=y +CONFIG_HAVE_CLK=y +CONFIG_HAVE_CLK_PREPARE=y +CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y +CONFIG_HAVE_C_RECORDMCOUNT=y +CONFIG_HAVE_DEBUG_KMEMLEAK=y +CONFIG_HAVE_DMA_CONTIGUOUS=y +CONFIG_HAVE_DYNAMIC_FTRACE=y +CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y +CONFIG_HAVE_EBPF_JIT=y +CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y +CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y +CONFIG_HAVE_FUNCTION_TRACER=y +CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y +CONFIG_HAVE_MOD_ARCH_SPECIFIC=y +CONFIG_HAVE_NET_DSA=y +CONFIG_HAVE_OPROFILE=y +CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PCI=y +CONFIG_HAVE_PERF_EVENTS=y +CONFIG_HAVE_PERF_REGS=y +CONFIG_HAVE_PERF_USER_STACK_DUMP=y +CONFIG_HAVE_PROC_CPU=y +CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y +CONFIG_HAVE_SYSCALL_TRACEPOINTS=y +CONFIG_HAVE_UID16=y +CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y +CONFIG_HZ=100 +CONFIG_HZ_100=y +CONFIG_HZ_FIXED=0 CONFIG_HZ_PERIODIC=y -# CONFIG_MFD_ACT8945A is not set -# CONFIG_MFD_ATMEL_FLEXCOM is not set +CONFIG_INITRAMFS_SOURCE="" +CONFIG_IRQCHIP=y +CONFIG_IRQ_DOMAIN=y +CONFIG_IRQ_FORCED_THREADING=y +CONFIG_IRQ_WORK=y +CONFIG_LIBFDT=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y +CONFIG_MEMFD_CREATE=y +CONFIG_MIGRATION=y CONFIG_MMC=y -CONFIG_MMC_ATMELMCI=y CONFIG_MMC_BLOCK=y CONFIG_MMC_SDHCI=y CONFIG_MMC_SDHCI_OF_AT91=y CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MMC_SPI=y -# CONFIG_MTD_SPI_NOR is not set +CONFIG_MODULES_USE_ELF_REL=y +CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_KUSER_HELPERS=y -# CONFIG_NO_HZ_IDLE is not set -# CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC is not set -# CONFIG_REGULATOR_ACT8865 is not set -CONFIG_RTC_DRV_AT91SAM9=y -# CONFIG_SAMA5D4_WATCHDOG is not set -# CONFIG_SND_ARM is not set -# CONFIG_SND_ATMEL_SOC_CLASSD is not set -# CONFIG_SND_DRIVERS is not set -# CONFIG_SND_SPI is not set -CONFIG_SOC_AT91RM9200=y -CONFIG_SOC_AT91SAM9=y -CONFIG_SOC_SAM_V4_V5=y +CONFIG_NEED_PER_CPU_KM=y +CONFIG_OF=y +CONFIG_OF_ADDRESS=y +CONFIG_OF_EARLY_FLATTREE=y +CONFIG_OF_FLATTREE=y +CONFIG_OF_IRQ=y +CONFIG_OF_KOBJ=y +CONFIG_OF_NET=y +CONFIG_OLD_SIGACTION=y +CONFIG_OLD_SIGSUSPEND3=y +CONFIG_PAGE_OFFSET=0xC0000000 +CONFIG_PERF_USE_VMALLOC=y +CONFIG_PGTABLE_LEVELS=2 +CONFIG_RATIONAL=y +CONFIG_REFCOUNT_FULL=y +CONFIG_SERIAL_8250_FSL=y +CONFIG_SPARSE_IRQ=y CONFIG_SPLIT_PTLOCK_CPUS=999999 -CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set +CONFIG_SRCU=y +CONFIG_SYS_SUPPORTS_APM_EMULATION=y +CONFIG_TICK_CPU_ACCOUNTING=y +CONFIG_TIMER_OF=y +CONFIG_TIMER_PROBE=y +CONFIG_TINY_SRCU=y +CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_UNWINDER_ARM=y +CONFIG_USE_OF=y +# CONFIG_VFP is not set CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 -# CONFIG_VFP is not set -# CONFIG_UNWINDER_FRAME_POINTER is not set -CONFIG_UNWINDER_ARM=y diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default index 140f6dd4f4..1f49678508 100644 --- a/target/linux/at91/sama5/config-default +++ b/target/linux/at91/sama5/config-default @@ -1,30 +1,37 @@ CONFIG_ALIGNMENT_TRAP=y +CONFIG_ARCH_32BIT_OFF_T=y CONFIG_ARCH_AT91=y CONFIG_ARCH_CLOCKSOURCE_DATA=y +CONFIG_ARCH_HAS_BINFMT_FLAT=y CONFIG_ARCH_HAS_DEBUG_VIRTUAL=y CONFIG_ARCH_HAS_ELF_RANDOMIZE=y +CONFIG_ARCH_HAS_FORTIFY_SOURCE=y CONFIG_ARCH_HAS_GCOV_PROFILE_ALL=y +CONFIG_ARCH_HAS_KCOV=y +CONFIG_ARCH_HAS_KEEPINITRD=y +CONFIG_ARCH_HAS_MEMBARRIER_SYNC_CORE=y +CONFIG_ARCH_HAS_PHYS_TO_DMA=y +CONFIG_ARCH_HAS_SETUP_DMA_OPS=y CONFIG_ARCH_HAS_SET_MEMORY=y -CONFIG_ARCH_HAS_SG_CHAIN=y CONFIG_ARCH_HAS_STRICT_KERNEL_RWX=y CONFIG_ARCH_HAS_STRICT_MODULE_RWX=y +CONFIG_ARCH_HAS_TEARDOWN_DMA_OPS=y CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y CONFIG_ARCH_HIBERNATION_POSSIBLE=y +CONFIG_ARCH_KEEP_MEMBLOCK=y CONFIG_ARCH_MIGHT_HAVE_PC_PARPORT=y CONFIG_ARCH_MULTIPLATFORM=y -# CONFIG_ARCH_MULTI_CPU_AUTO is not set 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 is not set -# CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y CONFIG_ARCH_SUPPORTS_UPROBES=y CONFIG_ARCH_SUSPEND_POSSIBLE=y CONFIG_ARCH_USE_BUILTIN_BSWAP=y CONFIG_ARCH_USE_CMPXCHG_LOCKREF=y +CONFIG_ARCH_WANT_DEFAULT_TOPDOWN_MMAP_LAYOUT=y CONFIG_ARCH_WANT_GENERAL_HUGETLB=y CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y CONFIG_ARM=y @@ -34,11 +41,9 @@ 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_LPAE is not set CONFIG_ARM_PATCH_IDIV=y CONFIG_ARM_PATCH_PHYS_VIRT=y CONFIG_ARM_THUMB=y -# CONFIG_ARM_THUMBEE is not set CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_AT91SAM9X_WATCHDOG=y @@ -46,28 +51,30 @@ CONFIG_AT91_ADC=y CONFIG_AT91_SAMA5D2_ADC=y CONFIG_AT91_SOC_ID=y CONFIG_ATMEL_AIC5_IRQ=y +# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set +CONFIG_ATMEL_CLOCKSOURCE_TCB=y CONFIG_ATMEL_EBI=y -CONFIG_ATMEL_PIT=y CONFIG_ATMEL_PM=y CONFIG_ATMEL_SDRAMC=y CONFIG_ATMEL_SSC=y CONFIG_ATMEL_TCB_CLKSRC=y -CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 CONFIG_ATMEL_TCLIB=y CONFIG_AT_HDMAC=y CONFIG_AT_XDMAC=y CONFIG_AUTO_ZRELADDR=y CONFIG_BACKLIGHT_CLASS_DEVICE=y -CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_PWM=y CONFIG_BATTERY_ACT8945A=y +CONFIG_BINFMT_FLAT_ARGVP_ENVP_ON_STACK=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_SD=y +CONFIG_BLK_PM=y CONFIG_BLK_SCSI_REQUEST=y CONFIG_CACHE_L2X0=y +CONFIG_CC_HAS_KASAN_GENERIC=y CONFIG_CLKDEV_LOOKUP=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y @@ -83,20 +90,19 @@ CONFIG_CMA_SIZE_SEL_MBYTES=y CONFIG_CMDLINE="console=ttyS0,115200 initrd=0x21100000,25165824 root=/dev/ram0 rw" CONFIG_COMMON_CLK=y CONFIG_COMMON_CLK_AT91=y +CONFIG_COMPAT_32BIT_TIME=y CONFIG_CONFIGFS_FS=y -CONFIG_CONSOLE_TRANSLATIONS=y +CONFIG_CONTIG_ALLOC=y CONFIG_COREDUMP=y CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y -# CONFIG_CPU_BPREDICT_DISABLE is not set 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_HAS_ASID=y -# CONFIG_CPU_ICACHE_DISABLE is not set CONFIG_CPU_IDLE=y CONFIG_CPU_IDLE_GOV_LADDER=y CONFIG_CPU_IDLE_GOV_MENU=y @@ -127,8 +133,10 @@ CONFIG_CRYPTO_GF128MUL=y CONFIG_CRYPTO_GHASH=y CONFIG_CRYPTO_HASH=y CONFIG_CRYPTO_HASH2=y +CONFIG_CRYPTO_HASH_INFO=y CONFIG_CRYPTO_HMAC=y CONFIG_CRYPTO_JITTERENTROPY=y +CONFIG_CRYPTO_LIB_SHA256=y CONFIG_CRYPTO_LZO=y CONFIG_CRYPTO_MANAGER=y CONFIG_CRYPTO_MANAGER2=y @@ -139,19 +147,16 @@ CONFIG_CRYPTO_RNG2=y CONFIG_CRYPTO_RNG_DEFAULT=y CONFIG_CRYPTO_SEQIV=y CONFIG_CRYPTO_SHA256=y -CONFIG_CRYPTO_WORKQUEUE=y +CONFIG_CRYPTO_ZSTD=y CONFIG_DCACHE_WORD_ACCESS=y CONFIG_DEBUG_LL_INCLUDE="mach/debug-macro.S" CONFIG_DEBUG_MEMORY_INIT=y -# CONFIG_DEBUG_UART_8250 is not set -CONFIG_UNWINDER_ARM=y CONFIG_DEBUG_USER=y -CONFIG_DEFAULT_IOSCHED="noop" -CONFIG_DEFAULT_NOOP=y CONFIG_DMADEVICES=y CONFIG_DMA_CMA=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y +CONFIG_DMA_REMAP=y CONFIG_DMA_SHARED_BUFFER=y CONFIG_DNOTIFY=y CONFIG_DRM=y @@ -165,10 +170,10 @@ CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_PANEL=y CONFIG_DRM_PANEL_BRIDGE=y +CONFIG_DRM_PANEL_ORIENTATION_QUIRKS=y CONFIG_DRM_PANEL_SIMPLE=y # CONFIG_DRM_TVE200 is not set CONFIG_DTC=y -CONFIG_DUMMY_CONSOLE=y CONFIG_EDAC_ATOMIC_SCRUB=y CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y @@ -177,31 +182,30 @@ CONFIG_ENABLE_MUST_CHECK=y CONFIG_EXT4_FS=y CONFIG_FAT_FS=y CONFIG_FB=y -# CONFIG_FB_ATMEL is not set 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_PROVIDE_GET_FB_UNMAPPED_AREA is not set CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y -CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FORCE_MAX_ZONEORDER=15 CONFIG_FREEZER=y +CONFIG_FS_IOMAP=y CONFIG_FS_MBCACHE=y +CONFIG_FW_LOADER_PAGED_BUF=y CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y CONFIG_GENERIC_CPU_AUTOPROBE=y CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y -CONFIG_GENERIC_IO=y CONFIG_GENERIC_IRQ_CHIP=y +CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y CONFIG_GENERIC_PCI_IOMAP=y @@ -213,58 +217,55 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GLOB=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y -CONFIG_GPIO_SYSFS=y -# CONFIG_GRO_CELLS is not set 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_64BIT_ALIGNED_ACCESS is not set CONFIG_HAVE_ARCH_AUDITSYSCALL=y CONFIG_HAVE_ARCH_BITREVERSE=y CONFIG_HAVE_ARCH_JUMP_LABEL=y CONFIG_HAVE_ARCH_KGDB=y CONFIG_HAVE_ARCH_PFN_VALID=y CONFIG_HAVE_ARCH_SECCOMP_FILTER=y +CONFIG_HAVE_ARCH_THREAD_STRUCT_WHITELIST=y CONFIG_HAVE_ARCH_TRACEHOOK=y CONFIG_HAVE_ARM_SMCCC=y CONFIG_HAVE_AT91_AUDIO_PLL=y CONFIG_HAVE_AT91_GENERATED_CLK=y CONFIG_HAVE_AT91_H32MX=y +CONFIG_HAVE_AT91_I2S_MUX_CLK=y CONFIG_HAVE_AT91_SMD=y CONFIG_HAVE_AT91_USB_CLK=y CONFIG_HAVE_AT91_UTMI=y -# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set -CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y CONFIG_HAVE_CONTEXT_TRACKING=y +CONFIG_HAVE_COPY_THREAD_TLS=y CONFIG_HAVE_C_RECORDMCOUNT=y CONFIG_HAVE_DEBUG_KMEMLEAK=y -CONFIG_HAVE_DMA_API_DEBUG=y CONFIG_HAVE_DMA_CONTIGUOUS=y CONFIG_HAVE_DYNAMIC_FTRACE=y CONFIG_HAVE_DYNAMIC_FTRACE_WITH_REGS=y CONFIG_HAVE_EBPF_JIT=y CONFIG_HAVE_EFFICIENT_UNALIGNED_ACCESS=y -CONFIG_HAVE_FB_ATMEL=y CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y CONFIG_HAVE_FUNCTION_TRACER=y -CONFIG_HAVE_GENERIC_DMA_COHERENT=y CONFIG_HAVE_IRQ_TIME_ACCOUNTING=y -CONFIG_HAVE_MEMBLOCK=y +CONFIG_HAVE_LD_DEAD_CODE_DATA_ELIMINATION=y CONFIG_HAVE_MOD_ARCH_SPECIFIC=y CONFIG_HAVE_NET_DSA=y CONFIG_HAVE_OPROFILE=y CONFIG_HAVE_OPTPROBES=y +CONFIG_HAVE_PCI=y CONFIG_HAVE_PERF_EVENTS=y CONFIG_HAVE_PERF_REGS=y CONFIG_HAVE_PERF_USER_STACK_DUMP=y CONFIG_HAVE_PROC_CPU=y CONFIG_HAVE_REGS_AND_STACK_ACCESS_API=y +CONFIG_HAVE_RSEQ=y CONFIG_HAVE_SMP=y CONFIG_HAVE_SYSCALL_TRACEPOINTS=y CONFIG_HAVE_UID16=y @@ -272,9 +273,10 @@ CONFIG_HAVE_VIRT_CPU_ACCOUNTING_GEN=y CONFIG_HDMI=y CONFIG_HID=y CONFIG_HID_GENERIC=y -CONFIG_HW_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_ATMEL=y +CONFIG_HZ=100 +CONFIG_HZ_100=y CONFIG_HZ_FIXED=0 CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y @@ -296,11 +298,8 @@ CONFIG_INPUT_EVDEV=y CONFIG_INPUT_KEYBOARD=y CONFIG_INPUT_LEDS=y CONFIG_INPUT_TOUCHSCREEN=y -CONFIG_IOMMU_HELPER=y -# CONFIG_IOSCHED_DEADLINE is not set CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y -CONFIG_IRQ_DOMAIN_DEBUG=y CONFIG_IRQ_FORCED_THREADING=y CONFIG_IRQ_WORK=y CONFIG_JBD2=y @@ -311,7 +310,6 @@ CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_QT1070=y -# CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y CONFIG_LEDS_TRIGGER_CPU=y @@ -320,6 +318,7 @@ CONFIG_LEDS_TRIGGER_GPIO=y CONFIG_LEDS_TRIGGER_HEARTBEAT=y CONFIG_LIBFDT=y CONFIG_LOCALVERSION_AUTO=y +CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y @@ -332,9 +331,11 @@ CONFIG_MDIO_DEVICE=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y +CONFIG_MEMFD_CREATE=y CONFIG_MEMORY=y CONFIG_MEMORY_ISOLATION=y CONFIG_MFD_ACT8945A=y +CONFIG_MFD_AT91_USART=y CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_HLCDC=y CONFIG_MFD_ATMEL_SMC=y @@ -342,7 +343,6 @@ CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y CONFIG_MICREL_PHY=y CONFIG_MIGHT_HAVE_CACHE_L2X0=y -CONFIG_MIGHT_HAVE_PCI=y CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y @@ -355,11 +355,6 @@ CONFIG_MODULES_USE_ELF_REL=y # CONFIG_MTD_CFI_INTELEXT is not set CONFIG_MTD_CMDLINE_PARTS=y # CONFIG_MTD_COMPLEX_MAPPINGS is not set -CONFIG_MTD_M25P80=y -CONFIG_MTD_NAND=y -CONFIG_MTD_NAND_ATMEL=y -CONFIG_MTD_NAND_ECC=y -# CONFIG_MTD_PHYSMAP_OF is not set CONFIG_MTD_SPI_NOR=y CONFIG_MTD_UBI=y CONFIG_MTD_UBI_BEB_LIMIT=20 @@ -367,35 +362,33 @@ CONFIG_MTD_UBI_BEB_LIMIT=20 CONFIG_MTD_UBI_FASTMAP=y # CONFIG_MTD_UBI_GLUEBI is not set CONFIG_MTD_UBI_WL_THRESHOLD=4096 -CONFIG_MULTI_IRQ_HANDLER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEED_PER_CPU_KM=y +# CONFIG_NEON is not set CONFIG_NLS=y CONFIG_NLS_CODEPAGE_437=y CONFIG_NLS_CODEPAGE_850=y CONFIG_NLS_ISO8859_1=y CONFIG_NLS_UTF8=y -CONFIG_NO_BOOTMEM=y CONFIG_NO_HZ_COMMON=y CONFIG_NO_HZ_IDLE=y CONFIG_NVMEM=y +CONFIG_NVMEM_SYSFS=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_OF_RESERVED_MEM=y CONFIG_OLD_SIGACTION=y CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PAGE_OFFSET=0xC0000000 # CONFIG_PARTITION_ADVANCED is not set -# CONFIG_PCI_DOMAINS_GENERIC is not set -# CONFIG_PCI_SYSCALL is not set CONFIG_PERF_USE_VMALLOC=y CONFIG_PGTABLE_LEVELS=2 CONFIG_PHYLIB=y @@ -403,10 +396,6 @@ CONFIG_PINCTRL=y CONFIG_PINCTRL_AT91=y CONFIG_PINCTRL_AT91PIO4=y # CONFIG_PINCTRL_SINGLE is not set -# CONFIG_PL310_ERRATA_588369 is not set -# CONFIG_PL310_ERRATA_727915 is not set -# CONFIG_PL310_ERRATA_753970 is not set -# CONFIG_PL310_ERRATA_769419 is not set CONFIG_PM=y CONFIG_PM_ADVANCED_DEBUG=y CONFIG_PM_CLK=y @@ -428,8 +417,7 @@ CONFIG_PWM_ATMEL_HLCDC_PWM=y CONFIG_PWM_ATMEL_TCB=y CONFIG_PWM_SYSFS=y CONFIG_RATIONAL=y -# CONFIG_RCU_NEED_SEGCBLIST is not set -# CONFIG_RCU_STALL_COMMON is not set +CONFIG_REFCOUNT_FULL=y CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y CONFIG_REGMAP_MMIO=y @@ -443,9 +431,7 @@ CONFIG_RTC_DRV_AT91RM9200=y # CONFIG_RTC_DRV_AT91SAM9 is not set # CONFIG_RTC_DRV_CMOS is not set CONFIG_RTC_I2C_AND_SPI=y -CONFIG_RWSEM_XCHGADD_ALGORITHM=y CONFIG_SAMA5D4_WATCHDOG=y -# CONFIG_SCHED_INFO is not set CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set # CONFIG_SERIAL_8250 is not set @@ -454,6 +440,7 @@ CONFIG_SERIAL_ATMEL_CONSOLE=y CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_MCTRL_GPIO=y +CONFIG_SGL_ALLOC=y CONFIG_SG_POOL=y CONFIG_SND=y CONFIG_SND_ARM=y @@ -463,24 +450,26 @@ CONFIG_SND_ARM=y CONFIG_SND_ATMEL_SOC=y CONFIG_SND_ATMEL_SOC_CLASSD=y CONFIG_SND_ATMEL_SOC_DMA=y +CONFIG_SND_ATMEL_SOC_I2S=y +CONFIG_SND_ATMEL_SOC_PDC=y # CONFIG_SND_ATMEL_SOC_PDMIC is not set CONFIG_SND_ATMEL_SOC_SSC=y -# CONFIG_SND_ATMEL_SOC_SSC_PDC is not set CONFIG_SND_ATMEL_SOC_SSC_DMA=y +# CONFIG_SND_ATMEL_SOC_SSC_PDC is not set # CONFIG_SND_ATMEL_SOC_TSE850_PCM5142 is not set -CONFIG_SND_ATMEL_SOC_I2S=y -CONFIG_SND_SOC_MIKROE_PROTO=y -# CONFIG_SND_MCHP_SOC_I2S_MCC is not set CONFIG_SND_ATMEL_SOC_WM8904=y # CONFIG_SND_COMPRESS_OFFLOAD is not set CONFIG_SND_DMAENGINE_PCM=y CONFIG_SND_JACK=y CONFIG_SND_JACK_INPUT_DEV=y +# CONFIG_SND_MCHP_SOC_I2S_MCC is not set CONFIG_SND_PCM=y CONFIG_SND_PCM_TIMER=y CONFIG_SND_SOC=y CONFIG_SND_SOC_GENERIC_DMAENGINE_PCM=y CONFIG_SND_SOC_I2C_AND_SPI=y +CONFIG_SND_SOC_MIKROE_PROTO=y +CONFIG_SND_SOC_WM8731=y CONFIG_SND_SOC_WM8904=y CONFIG_SND_SPI=y CONFIG_SND_SUPPORT_OLD_API=y @@ -490,20 +479,18 @@ CONFIG_SOC_SAMA5=y CONFIG_SOC_SAMA5D2=y CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y -# CONFIG_ATMEL_CLOCKSOURCE_PIT is not set -CONFIG_ATMEL_CLOCKSOURCE_TCB=y CONFIG_SOC_SAM_V7=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y -# CONFIG_SOUND_OSS_CORE_PRECLAIM is not set CONFIG_SPARSE_IRQ=y CONFIG_SPI=y -CONFIG_SPI_ATMEL=y # CONFIG_SPI_AT91_USART is not set +CONFIG_SPI_ATMEL=y CONFIG_SPI_ATMEL_QUADSPI=y CONFIG_SPI_BITBANG=y CONFIG_SPI_GPIO=y CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y # CONFIG_SQUASHFS is not set CONFIG_SRAM=y CONFIG_SRAM_EXEC=y @@ -511,12 +498,10 @@ CONFIG_SRCU=y # CONFIG_STANDALONE is not set CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -CONFIG_SWIOTLB=y CONFIG_SWPHY=y # CONFIG_SWP_EMULATE is not set CONFIG_SYNC_FILE=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y CONFIG_TIMER_OF=y CONFIG_TIMER_PROBE=y @@ -530,6 +515,7 @@ CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y CONFIG_UBIFS_FS_ZSTD=y CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" +CONFIG_UNWINDER_ARM=y CONFIG_USB=y CONFIG_USB_ACM=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y @@ -554,7 +540,6 @@ CONFIG_USB_STORAGE=y CONFIG_USB_SUPPORT=y CONFIG_USE_OF=y CONFIG_V4L_PLATFORM_DRIVERS=y -CONFIG_VECTORS_BASE=0xffff0000 CONFIG_VFAT_FS=y CONFIG_VFP=y CONFIG_VFPv3=y @@ -563,10 +548,14 @@ CONFIG_VIDEOMODE_HELPERS=y # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2=y +CONFIG_VIDEO_V4L2_I2C=y CONFIG_VM_EVENT_COUNTERS=y CONFIG_WATCHDOG_CORE=y # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set +CONFIG_XXHASH=y CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 CONFIG_ZLIB_DEFLATE=y CONFIG_ZLIB_INFLATE=y +CONFIG_ZSTD_COMPRESS=y +CONFIG_ZSTD_DECOMPRESS=y From 7f1540cc46333e9f96237e0084c554a9ec59068c Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 23 Aug 2020 20:15:17 +0200 Subject: [PATCH 08/11] at91: introduce vendor_model scheme and drop board names This introduces the vendor_model scheme to this target in order to harmonize device names within the target and with the rest of OpenWrt. In addition, custom board names are dropped in favor of the generic script which takes the compatible. Use the SUPPORTED_DEVICES variable to store the compatible where it deviates from the device name, so we can use it in build recipes. While at it, harmonize a few indents as well. Signed-off-by: Adrian Schmutzler --- package/boot/at91bootstrap/Makefile | 32 ++--- package/boot/uboot-at91/Makefile | 38 +++--- .../at91/base-files/etc/board.d/02_network | 2 +- target/linux/at91/base-files/lib/at91.sh | 92 ------------- .../lib/preinit/01_preinit_do_at91.sh | 7 - target/linux/at91/image/Makefile | 13 +- target/linux/at91/image/sam9x.mk | 123 ++++++++++-------- target/linux/at91/image/sama5.mk | 66 +++++----- target/linux/at91/image/uboot-env.txt | 8 +- 9 files changed, 152 insertions(+), 229 deletions(-) delete mode 100644 target/linux/at91/base-files/lib/at91.sh delete mode 100644 target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index eaec26b4a1..08fe2a49b0 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=at91bootstrap PKG_VERSION:=v3.9.3 -PKG_RELEASE:= +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git @@ -30,91 +30,91 @@ endef define AT91Bootstrap/at91sam9x5eknf_uboot NAME:=AT91Bootstrap for AT91SAM9X5-EK board (NandFlash) BUILD_SUBTARGET:=sam9x - BUILD_DEVICES:=at91sam9x25ek at91sam9x35ek + BUILD_DEVICES:=atmel_at91sam9x25ek atmel_at91sam9x35ek endef define AT91Bootstrap/at91sam9x5eksd_uboot NAME:=AT91Bootstrap for AT91SAM9X5-EK board (SDcard) BUILD_SUBTARGET:=sam9x - BUILD_DEVICES:=at91sam9x25ek at91sam9x35ek + BUILD_DEVICES:=atmel_at91sam9x25ek atmel_at91sam9x35ek endef define AT91Bootstrap/sama5d2_xplaineddf_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_xplained + BUILD_DEVICES:=microchip_sama5d2-xplained endef define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (QSPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_xplained + BUILD_DEVICES:=microchip_sama5d2-xplained endef define AT91Bootstrap/sama5d2_xplainedsd_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SDcard/EMMC) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_xplained + BUILD_DEVICES:=microchip_sama5d2-xplained endef define AT91Bootstrap/sama5d3_xplainednf_uboot TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (Nand Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d3_xplained + BUILD_DEVICES:=microchip_sama5d3-xplained endef define AT91Bootstrap/sama5d3_xplainedsd_uboot TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d3_xplained + BUILD_DEVICES:=microchip_sama5d3-xplained endef define AT91Bootstrap/sama5d4_xplainednf_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (Nand Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d4-xplained endef define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d4-xplained endef define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d4-xplained endef define AT91Bootstrap/sama5d27_som1_eksd_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard0) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d27_som1_ek + BUILD_DEVICES:=microchip_sama5d27-som1-ek endef define AT91Bootstrap/sama5d27_som1_eksd1_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard1) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d27_som1_ek + BUILD_DEVICES:=microchip_sama5d27-som1-ek endef define AT91Bootstrap/sama5d27_som1_ekqspi_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (QSPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d27_som1_ek + BUILD_DEVICES:=microchip_sama5d27-som1-ek endef define AT91Bootstrap/sama5d2_ptc_eknf_uboot TITLE:=AT91Bootstrap for SAMA5D2 PTC EK (Nand Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_ptc_ek + BUILD_DEVICES:=microchip_sama5d2-ptc-ek endef define AT91Bootstrap/sama5d2_ptc_eksd_uboot TITLE:=AT91Bootstrap for SAMA5D2 PTC EK (SDCard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_ptc_ek + BUILD_DEVICES:=microchip_sama5d2-ptc-ek endef AT91BOOTSTRAP_TARGETS := \ diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 1fb32d4a89..ad10527699 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -8,7 +8,7 @@ include $(TOPDIR)/rules.mk PKG_VERSION:=linux4sam-2020.04 -PKG_RELEASE:=1 +PKG_RELEASE:=2 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/u-boot-at91.git @@ -27,89 +27,89 @@ endef define U-Boot/at91sam9m10g45ek_nandflash NAME:=AT91SAM9M10G45-EK board (NandFlash) BUILD_SUBTARGET:=sam9x - BUILD_DEVICES:=at91sam9m10g45ek + BUILD_DEVICES:=atmel_at91sam9m10g45ek endef define U-Boot/at91sam9x5ek_nandflash NAME:=AT91SAM9X5-EK board (NandFlash) BUILD_SUBTARGET:=sam9x - BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek \ - at91sam9g35ek at91sam9x25ek \ - at91sam9x35ek + BUILD_DEVICES:=atmel_at91sam9g15ek atmel_at91sam9g25ek \ + atmel_at91sam9g35ek atmel_at91sam9x25ek \ + atmel_at91sam9x35ek endef define U-Boot/at91sam9x5ek_mmc NAME:=AT91SAM9X5-EK board (SDcard) BUILD_SUBTARGET:=sam9x - BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek \ - at91sam9g35ek at91sam9x25ek \ - at91sam9x35ek + BUILD_DEVICES:=atmel_at91sam9g15ek atmel_at91sam9g25ek \ + atmel_at91sam9g35ek atmel_at91sam9x25ek \ + atmel_at91sam9x35ek endef define U-Boot/sama5d3_xplained_nandflash NAME:=SAMA5D3 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d3_xplained + BUILD_DEVICES:=microchip_sama5d3-xplained endef define U-Boot/sama5d3_xplained_mmc NAME:=SAMA5D3 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d3_xplained + BUILD_DEVICES:=microchip_sama5d3-xplained endef define U-Boot/sama5d2_xplained_spiflash NAME:=SAMA5D2 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_xplained + BUILD_DEVICES:=microchip_sama5d2-xplained endef define U-Boot/sama5d2_xplained_mmc NAME:=SAMA5D2 Xplained board (SDcard/EMMC) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_xplained + BUILD_DEVICES:=microchip_sama5d2-xplained endef define U-Boot/sama5d4_xplained_spiflash NAME:=SAMA5D4 Xplained board (SPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d4-xplained endef define U-Boot/sama5d4_xplained_mmc NAME:=SAMA5D4 Xplained board (SDcard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d4-xplained endef define U-Boot/sama5d4_xplained_nandflash NAME:=SAMA5D4 Xplained board (NandFlash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d4_xplained + BUILD_DEVICES:=microchip_sama5d3-xplained endef define U-Boot/sama5d27_som1_ek_mmc1 NAME:=SAMA5D27 SOM1 Ek (SDCard1) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d27_som1_ek + BUILD_DEVICES:=microchip_sama5d27-som1-ek endef define U-Boot/sama5d27_som1_ek_qspiflash NAME:=SAMA5D27 SOM1 Ek (QSPI Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d27_som1_ek + BUILD_DEVICES:=microchip_sama5d27-som1-ek endef define U-Boot/sama5d2_ptc_ek_nandflash NAME:=SAMA5D2 PTC Ek (Nand Flash) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_ptc_ek + BUILD_DEVICES:=microchip_sama5d2-ptc-ek endef define U-Boot/sama5d2_ptc_ek_mmc NAME:=SAMA5D2 PTC Ek (SDCard) BUILD_SUBTARGET:=sama5 - BUILD_DEVICES:=at91-sama5d2_ptc_ek + BUILD_DEVICES:=microchip_sama5d2-ptc-ek endef UBOOT_TARGETS := \ diff --git a/target/linux/at91/base-files/etc/board.d/02_network b/target/linux/at91/base-files/etc/board.d/02_network index 66f9d88fae..306dfe375e 100755 --- a/target/linux/at91/base-files/etc/board.d/02_network +++ b/target/linux/at91/base-files/etc/board.d/02_network @@ -9,7 +9,7 @@ board_config_update case "$(board_name)" in -sama5d3_xplained) +atmel,sama5d3-xplained) ucidef_set_interfaces_lan_wan "eth0" "eth1" ;; diff --git a/target/linux/at91/base-files/lib/at91.sh b/target/linux/at91/base-files/lib/at91.sh deleted file mode 100644 index 19a63e1200..0000000000 --- a/target/linux/at91/base-files/lib/at91.sh +++ /dev/null @@ -1,92 +0,0 @@ -# -# Copyright (C) 2014 OpenWrt.org -# - -AT91_BOARD_NAME= -AT91_MODEL= - -at91_board_detect() { - local machine - local name - - machine=$(cat /proc/device-tree/model) - - case "$machine" in - *"Atmel at91sam9263ek") - name="at91sam9263ek" - ;; - *"Atmel AT91SAM9G15-EK") - name="at91sam9g15ek" - ;; - *"Atmel at91sam9g20ek") - name="at91sam9g20ek" - ;; - *"Atmel at91sam9g20ek 2 mmc") - name="at91sam9g20ek_2mmc" - ;; - *"Atmel AT91SAM9G25-EK") - name="at91sam9g25ek" - ;; - *"Atmel AT91SAM9G35-EK") - name="at91sam9g35ek" - ;; - *"Atmel AT91SAM9M10G45-EK") - name="at91sam9m10g45ek" - ;; - *"Atmel AT91SAM9X25-EK") - name="at91sam9x25ek" - ;; - *"Atmel AT91SAM9X35-EK") - name="at91sam9x35ek" - ;; - *"SAMA5D3 Xplained") - name="sama5d3_xplained" - ;; - *"Atmel SAMA5D27 SOM1 EK") - name="sama5d27_som1_ek" - ;; - *"Atmel SAMA5D2 PTC EK") - name="sama5d2_ptc_ek" - ;; - *"SAMA5D2 Xplained") - name="sama5d2_xplained" - ;; - *"SAMA5D4 Xplained") - name="sama5d4_xplained" - ;; - *"CalAmp LMU5000") - name="lmu5000" - ;; - *"Calao TNY A9260") - name="tny_a9260" - ;; - *"Calao TNY A9263") - name="tny_a9263" - ;; - *"Calao TNY A9G20") - name="tny_a9g20" - ;; - *"Calao USB A9260") - name="usb_a9260" - ;; - *"Calao USB A9263") - name="usb_a9263" - ;; - *"Calao USB A9G20") - name="usb_a9g20" - ;; - *"Ethernut 5") - name="ethernut5" - ;; - esac - - [ -z "$name" ] && name="unknown" - - [ -z "$AT91_BOARD_NAME" ] && AT91_BOARD_NAME="$name" - [ -z "$AT91_MODEL" ] && AT91_MODEL="$machine" - - [ -e "/tmp/sysinfo/" ] || mkdir -p "/tmp/sysinfo/" - - echo "$AT91_BOARD_NAME" > /tmp/sysinfo/board_name - echo "$AT91_MODEL" > /tmp/sysinfo/model -} diff --git a/target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh b/target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh deleted file mode 100644 index c812329568..0000000000 --- a/target/linux/at91/base-files/lib/preinit/01_preinit_do_at91.sh +++ /dev/null @@ -1,7 +0,0 @@ -do_at91() { - . /lib/at91.sh - - at91_board_detect -} - -boot_hook_add preinit_main do_at91 diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 959b1cb0a3..05f0b58af7 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/image.mk KERNEL_LOADADDR := 0x20008000 define Build/at91-install-zImage - $(CP) $(KDIR)/zImage $@ + $(CP) $(KDIR)/zImage $@ endef include $(SUBTARGET).mk @@ -24,7 +24,8 @@ define Device/Default $(Device/default-nand) PROFILES := Default FILESYSTEMS := squashfs ubifs ext4 - DEVICE_DTS := $(1) + DEVICE_DTS = $(lastword $(subst _, ,$(1))) + SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) KERNEL_NAME := zImage KERNEL_SIZE := 4096k KERNEL := kernel-bin | append-dtb | lzma | uImage lzma @@ -56,13 +57,13 @@ define Device/evaluation-dtb $(Device/evaluation) $(Device/dtb) KERNEL_SUFFIX := -fit-zImage.itb - KERNEL := kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | gzip | fit gzip $$(KDIR)/image-$$(DEVICE_DTS).dtb endef define Device/evaluation-fit $(Device/evaluation) KERNEL_SUFFIX := -fit-uImage.itb - KERNEL := kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb + KERNEL = kernel-bin | lzma | fit lzma $$(KDIR)/image-$$(DEVICE_DTS).dtb endef define Device/production @@ -74,8 +75,8 @@ endef define Device/production-dtb $(Device/production) $(Device/dtb) - IMAGE/factory.bin := append-dtb | pad-to $$$$(DTB_SIZE) \ - | append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi + IMAGE/factory.bin := append-dtb | pad-to $$$$(DTB_SIZE) | \ + append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi endef $(eval $(call BuildImage)) diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk index beff346725..bbe410fbfb 100644 --- a/target/linux/at91/image/sam9x.mk +++ b/target/linux/at91/image/sam9x.mk @@ -1,3 +1,4 @@ + define Device/default-nand BLOCKSIZE := 128k PAGESIZE := 2048 @@ -15,169 +16,181 @@ define Build/at91-sdcard ::$(DEVICE_NAME)-fit.itb mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-at91sam9x5ek_mmc/u-boot.bin \ - ::u-boot.bin + $(BIN_DIR)/u-boot-at91sam9x5ek_mmc/u-boot.bin \ + ::u-boot.bin mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-at91sam9x5eksd_uboot/at91bootstrap.bin \ - ::BOOT.bin + $(BIN_DIR)/at91bootstrap-at91sam9x5eksd_uboot/at91bootstrap.bin \ + ::BOOT.bin $(CP) uboot-env.txt $@-uboot-env.txt sed -i '2d;3d' $@-uboot-env.txt sed -i '2i board='"$(DEVICE_NAME)"'' $@-uboot-env.txt - sed -i '3i board_name='"$(DEVICE_NAME)"'' $@-uboot-env.txt + sed -i '3i board_name='"$(firstword $(SUPPORTED_DEVICES))"'' $@-uboot-env.txt mkenvimage -s 0x4000 -o $@-uboot.env $@-uboot-env.txt mcopy -i $@.boot $@-uboot.env ::uboot.env ./gen_at91_sdcard_img.sh \ - $@.img \ - $@.boot \ - $(KDIR)/root.ext4 \ - $(AT91_SD_BOOT_PARTSIZE) \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) + $@.img \ + $@.boot \ + $(KDIR)/root.ext4 \ + $(AT91_SD_BOOT_PARTSIZE) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) gzip -nc9 $@.img > $@ rm -f $@.img $@.boot $@-uboot.env $@-uboot-env.txt) endef -define Device/at91sam9263ek +define Device/atmel_at91sam9263ek $(Device/evaluation-dtb) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9263-EK endef -TARGET_DEVICES += at91sam9263ek +TARGET_DEVICES += atmel_at91sam9263ek -define Device/at91sam9g15ek +define Device/atmel_at91sam9g15ek $(Device/evaluation) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9G15-EK endef -TARGET_DEVICES += at91sam9g15ek +TARGET_DEVICES += atmel_at91sam9g15ek -define Device/at91sam9g20ek +define Device/atmel_at91sam9g20ek $(Device/evaluation-dtb) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9G20-EK endef -TARGET_DEVICES += at91sam9g20ek +TARGET_DEVICES += atmel_at91sam9g20ek -define Device/at91sam9g20ek_2mmc +define Device/atmel_at91sam9g20ek-2mmc $(Device/evaluation-dtb) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9G20-EK DEVICE_VARIANT := 2MMC + DEVICE_DTS := at91sam9g20ek_2mmc + SUPPORTED_DEVICES := atmel,at91sam9g20ek_2mmc endef -TARGET_DEVICES += at91sam9g20ek_2mmc +TARGET_DEVICES += atmel_at91sam9g20ek-2mmc -define Device/at91sam9g25ek +define Device/atmel_at91sam9g25ek $(Device/evaluation) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9G25-EK endef -TARGET_DEVICES += at91sam9g25ek +TARGET_DEVICES += atmel_at91sam9g25ek -define Device/at91sam9g35ek +define Device/atmel_at91sam9g35ek $(Device/evaluation) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9G35-EK endef -TARGET_DEVICES += at91sam9g35ek +TARGET_DEVICES += atmel_at91sam9g35ek -define Device/at91sam9m10g45ek +define Device/atmel_at91sam9m10g45ek $(Device/evaluation) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9M10G45-EK endef -TARGET_DEVICES += at91sam9m10g45ek +TARGET_DEVICES += atmel_at91sam9m10g45ek -define Device/at91sam9x25ek +define Device/atmel_at91sam9x25ek $(Device/evaluation-dtb) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9X25-EK $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91sam9x25ek +TARGET_DEVICES += atmel_at91sam9x25ek -define Device/at91sam9x35ek +define Device/atmel_at91sam9x35ek $(Device/evaluation-dtb) DEVICE_VENDOR := Atmel DEVICE_MODEL := AT91SAM9X35-EK $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91sam9x35ek +TARGET_DEVICES += atmel_at91sam9x35ek -define Device/lmu5000 +define Device/calamp_lmu5000 $(Device/production) DEVICE_VENDOR := CalAmp DEVICE_MODEL := LMU5000 DEVICE_PACKAGES := kmod-rtc-pcf2123 kmod-usb-acm kmod-usb-serial \ kmod-usb-serial-option kmod-usb-serial-sierrawireless kmod-gpio-mcp23s08 endef -TARGET_DEVICES += lmu5000 +TARGET_DEVICES += calamp_lmu5000 -define Device/tny_a9260 +define Device/calao_tny-a9260 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := TNYA9260 + DEVICE_MODEL := TNY A9260 + DEVICE_DTS := tny_a9260 endef -TARGET_DEVICES += tny_a9260 +TARGET_DEVICES += calao_tny-a9260 -define Device/tny_a9263 +define Device/calao_tny-a9263 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := TNYA9263 + DEVICE_MODEL := TNY A9263 + DEVICE_DTS := tny_a9263 + SUPPORTED_DEVICES := atmel,tny-a9263 endef -TARGET_DEVICES += tny_a9263 +TARGET_DEVICES += calao_tny-a9263 -define Device/tny_a9g20 +define Device/calao_tny-a9g20 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := TNYA9G20 + DEVICE_MODEL := TNY A9G20 + DEVICE_DTS := tny_a9g20 endef -TARGET_DEVICES += tny_a9g20 +TARGET_DEVICES += calao_tny-a9g20 -define Device/usb_a9260 +define Device/calao_usb-a9260 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := USBA9260 + DEVICE_MODEL := USB A9260 + DEVICE_DTS := usb_a9260 endef -TARGET_DEVICES += usb_a9260 +TARGET_DEVICES += calao_usb-a9260 -define Device/usb_a9263 +define Device/calao_usb-a9263 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := USBA9263 + DEVICE_MODEL := USB A9263 + DEVICE_DTS := usb_a9263 + SUPPORTED_DEVICES := atmel,usb-a9263 endef -TARGET_DEVICES += usb_a9263 +TARGET_DEVICES += calao_usb-a9263 -define Device/usb_a9g20 +define Device/calao_usb-a9g20 $(Device/production-dtb) DEVICE_VENDOR := Calao - DEVICE_MODEL := USBA9G20 + DEVICE_MODEL := USB A9G20 + DEVICE_DTS := usb_a9g20 endef -TARGET_DEVICES += usb_a9g20 +TARGET_DEVICES += calao_usb-a9g20 -define Device/ethernut5 +define Device/egnite_ethernut5 $(Device/evaluation) DEVICE_VENDOR := egnite DEVICE_MODEL := Ethernut 5 UBINIZE_OPTS := -E 5 endef -TARGET_DEVICES += ethernut5 +TARGET_DEVICES += egnite_ethernut5 -define Device/at91-q5xr5 +define Device/exegin_q5xr5 $(Device/production-dtb) DEVICE_VENDOR := Exegin - DEVICE_MODEL := Q5XR5 + DEVICE_MODEL := Q5x + DEVICE_VARIANT := rev5 + DEVICE_DTS := at91-q5xr5 KERNEL_SIZE := 2048k DEFAULT := n endef -TARGET_DEVICES += at91-q5xr5 +TARGET_DEVICES += exegin_q5xr5 -define Device/wb45n +define Device/laird_wb45n $(Device/evaluation-fit) DEVICE_VENDOR := Laird DEVICE_MODEL := WB45N @@ -190,4 +203,4 @@ define Device/wb45n SUBPAGESIZE := 2048 MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 955 endef -TARGET_DEVICES += wb45n +TARGET_DEVICES += laird_wb45n diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk index 031e62587e..d644f89266 100644 --- a/target/linux/at91/image/sama5.mk +++ b/target/linux/at91/image/sama5.mk @@ -13,87 +13,94 @@ define Build/at91-sdcard mcopy -i $@.boot \ $(KDIR)/$(DEVICE_NAME)-fit-zImage.itb \ - ::$(DEVICE_NAME:at91-%=%)-fit.itb + ::$(DEVICE_NAME)-fit.itb - $(if $(findstring at91-sama5d27_som1_ek,$@), \ + $(if $(findstring sama5d27-som1-ek,$@), \ mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc1/u-boot.bin \ + $(BIN_DIR)/u-boot-$(DEVICE_DTS:at91-%=%)_mmc1/u-boot.bin \ ::u-boot.bin mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd1_uboot/at91bootstrap.bin \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd1_uboot/at91bootstrap.bin \ ::BOOT.bin, mcopy -i $@.boot \ - $(BIN_DIR)/u-boot-$(DEVICE_NAME:at91-%=%)_mmc/u-boot.bin \ + $(BIN_DIR)/u-boot-$(DEVICE_DTS:at91-%=%)_mmc/u-boot.bin \ ::u-boot.bin - $(if $(findstring sama5d4_xplained, $@), \ + $(if $(findstring sama5d4-xplained,$@), \ mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd_uboot_secure/at91bootstrap.bin \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd_uboot_secure/at91bootstrap.bin \ ::BOOT.bin, mcopy -i $@.boot \ - $(BIN_DIR)/at91bootstrap-$(DEVICE_NAME:at91-%=%)sd_uboot/at91bootstrap.bin \ + $(BIN_DIR)/at91bootstrap-$(DEVICE_DTS:at91-%=%)sd_uboot/at91bootstrap.bin \ ::BOOT.bin)) $(CP) uboot-env.txt $@-uboot-env.txt sed -i '2d;3d' $@-uboot-env.txt - sed -i '2i board='"$(DEVICE_NAME:at91-%=%)"'' $@-uboot-env.txt - sed -i '3i board_name='"$(DEVICE_NAME:at91-%=%)"'' $@-uboot-env.txt + sed -i '2i board='"$(DEVICE_NAME)"'' $@-uboot-env.txt + sed -i '3i board_name='"$(firstword $(SUPPORTED_DEVICES))"'' $@-uboot-env.txt mkenvimage -s 0x4000 -o $@-uboot.env $@-uboot-env.txt mcopy -i $@.boot $@-uboot.env ::uboot.env ./gen_at91_sdcard_img.sh \ - $@.img \ - $@.boot \ - $(KDIR)/root.ext4 \ - $(AT91_SD_BOOT_PARTSIZE) \ - $(CONFIG_TARGET_ROOTFS_PARTSIZE) + $@.img \ + $@.boot \ + $(KDIR)/root.ext4 \ + $(AT91_SD_BOOT_PARTSIZE) \ + $(CONFIG_TARGET_ROOTFS_PARTSIZE) gzip -nc9 $@.img > $@ rm -f $@.img $@.boot $@-uboot.env $@-uboot-env.txt) endef -define Device/at91-sama5d2_xplained +define Device/microchip_sama5d2-xplained $(Device/evaluation-dtb) DEVICE_VENDOR := Microchip DEVICE_MODEL := SAMA5D2 Xplained + DEVICE_DTS := at91-sama5d2_xplained + SUPPORTED_DEVICES := atmel,sama5d2-xplained KERNEL_SIZE := 6144k $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91-sama5d2_xplained +TARGET_DEVICES += microchip_sama5d2-xplained -define Device/at91-sama5d27_som1_ek +define Device/microchip_sama5d27-som1-ek $(Device/evaluation-dtb) DEVICE_VENDOR := Microchip DEVICE_MODEL := SAMA5D27 SOM1 Ek + DEVICE_DTS := at91-sama5d27_som1_ek + SUPPORTED_DEVICES := atmel,sama5d27-som1-ek KERNEL_SIZE := 6144k $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91-sama5d27_som1_ek +TARGET_DEVICES += microchip_sama5d27-som1-ek -define Device/at91-sama5d2_ptc_ek +define Device/microchip_sama5d2-ptc-ek $(Device/evaluation-dtb) DEVICE_VENDOR := Microchip DEVICE_MODEL := SAMA5D2 PTC Ek + DEVICE_DTS := at91-sama5d2_ptc_ek + SUPPORTED_DEVICES := atmel,sama5d2-ptc_ek KERNEL_SIZE := 6144k $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91-sama5d2_ptc_ek +TARGET_DEVICES += microchip_sama5d2-ptc-ek - -define Device/at91-sama5d3_xplained +define Device/microchip_sama5d3-xplained $(Device/evaluation-dtb) DEVICE_VENDOR := Microchip DEVICE_MODEL := SAMA5D3 Xplained + DEVICE_DTS := at91-sama5d3_xplained + SUPPORTED_DEVICES := atmel,sama5d3-xplained KERNEL_SIZE := 6144k $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91-sama5d3_xplained +TARGET_DEVICES += microchip_sama5d3-xplained ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") - define Device/wb50n + define Device/laird_wb50n $(Device/evaluation-fit) DEVICE_VENDOR := Laird DEVICE_MODEL := WB50N @@ -106,15 +113,16 @@ ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") SUBPAGESIZE := 2048 MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 955 endef - TARGET_DEVICES += wb50n + TARGET_DEVICES += laird_wb50n endif endif - -define Device/at91-sama5d4_xplained +define Device/microchip_sama5d4-xplained $(Device/evaluation-dtb) DEVICE_VENDOR := Microchip DEVICE_MODEL := SAMA5D4 Xplained + DEVICE_DTS := at91-sama5d4_xplained + SUPPORTED_DEVICES := atmel,sama5d4-xplained KERNEL_SIZE := 6144k BLOCKSIZE := 256k PAGESIZE := 4096 @@ -122,4 +130,4 @@ define Device/at91-sama5d4_xplained MKUBIFS_OPTS := -m $$(PAGESIZE) -e 248KiB -c 2082 $(Device/evaluation-sdimage) endef -TARGET_DEVICES += at91-sama5d4_xplained +TARGET_DEVICES += microchip_sama5d4-xplained diff --git a/target/linux/at91/image/uboot-env.txt b/target/linux/at91/image/uboot-env.txt index 80d051b72f..9cdccc9a2f 100644 --- a/target/linux/at91/image/uboot-env.txt +++ b/target/linux/at91/image/uboot-env.txt @@ -1,13 +1,13 @@ /* Do Not remove First 2 lines, Makefile will modify these lines with proper board names */ -board=at91sam9x25ek -board_name=at91sam9x25ek +board=atmel_at91sam9x25ek +board_name=atmel,at91sam9x25ek bootargs=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 bootargsd2=console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait rootfstype=ext4 bootargsxx=console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait rootfstype=ext4 bootcmd=run setbootargs; run fatload_mmc; bootm 0x21000000 bootdelay=1 -fatload_mmc=if test ${board_name} = sama5d2_xplained || test ${board_name} = sama5d27_som1_ek; then fatload mmc 1:1 0x21000000 ${board_name}-fit.itb; else fatload mmc 0:1 0x21000000 ${board_name}-fit.itb; fi -setbootargs=if test ${board_name} = sama5d2_xplained || test ${board_name} = sama5d27_som1_ek; then setenv bootargs ${bootargsd2}; else setenv bootargs ${bootargsxx}; fi +fatload_mmc=if test ${board_name} = atmel,sama5d2-xplained || test ${board_name} = atmel,sama5d27-som1-ek; then fatload mmc 1:1 0x21000000 ${board}-fit.itb; else fatload mmc 0:1 0x21000000 ${board}-fit.itb; fi +setbootargs=if test ${board_name} = atmel,sama5d2-xplained || test ${board_name} = atmel,sama5d27-som1-ek; then setenv bootargs ${bootargsd2}; else setenv bootargs ${bootargsxx}; fi ethact=gmac0 stderr=serial stdin=serial From 2f92e1d418ce97d12a14dc426b58566ff1dfce8f Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 23 Aug 2020 22:32:28 +0200 Subject: [PATCH 09/11] at91bootstrap: harmonize indent in Makefiles The indent in Makefiles is mixed, harmonize it where reasonable. Signed-off-by: Adrian Schmutzler --- package/boot/at91bootstrap/Makefile | 32 +++++++++--------- package/boot/at91bootstrap/at91bootstrap.mk | 36 ++++++++++----------- 2 files changed, 34 insertions(+), 34 deletions(-) diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 08fe2a49b0..b0d466f7b9 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -16,7 +16,7 @@ PKG_SOURCE_PROTO:=git PKG_SOURCE_URL:=https://github.com/linux4sam/at91bootstrap.git PKG_SOURCE_VERSION:=d96833a4b6680b237708eb4dc9f10708b9e709d8 PKG_BUILD_DIR = \ - $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) + $(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION) include at91bootstrap.mk include $(INCLUDE_DIR)/package.mk @@ -118,24 +118,24 @@ define AT91Bootstrap/sama5d2_ptc_eksd_uboot endef AT91BOOTSTRAP_TARGETS := \ - at91sam9x5eknf_uboot \ - at91sam9x5eksd_uboot \ - sama5d2_xplaineddf_uboot \ - sama5d2_xplaineddf_qspi_uboot \ - sama5d2_xplainedsd_uboot \ - sama5d3_xplainednf_uboot \ - sama5d3_xplainedsd_uboot \ - sama5d4_xplainednf_uboot_secure \ - sama5d4_xplaineddf_uboot_secure \ - sama5d4_xplainedsd_uboot_secure \ - sama5d27_som1_eksd1_uboot \ - sama5d27_som1_ekqspi_uboot \ - sama5d2_ptc_eknf_uboot \ - sama5d2_ptc_eksd_uboot + at91sam9x5eknf_uboot \ + at91sam9x5eksd_uboot \ + sama5d2_xplaineddf_uboot \ + sama5d2_xplaineddf_qspi_uboot \ + sama5d2_xplainedsd_uboot \ + sama5d3_xplainednf_uboot \ + sama5d3_xplainedsd_uboot \ + sama5d4_xplainednf_uboot_secure \ + sama5d4_xplaineddf_uboot_secure \ + sama5d4_xplainedsd_uboot_secure \ + sama5d27_som1_eksd1_uboot \ + sama5d27_som1_ekqspi_uboot \ + sama5d2_ptc_eknf_uboot \ + sama5d2_ptc_eksd_uboot define Build/Compile +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) + CROSS_COMPILE=$(TARGET_CROSS) endef $(eval $(call BuildPackage/AT91Bootstrap)) diff --git a/package/boot/at91bootstrap/at91bootstrap.mk b/package/boot/at91bootstrap/at91bootstrap.mk index 60cd8c4d30..fe6577f589 100644 --- a/package/boot/at91bootstrap/at91bootstrap.mk +++ b/package/boot/at91bootstrap/at91bootstrap.mk @@ -5,7 +5,7 @@ PKG_FLAGS:=nonshared export GCC_HONOUR_COPTS=s define Package/at91bootstrap/install/default - $(CP) -avL $(PKG_BUILD_DIR)/binaries/at91bootstrap.bin $(1)/ + $(CP) -avL $(PKG_BUILD_DIR)/binaries/at91bootstrap.bin $(1)/ endef Package/at91bootstrap/install = $(Package/at91bootstrap/install/default) @@ -34,7 +34,7 @@ define Build/AT91Bootstrap/Target $(eval $(call AT91Bootstrap/Default,$(1))) $(eval $(call AT91Bootstrap/$(1),$(1))) - define Package/at91bootstrap-$(1) + define Package/at91bootstrap-$(1) SECTION:=boot CATEGORY:=Boot Loaders TITLE:= .$(NAME) @@ -45,9 +45,9 @@ define Build/AT91Bootstrap/Target DEPENDS += @$(TARGET_DEP) ifneq ($(BUILD_DEVICES),) DEFAULT := y if ($(TARGET_DEP)_Default \ - $(patsubst %,|| $(TARGET_DEP)_DEVICE_%,$(BUILD_DEVICES)) \ - $(patsubst %,|| $(patsubst TARGET_%,TARGET_DEVICE_%, \ - $(TARGET_DEP))_DEVICE_%,$(BUILD_DEVICES))) + $(patsubst %,|| $(TARGET_DEP)_DEVICE_%,$(BUILD_DEVICES)) \ + $(patsubst %,|| $(patsubst TARGET_%,TARGET_DEVICE_%, \ + $(TARGET_DEP))_DEVICE_%,$(BUILD_DEVICES))) endif endif $(if $(DEFAULT),DEFAULT:=$(DEFAULT)) @@ -61,28 +61,28 @@ endef define Build/Configure/AT91Bootstrap +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - $(AT91BOOTSTRAP_CONFIG)_defconfig + $(AT91BOOTSTRAP_CONFIG)_defconfig endef define Build/Compile/AT91Bootstrap +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - $(AT91BOOTSTRAP_MAKE_FLAGS) + CROSS_COMPILE=$(TARGET_CROSS) \ + $(AT91BOOTSTRAP_MAKE_FLAGS) endef define BuildPackage/AT91Bootstrap/Defaults - Build/Configure/Default = $$$$(Build/Configure/AT91Bootstrap) - Build/Compile/Default = $$$$(Build/Compile/AT91Bootstrap) + Build/Configure/Default = $$$$(Build/Configure/AT91Bootstrap) + Build/Compile/Default = $$$$(Build/Compile/AT91Bootstrap) endef define BuildPackage/AT91Bootstrap - $(eval $(call BuildPackage/AT91Bootstrap/Defaults)) - $(foreach type,$(if $(DUMP),$(AT91BOOTSTRAP_TARGETS),$(BUILD_VARIANT)), \ - $(eval $(call Build/AT91Bootstrap/Target,$(type))) - ) - $(eval $(call Build/DefaultTargets)) - $(foreach type,$(if $(DUMP),$(AT91BOOTSTRAP_TARGETS),$(BUILD_VARIANT)), \ - $(call BuildPackage,at91bootstrap-$(type)) - ) + $(eval $(call BuildPackage/AT91Bootstrap/Defaults)) + $(foreach type,$(if $(DUMP),$(AT91BOOTSTRAP_TARGETS),$(BUILD_VARIANT)), \ + $(eval $(call Build/AT91Bootstrap/Target,$(type))) + ) + $(eval $(call Build/DefaultTargets)) + $(foreach type,$(if $(DUMP),$(AT91BOOTSTRAP_TARGETS),$(BUILD_VARIANT)), \ + $(call BuildPackage,at91bootstrap-$(type)) + ) endef From e7c235612b2b0953f84dcc0898eb569873acb277 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Sun, 23 Aug 2020 22:34:35 +0200 Subject: [PATCH 10/11] uboot-at91: harmonize indent in Makefile The indent in Makefile is mixed, harmonize it where reasonable. Signed-off-by: Adrian Schmutzler --- package/boot/uboot-at91/Makefile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index ad10527699..f2ad9562aa 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -129,11 +129,11 @@ UBOOT_TARGETS := \ sama5d2_ptc_ek_mmc define Build/Compile - +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ - CROSS_COMPILE=$(TARGET_CROSS) \ - DTC=$(PKG_BUILD_DIR)/scripts/dtc/dtc \ - KCFLAGS="$(filter-out -fstack-protector \ - -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" + +$(MAKE) $(PKG_JOBS) -C $(PKG_BUILD_DIR) \ + CROSS_COMPILE=$(TARGET_CROSS) \ + DTC=$(PKG_BUILD_DIR)/scripts/dtc/dtc \ + KCFLAGS="$(filter-out -fstack-protector \ + -mfloat-abi=hard, $(TARGET_CFLAGS)) -mfloat-abi=soft" endef $(eval $(call BuildPackage/U-Boot)) From 18fbb9aa21740aa698af3d7e8e53a62d8ff014c9 Mon Sep 17 00:00:00 2001 From: Adrian Schmutzler Date: Wed, 12 Aug 2020 14:26:44 +0200 Subject: [PATCH 11/11] ath79: fix ethernet setup for some qca953x devices On Comfast CF-E130N v2 and Mikrotik LHG HB board, the config found in DTS appears to be strange: - eth0 has "syscon","simple-mfd" set although it's not enabled - eth1 is enabled redundantly (already "okay" in qca953x.dtsi) - phy-handle is set for eth1 in DTS although it has a fixed-link in qca953x.dtsi This seems like a copy-paste gone wrong. Remove the named options. Run-tested on MikroTik LHG 2. Signed-off-by: Adrian Schmutzler --- target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts | 9 --------- .../ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi | 8 -------- 2 files changed, 17 deletions(-) diff --git a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts index a6ef6ad99c..2355176356 100644 --- a/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts +++ b/target/linux/ath79/dts/qca9531_comfast_cf-e130n-v2.dts @@ -122,18 +122,9 @@ &uart { status = "okay"; - -}; - -ð0 { - compatible = "syscon", "simple-mfd"; }; ð1 { - status = "okay"; - - phy-handle = <&swphy0>; - mtd-mac-address = <&art 0x0>; gmac-config { diff --git a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi index 32cc6d3731..86249398c9 100644 --- a/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi +++ b/target/linux/ath79/dts/qca9533_mikrotik_routerboard-lhg-hb.dtsi @@ -67,15 +67,7 @@ }; }; -ð0 { - compatible = "syscon", "simple-mfd"; -}; - ð1 { - status = "okay"; - - phy-handle = <&swphy0>; - gmac-config { device = <&gmac>; };