From patchwork Sat May 11 11:53:17 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1098423 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="tyt41ymP"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 451QVR1BvVz9s9N for ; Sat, 11 May 2019 21:54:39 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xHzEG5oUtpQQJRKW4U9pNCdSss+7uXBcX7yYDuwzd+I=; b=tyt41ymPsgJhXB wo9Bl0z/wyu8oyJ9o3bTrSHduR3+k3iNHn/5SwhIYIGCfdyvNGUhWc3McuwDiSCv8j1XkfdlVjJeK TduP+gSpGX+NBVdt+yX5kUHN5DzFpLPy5L1dILK6YjE3ku7op6F0z+JBu9HvLHmnVXOAzSheEp9pi F+cxWQ1AYJ19BtkiCkz7Ll8xQ+AqdxaBT3UDLygrE0CR7MWDmBEblm+7WqQpW68FpiZgQbYva1cR9 KnLjiO1yXZbFRUF+4OuqJF6c3rh27q9KbMnmFweaHcyiLorZ//q/kMlbQ2NxmPNbRQI2croBwY/V3 x0ZPep6IcCQmw49BftZg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQaD-0002JO-QR; Sat, 11 May 2019 11:54:29 +0000 Received: from mx2.mailbox.org ([80.241.60.215]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQZs-0001pP-Om for openwrt-devel@lists.openwrt.org; Sat, 11 May 2019 11:54:13 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 3906AA112E; Sat, 11 May 2019 13:54:07 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by gerste.heinlein-support.de (gerste.heinlein-support.de [91.198.250.173]) (amavisd-new, port 10030) with ESMTP id S-4wzOMFYy3J; Sat, 11 May 2019 13:53:57 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sat, 11 May 2019 13:53:17 +0200 Message-Id: <20190511115320.12285-2-hauke@hauke-m.de> In-Reply-To: <20190511115320.12285-1-hauke@hauke-m.de> References: <20190511115320.12285-1-hauke@hauke-m.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190511_045409_116068_2C274991 X-CRM114-Status: GOOD ( 11.88 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.60.215 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.8 UPPERCASE_50_75 message body is 50-75% uppercase Subject: [OpenWrt-Devel] [PATCH 1/4] at91: Refresh kernel configuration X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: c.mignanti@gmail.com, sandeepsheriker.mallikarjun@microchip.com, Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org The configuration of the sama5d4 subtarget was used as the default configuration and then the subtarget configurations were adapted. The resulting kernel configuration without any extra modules selected is still the same. Signed-off-by: Hauke Mehrtens --- target/linux/at91/config-4.9 | 97 ++++++++++++------------ target/linux/at91/legacy/config-default | 27 ++++--- target/linux/at91/sama5d2/config-default | 42 +--------- target/linux/at91/sama5d3/config-default | 39 +--------- target/linux/at91/sama5d4/config-default | 39 ---------- 5 files changed, 65 insertions(+), 179 deletions(-) delete mode 100644 target/linux/at91/sama5d4/config-default diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.9 index 308b346161..00ea3ff1ad 100644 --- a/target/linux/at91/config-4.9 +++ b/target/linux/at91/config-4.9 @@ -9,6 +9,8 @@ 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_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set @@ -35,6 +37,7 @@ CONFIG_ARM_UNWIND=y CONFIG_ARM_VIRT_EXT=y CONFIG_AT91SAM9X_WATCHDOG=y CONFIG_AT91_ADC=y +CONFIG_AT91_SAMA5D2_ADC=y CONFIG_ATMEL_AIC5_IRQ=y CONFIG_ATMEL_EBI=y CONFIG_ATMEL_PIT=y @@ -44,12 +47,12 @@ CONFIG_ATMEL_TCB_CLKSRC=y CONFIG_ATMEL_TCB_CLKSRC_BLOCK=0 CONFIG_ATMEL_TCLIB=y CONFIG_AT_HDMAC=y -# CONFIG_AT_XDMAC is not set +CONFIG_AT_XDMAC=y CONFIG_AUTO_ZRELADDR=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_PWM=y -# CONFIG_BLK_CGROUP is not set +CONFIG_BATTERY_ACT8945A=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 @@ -58,21 +61,28 @@ CONFIG_BLK_DEV_SD=y # CONFIG_BPF_SYSCALL is not set # CONFIG_BRIDGE is not set CONFIG_CACHE_L2X0=y +CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y +# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CLKDEV_LOOKUP=y CONFIG_CLKSRC_OF=y CONFIG_CLKSRC_PROBE=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_DEBUGFS=y +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_CPUSETS is not set CONFIG_CPU_32v6K=y CONFIG_CPU_32v7=y CONFIG_CPU_ABRT_EV7=y @@ -86,10 +96,13 @@ 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_TLB_V7=y CONFIG_CPU_V7=y +CONFIG_CRASH_DUMP=y CONFIG_CRC16=y # CONFIG_CRC32_SARWATE is not set CONFIG_CRC32_SLICEBY8=y @@ -123,14 +136,13 @@ 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_DEVTMPFS=y -CONFIG_DEVTMPFS_MOUNT=y CONFIG_DMADEVICES=y -# CONFIG_DMA_CMA is not set +CONFIG_DMA_CMA=y CONFIG_DMA_ENGINE=y CONFIG_DMA_OF=y CONFIG_DMA_SHARED_BUFFER=y @@ -145,7 +157,6 @@ CONFIG_DRM_KMS_FB_HELPER=y CONFIG_DRM_KMS_HELPER=y CONFIG_DRM_PANEL=y CONFIG_DRM_PANEL_SIMPLE=y -CONFIG_DST_CACHE=y CONFIG_DTC=y CONFIG_DUMMY_CONSOLE=y CONFIG_EDAC_ATOMIC_SCRUB=y @@ -153,9 +164,7 @@ CONFIG_EDAC_SUPPORT=y CONFIG_EEPROM_AT24=y CONFIG_ELF_CORE=y CONFIG_ENABLE_MUST_CHECK=y -CONFIG_EXPORTFS=y CONFIG_EXT4_FS=y -CONFIG_FANOTIFY=y CONFIG_FAT_FS=y CONFIG_FB=y # CONFIG_FB_ATMEL is not set @@ -168,12 +177,10 @@ CONFIG_FB_SYS_COPYAREA=y CONFIG_FB_SYS_FILLRECT=y CONFIG_FB_SYS_FOPS=y CONFIG_FB_SYS_IMAGEBLIT=y -CONFIG_FHANDLE=y CONFIG_FIRMWARE_IN_KERNEL=y CONFIG_FIXED_PHY=y CONFIG_FIX_EARLYCON_MEM=y CONFIG_FORCE_MAX_ZONEORDER=15 -CONFIG_FRAME_VECTOR=y CONFIG_FREEZER=y CONFIG_FS_MBCACHE=y # CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set @@ -195,7 +202,6 @@ CONFIG_GENERIC_STRNLEN_USER=y CONFIG_GPIOLIB=y CONFIG_GPIOLIB_IRQCHIP=y CONFIG_GPIO_SYSFS=y -CONFIG_GRACE_PERIOD=y CONFIG_HANDLE_DOMAIN_IRQ=y CONFIG_HARDEN_BRANCH_PREDICTOR=y CONFIG_HARDIRQS_SW_RESEND=y @@ -211,7 +217,6 @@ 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_GENERATED_CLK=y CONFIG_HAVE_AT91_H32MX=y CONFIG_HAVE_AT91_SMD=y CONFIG_HAVE_AT91_USB_CLK=y @@ -255,7 +260,6 @@ CONFIG_HW_CONSOLE=y CONFIG_HW_RANDOM=y CONFIG_HW_RANDOM_ATMEL=y CONFIG_HZ_FIXED=0 -CONFIG_HZ_PERIODIC=y CONFIG_I2C=y CONFIG_I2C_ALGOBIT=y CONFIG_I2C_AT91=y @@ -277,10 +281,6 @@ CONFIG_INPUT_LEDS=y CONFIG_INPUT_TOUCHSCREEN=y CONFIG_IOMMU_HELPER=y # CONFIG_IOSCHED_DEADLINE is not set -CONFIG_IP_PNP=y -# CONFIG_IP_PNP_BOOTP is not set -CONFIG_IP_PNP_DHCP=y -# CONFIG_IP_PNP_RARP is not set CONFIG_IRQCHIP=y CONFIG_IRQ_DOMAIN=y CONFIG_IRQ_DOMAIN_DEBUG=y @@ -294,7 +294,7 @@ CONFIG_KEXEC=y CONFIG_KEXEC_CORE=y CONFIG_KEYBOARD_GPIO=y CONFIG_KEYBOARD_QT1070=y -# CONFIG_LCD_PLATFORM is not set +# CONFIG_LCD_CLASS_DEVICE is not set CONFIG_LEDS_GPIO=y CONFIG_LEDS_PWM=y CONFIG_LEDS_TRIGGER_CPU=y @@ -305,19 +305,20 @@ CONFIG_LEGACY_PTYS=y CONFIG_LEGACY_PTY_COUNT=4 CONFIG_LIBFDT=y CONFIG_LOCALVERSION_AUTO=y -CONFIG_LOCKD=y CONFIG_LOG_BUF_SHIFT=16 CONFIG_LZO_COMPRESS=y CONFIG_LZO_DECOMPRESS=y CONFIG_MACB=y +CONFIG_MAGIC_SYSRQ=y CONFIG_MANDATORY_FILE_LOCKING=y CONFIG_MDIO_BOARDINFO=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y -# CONFIG_MEMCG is not set CONFIG_MEMORY=y CONFIG_MEMORY_ISOLATION=y +CONFIG_MFD_ACT8945A=y +CONFIG_MFD_ATMEL_FLEXCOM=y CONFIG_MFD_ATMEL_HLCDC=y CONFIG_MFD_CORE=y CONFIG_MFD_SYSCON=y @@ -329,15 +330,21 @@ CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y CONFIG_MMC_BLOCK=y # CONFIG_MMC_BLOCK_BOUNCE is not set +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_IO_ACCESSORS=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 @@ -354,6 +361,8 @@ 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 @@ -396,10 +405,11 @@ CONFIG_PM_SLEEP_DEBUG=y CONFIG_POWER_RESET=y CONFIG_POWER_RESET_AT91_POWEROFF=y CONFIG_POWER_RESET_AT91_RESET=y -# CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC is not set +CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y CONFIG_POWER_SUPPLY=y # CONFIG_PREVENT_FIRMWARE_BUILD is not set -CONFIG_PROC_PAGE_MONITOR=y +CONFIG_PRINTK_TIME=y +CONFIG_PROC_VMCORE=y CONFIG_PWM=y CONFIG_PWM_ATMEL=y CONFIG_PWM_ATMEL_HLCDC_PWM=y @@ -413,15 +423,17 @@ 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_ROOT_NFS=y +CONFIG_RFKILL_REGULATOR=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 is not set +CONFIG_SAMA5D4_WATCHDOG=y # CONFIG_SCHED_INFO is not set CONFIG_SCSI=y # CONFIG_SCSI_LOWLEVEL is not set @@ -440,7 +452,7 @@ CONFIG_SND_ARM=y # 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 is not set +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 @@ -460,13 +472,16 @@ 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 is not set # CONFIG_SOC_SAMA5D3 is not set -# CONFIG_SOC_SAMA5D4 is not set +CONFIG_SOC_SAMA5D4=y +CONFIG_SOC_SAM_V7=y CONFIG_SOUND=y 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 @@ -475,10 +490,8 @@ CONFIG_SRAM=y CONFIG_SRCU=y # CONFIG_STAGING is not set # CONFIG_STANDALONE is not set -CONFIG_SUNRPC=y CONFIG_SUSPEND=y CONFIG_SUSPEND_FREEZER=y -# CONFIG_SWAP is not set CONFIG_SWIOTLB=y CONFIG_SWPHY=y # CONFIG_SWP_EMULATE is not set @@ -489,6 +502,8 @@ CONFIG_SYS_SUPPORTS_APM_EMULATION=y # CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y # CONFIG_TMPFS_XATTR is not set +CONFIG_TOUCHSCREEN_ATMEL_MXT=y +# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set CONFIG_TOUCHSCREEN_PROPERTIES=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_UBIFS_FS=y @@ -501,35 +516,17 @@ CONFIG_USB=y CONFIG_USB_ACM=y CONFIG_USB_ANNOUNCE_NEW_DEVICES=y # CONFIG_USB_AT91 is not set -# CONFIG_USB_AUDIO is not set +# CONFIG_USB_ATMEL_USBA is not set CONFIG_USB_COMMON=y -CONFIG_USB_CONFIGFS_ACM=y -# CONFIG_USB_CONFIGFS_ECM is not set -# CONFIG_USB_CONFIGFS_ECM_SUBSET is not set -# CONFIG_USB_CONFIGFS_EEM is not set -# CONFIG_USB_CONFIGFS_F_FS is not set -# CONFIG_USB_CONFIGFS_F_HID is not set -# CONFIG_USB_CONFIGFS_F_LB_SS is not set -# CONFIG_USB_CONFIGFS_F_MIDI is not set -# CONFIG_USB_CONFIGFS_F_PRINTER is not set -# CONFIG_USB_CONFIGFS_F_UAC1 is not set -# CONFIG_USB_CONFIGFS_F_UAC2 is not set -# CONFIG_USB_CONFIGFS_F_UVC is not set -CONFIG_USB_CONFIGFS_MASS_STORAGE=y -# CONFIG_USB_CONFIGFS_NCM is not set -# CONFIG_USB_CONFIGFS_OBEX is not set -# CONFIG_USB_CONFIGFS_RNDIS is not set -# CONFIG_USB_CONFIGFS_SERIAL is not set 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_ETH 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 is not set +CONFIG_USB_OHCI_HCD_PLATFORM=y # CONFIG_USB_PWC is not set CONFIG_USB_SERIAL=y # CONFIG_USB_SERIAL_CONSOLE is not set diff --git a/target/linux/at91/legacy/config-default b/target/linux/at91/legacy/config-default index f53f24e9f5..4f73051f1c 100644 --- a/target/linux/at91/legacy/config-default +++ b/target/linux/at91/legacy/config-default @@ -2,21 +2,16 @@ CONFIG_ARCH_MULTI_V4T=y CONFIG_ARCH_MULTI_V4_V5=y CONFIG_ARCH_MULTI_V5=y +# CONFIG_ARCH_MULTI_V7 is not set # CONFIG_ARM_AT91_CPUIDLE is not set CONFIG_ARM_L1_CACHE_SHIFT=5 # CONFIG_AT91RM9200_WATCHDOG is not set +# CONFIG_AT91_SAMA5D2_ADC is not set CONFIG_ATMEL_AIC_IRQ=y CONFIG_ATMEL_ST=y -CONFIG_AT_XDMAC=y CONFIG_BACKLIGHT_ATMEL_LCDC=y # CONFIG_CACHE_L2X0 is not set -CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_DEBUGFS=y -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_CPU_32v4T=y CONFIG_CPU_32v5=y CONFIG_CPU_ABRT_EV4T=y @@ -28,6 +23,7 @@ CONFIG_CPU_CACHE_V4WT=y CONFIG_CPU_CACHE_VIVT=y CONFIG_CPU_COPY_V4WB=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_TLB_V4WBI=y @@ -35,8 +31,7 @@ CONFIG_CPU_USE_DOMAINS=y CONFIG_CRC7=y CONFIG_CRC_CCITT=y CONFIG_CRC_ITU_T=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DMA_CMA=y +CONFIG_DEBUG_INFO=y CONFIG_FB_ATMEL=y CONFIG_FB_BACKLIGHT=y CONFIG_FB_MODE_HELPERS=y @@ -44,12 +39,20 @@ CONFIG_GENERIC_ATOMIC64=y # CONFIG_HAVE_ARCH_BITREVERSE is not set CONFIG_HZ=128 CONFIG_HZ_FIXED=128 -# CONFIG_LCD_CLASS_DEVICE is not set +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_SPI=y +# CONFIG_MTD_SPI_NOR is not set CONFIG_NEED_KUSER_HELPERS=y -CONFIG_RFKILL_REGULATOR=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 @@ -57,4 +60,4 @@ CONFIG_SOC_AT91SAM9=y CONFIG_SOC_SAM_V4_V5=y CONFIG_SPLIT_PTLOCK_CPUS=999999 CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_USB_ATMEL_USBA is not set +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set diff --git a/target/linux/at91/sama5d2/config-default b/target/linux/at91/sama5d2/config-default index 43f8d240e3..e8f0854692 100644 --- a/target/linux/at91/sama5d2/config-default +++ b/target/linux/at91/sama5d2/config-default @@ -1,44 +1,6 @@ -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_AT91_SAMA5D2_ADC=y -CONFIG_AT_XDMAC=y -CONFIG_BATTERY_ACT8945A=y CONFIG_CAN=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_DEBUGFS=y -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_CPU_IDLE_GOV_MENU=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DMA_CMA=y -# CONFIG_HZ_PERIODIC is not set -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_MEMCG=y -CONFIG_MFD_ACT8945A=y -CONFIG_MFD_ATMEL_FLEXCOM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_OF_AT91=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_SPI_NOR=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_PAGE_COUNTER=y +CONFIG_HAVE_AT91_GENERATED_CLK=y CONFIG_POSIX_MQUEUE=y CONFIG_POSIX_MQUEUE_SYSCTL=y -CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y -CONFIG_REGULATOR_ACT8865=y -CONFIG_REGULATOR_ACT8945A=y -CONFIG_RFKILL_REGULATOR=y -CONFIG_SAMA5D4_WATCHDOG=y -CONFIG_SND_ATMEL_SOC_CLASSD=y CONFIG_SOC_SAMA5D2=y -CONFIG_SOC_SAM_V7=y -CONFIG_SPI_ATMEL_QUADSPI=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -# CONFIG_USB_ATMEL_USBA is not set +# CONFIG_SOC_SAMA5D4 is not set diff --git a/target/linux/at91/sama5d3/config-default b/target/linux/at91/sama5d3/config-default index 88b4031a94..eb0ec01cb9 100644 --- a/target/linux/at91/sama5d3/config-default +++ b/target/linux/at91/sama5d3/config-default @@ -1,39 +1,2 @@ -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_AT91_SAMA5D2_ADC=y -CONFIG_AT_XDMAC=y -CONFIG_BATTERY_ACT8945A=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_DEBUGFS=y -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_CPU_IDLE_GOV_MENU=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DMA_CMA=y -# CONFIG_HZ_PERIODIC is not set -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_MFD_ACT8945A=y -CONFIG_MFD_ATMEL_FLEXCOM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_OF_AT91=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_SPI_NOR=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y -CONFIG_REGULATOR_ACT8865=y -CONFIG_REGULATOR_ACT8945A=y -CONFIG_RFKILL_REGULATOR=y -CONFIG_SAMA5D4_WATCHDOG=y -CONFIG_SND_ATMEL_SOC_CLASSD=y CONFIG_SOC_SAMA5D3=y -CONFIG_SOC_SAM_V7=y -CONFIG_SPI_ATMEL_QUADSPI=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -# CONFIG_USB_ATMEL_USBA is not set +# CONFIG_SOC_SAMA5D4 is not set diff --git a/target/linux/at91/sama5d4/config-default b/target/linux/at91/sama5d4/config-default deleted file mode 100644 index baa2d5f46f..0000000000 --- a/target/linux/at91/sama5d4/config-default +++ /dev/null @@ -1,39 +0,0 @@ -CONFIG_ARCH_MULTI_V6_V7=y -CONFIG_ARCH_MULTI_V7=y -CONFIG_AT91_SAMA5D2_ADC=y -CONFIG_AT_XDMAC=y -CONFIG_BATTERY_ACT8945A=y -CONFIG_CMA_ALIGNMENT=8 -CONFIG_CMA_DEBUGFS=y -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_CPU_IDLE_GOV_MENU=y -CONFIG_DEBUG_MEMORY_INIT=y -CONFIG_DMA_CMA=y -# CONFIG_HZ_PERIODIC is not set -# CONFIG_LCD_CLASS_DEVICE is not set -CONFIG_MFD_ACT8945A=y -CONFIG_MFD_ATMEL_FLEXCOM=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y -CONFIG_MMC_SDHCI_OF_AT91=y -CONFIG_MMC_SDHCI_PLTFM=y -CONFIG_MTD_M25P80=y -CONFIG_MTD_SPI_NOR=y -CONFIG_NO_HZ_COMMON=y -CONFIG_NO_HZ_IDLE=y -CONFIG_POWER_RESET_AT91_SAMA5D2_SHDWC=y -CONFIG_REGULATOR_ACT8865=y -CONFIG_REGULATOR_ACT8945A=y -CONFIG_RFKILL_REGULATOR=y -CONFIG_SAMA5D4_WATCHDOG=y -CONFIG_SND_ATMEL_SOC_CLASSD=y -CONFIG_SOC_SAMA5D4=y -CONFIG_SOC_SAM_V7=y -CONFIG_SPI_ATMEL_QUADSPI=y -CONFIG_TOUCHSCREEN_ATMEL_MXT=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set -# CONFIG_USB_ATMEL_USBA is not set From patchwork Sat May 11 11:53:18 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1098421 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Uq8Ybskj"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 451QV6063Jz9s9N for ; Sat, 11 May 2019 21:54:22 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=JD+QAH9TFKlOUgPAWVGGWDWLYtseu/eJaJooYzc9ur4=; b=Uq8YbskjDs5c9o JXJblkDTEEboYdVYcf17sO+Dyl9/Z7Qt0cWspRHedFl5eeN/+APEo2BbxjnOQsCCZKIEWVsLFJpzF MLh7ADJcQhkWk50QBzaKlP3bKHF9ZherYeDabqMaCcetZaSSo0nMh6nxYg+vKbvVlGZIUW1FrF3kf +0vjwJBuJlIg5hrMBKU8Kkmae1kDKbKOf/NzmNqD9GkHQZ9yM998MWbOC7R3iJWY1MmTGhWXuYwrc nvU2dYwRdPX+IX518G2p3hVIgArk4Td6noDmd63Foqj+xK5zoKypVJtji3eSOffQuuUrIsXO1OSSx Zx/n0js8lWHuQy3d1mag==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQZt-0001pz-Fs; Sat, 11 May 2019 11:54:09 +0000 Received: from mx1.mailbox.org ([80.241.60.212]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQZq-0001oz-CZ for openwrt-devel@lists.openwrt.org; Sat, 11 May 2019 11:54:08 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [IPv6:2001:67c:2050:105:465:1:1:0]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx1.mailbox.org (Postfix) with ESMTPS id D5E654EA89; Sat, 11 May 2019 13:54:04 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter05.heinlein-hosting.de (spamfilter05.heinlein-hosting.de [80.241.56.123]) (amavisd-new, port 10030) with ESMTP id GpQ0FUdVqPOE; Sat, 11 May 2019 13:53:57 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sat, 11 May 2019 13:53:18 +0200 Message-Id: <20190511115320.12285-3-hauke@hauke-m.de> In-Reply-To: <20190511115320.12285-1-hauke@hauke-m.de> References: <20190511115320.12285-1-hauke@hauke-m.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190511_045406_734777_2E381F6D X-CRM114-Status: GOOD ( 13.62 ) X-Spam-Score: 0.1 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (0.1 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.60.212 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.8 UPPERCASE_50_75 message body is 50-75% uppercase Subject: [OpenWrt-Devel] [PATCH 2/4] at91: Clean up kernel configuration X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: c.mignanti@gmail.com, sandeepsheriker.mallikarjun@microchip.com, Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This removes some settings which are normally set by the generic configuration and should not be changed. Signed-off-by: Hauke Mehrtens --- target/linux/at91/config-4.9 | 19 +------------------ target/linux/at91/sama5d2/config-default | 3 --- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.9 index 00ea3ff1ad..452cfd5aa3 100644 --- a/target/linux/at91/config-4.9 +++ b/target/linux/at91/config-4.9 @@ -58,8 +58,6 @@ CONFIG_BLK_DEV_RAM=y CONFIG_BLK_DEV_RAM_COUNT=4 CONFIG_BLK_DEV_RAM_SIZE=8192 CONFIG_BLK_DEV_SD=y -# CONFIG_BPF_SYSCALL is not set -# CONFIG_BRIDGE is not set CONFIG_CACHE_L2X0=y CONFIG_CC_OPTIMIZE_FOR_PERFORMANCE=y # CONFIG_CC_OPTIMIZE_FOR_SIZE is not set @@ -71,7 +69,7 @@ CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 CONFIG_CMA_AREAS=7 # CONFIG_CMA_DEBUG is not set -CONFIG_CMA_DEBUGFS=y +# 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 @@ -183,7 +181,6 @@ CONFIG_FIX_EARLYCON_MEM=y CONFIG_FORCE_MAX_ZONEORDER=15 CONFIG_FREEZER=y CONFIG_FS_MBCACHE=y -# CONFIG_FW_LOADER_USER_HELPER_FALLBACK is not set CONFIG_GENERIC_ALLOCATOR=y CONFIG_GENERIC_BUG=y CONFIG_GENERIC_CLOCKEVENTS=y @@ -378,9 +375,6 @@ CONFIG_OLD_SIGSUSPEND3=y CONFIG_OUTER_CACHE=y CONFIG_OUTER_CACHE_SYNC=y CONFIG_PAGE_OFFSET=0xC0000000 -# CONFIG_PANIC_ON_OOPS is not set -CONFIG_PANIC_ON_OOPS_VALUE=0 -CONFIG_PANIC_TIMEOUT=0 # CONFIG_PARTITION_ADVANCED is not set # CONFIG_PCI_DOMAINS_GENERIC is not set # CONFIG_PCI_SYSCALL is not set @@ -416,7 +410,6 @@ CONFIG_PWM_ATMEL_HLCDC_PWM=y CONFIG_PWM_ATMEL_TCB=y CONFIG_PWM_SYSFS=y CONFIG_RATIONAL=y -# CONFIG_RCU_EXPERT is not set # CONFIG_RCU_STALL_COMMON is not set CONFIG_REGMAP=y CONFIG_REGMAP_I2C=y @@ -444,8 +437,6 @@ CONFIG_SERIAL_ATMEL_PDC=y # CONFIG_SERIAL_ATMEL_TTYAT is not set CONFIG_SERIAL_MCTRL_GPIO=y CONFIG_SG_POOL=y -CONFIG_SLAB=y -# CONFIG_SLUB is not set CONFIG_SND=y CONFIG_SND_ARM=y # CONFIG_SND_AT73C213 is not set @@ -488,20 +479,15 @@ CONFIG_SPI_MASTER=y # CONFIG_SQUASHFS is not set CONFIG_SRAM=y CONFIG_SRCU=y -# CONFIG_STAGING is not set # 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_SYN_COOKIES is not set -CONFIG_SYSFS_SYSCALL=y CONFIG_SYS_SUPPORTS_APM_EMULATION=y -# CONFIG_TCP_CONG_ADVANCED is not set # CONFIG_THUMB2_KERNEL is not set CONFIG_TICK_CPU_ACCOUNTING=y -# CONFIG_TMPFS_XATTR is not set CONFIG_TOUCHSCREEN_ATMEL_MXT=y # CONFIG_TOUCHSCREEN_ATMEL_MXT_T37 is not set CONFIG_TOUCHSCREEN_PROPERTIES=y @@ -510,7 +496,6 @@ CONFIG_UBIFS_FS=y CONFIG_UBIFS_FS_ADVANCED_COMPR=y CONFIG_UBIFS_FS_LZO=y CONFIG_UBIFS_FS_ZLIB=y -# CONFIG_UEVENT_HELPER is not set CONFIG_UNCOMPRESS_INCLUDE="debug/uncompress.h" CONFIG_USB=y CONFIG_USB_ACM=y @@ -544,14 +529,12 @@ CONFIG_VIDEOMODE_HELPERS=y # CONFIG_VIDEO_CPIA2 is not set CONFIG_VIDEO_DEV=y CONFIG_VIDEO_V4L2=y -# CONFIG_VLAN_8021Q is not set CONFIG_VM_EVENT_COUNTERS=y CONFIG_VT=y CONFIG_VT_CONSOLE=y CONFIG_VT_CONSOLE_SLEEP=y # CONFIG_VT_HW_CONSOLE_BINDING is not set CONFIG_WATCHDOG_CORE=y -# CONFIG_WLAN is not set # CONFIG_WQ_POWER_EFFICIENT_DEFAULT is not set CONFIG_ZBOOT_ROM_BSS=0x0 CONFIG_ZBOOT_ROM_TEXT=0x0 diff --git a/target/linux/at91/sama5d2/config-default b/target/linux/at91/sama5d2/config-default index e8f0854692..1724375c33 100644 --- a/target/linux/at91/sama5d2/config-default +++ b/target/linux/at91/sama5d2/config-default @@ -1,6 +1,3 @@ -CONFIG_CAN=y CONFIG_HAVE_AT91_GENERATED_CLK=y -CONFIG_POSIX_MQUEUE=y -CONFIG_POSIX_MQUEUE_SYSCTL=y CONFIG_SOC_SAMA5D2=y # CONFIG_SOC_SAMA5D4 is not set From patchwork Sat May 11 11:53:19 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1098424 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="pgyKiXYI"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 451QVd3mHdz9s9N for ; Sat, 11 May 2019 21:54:49 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=hE1fyi7UvnJd/S/Z6wheFPpiHXa5NIRWJWUyI9wsuC0=; b=pgyKiXYIxR+Nbt Dyd51oJHKeu+y7D2NaMLIFCZ4yP2cS4rK4h+dx/rlvlGJGRxP7GqmrG+3dcyqsLAfRys3m3BuJwsQ votJsssO7bCOzJpcv2ohaOs0N1VZlvQ81k22X3yWLTmq2gwgDCPZBosz9mSEbp9k0l0CUaEKrEufQ vXLRbmUr14A6c3QfiOv8ym3Zw8NUiZavVOB42YgrWBbjh7jO5zxa0mEX85gck++yvBkqRQzAvAI2Z N83jaTin/ZUNq/1g044si2xEha/91w7WiODFt1NzzIlLaNwaswfgyv/7MhVMuO9DNzXSCaaoJAae5 ZY/eObpKrhfn9BYKOv9g==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQaN-0002YM-CI; Sat, 11 May 2019 11:54:39 +0000 Received: from mx2.mailbox.org ([80.241.60.215]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQZu-0001qT-Sy for openwrt-devel@lists.openwrt.org; Sat, 11 May 2019 11:54:23 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 84273A116F; Sat, 11 May 2019 13:54:09 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by spamfilter03.heinlein-hosting.de (spamfilter03.heinlein-hosting.de [80.241.56.117]) (amavisd-new, port 10030) with ESMTP id iX3A1Qu7FuYD; Sat, 11 May 2019 13:53:58 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sat, 11 May 2019 13:53:19 +0200 Message-Id: <20190511115320.12285-4-hauke@hauke-m.de> In-Reply-To: <20190511115320.12285-1-hauke@hauke-m.de> References: <20190511115320.12285-1-hauke@hauke-m.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190511_045411_592039_1D3ECEBD X-CRM114-Status: GOOD ( 15.60 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [80.241.60.215 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 3/4] at91: Merge SAMA5 subtargets X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: c.mignanti@gmail.com, sandeepsheriker.mallikarjun@microchip.com, Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Instead of maintaining 3 very similar subtargets merge them into one. This does not use the Arm NEON extension any more, because the SAMA5D3 does not support NEON. Signed-off-by: Hauke Mehrtens --- package/boot/at91bootstrap/Makefile | 26 ++++----- package/boot/uboot-at91/Makefile | 22 ++++---- target/linux/at91/Makefile | 2 +- target/linux/at91/config-4.9 | 5 +- target/linux/at91/image/Makefile | 10 +--- target/linux/at91/image/sama5.mk | 71 ++++++++++++++++++++++++ target/linux/at91/image/sama5d2.mk | 31 ----------- target/linux/at91/image/sama5d3.mk | 33 ----------- target/linux/at91/image/sama5d4.mk | 19 ------- target/linux/at91/sama5/config-default | 0 target/linux/at91/sama5/target.mk | 10 ++++ target/linux/at91/sama5d2/config-default | 3 - target/linux/at91/sama5d2/target.mk | 10 ---- target/linux/at91/sama5d3/config-default | 2 - target/linux/at91/sama5d3/target.mk | 10 ---- target/linux/at91/sama5d4/target.mk | 10 ---- 16 files changed, 111 insertions(+), 153 deletions(-) create mode 100644 target/linux/at91/image/sama5.mk delete mode 100644 target/linux/at91/image/sama5d2.mk create mode 100644 target/linux/at91/sama5/config-default create mode 100644 target/linux/at91/sama5/target.mk delete mode 100644 target/linux/at91/sama5d2/config-default delete mode 100644 target/linux/at91/sama5d2/target.mk delete mode 100644 target/linux/at91/sama5d3/config-default delete mode 100644 target/linux/at91/sama5d3/target.mk delete mode 100644 target/linux/at91/sama5d4/target.mk diff --git a/package/boot/at91bootstrap/Makefile b/package/boot/at91bootstrap/Makefile index 22afd1ec41..8a08a7aa2c 100644 --- a/package/boot/at91bootstrap/Makefile +++ b/package/boot/at91bootstrap/Makefile @@ -30,79 +30,79 @@ endef define AT91Bootstrap/sama5d2_xplaineddf_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d2_xplaineddf_qspi_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (QSPI Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d2_xplainedsd_uboot TITLE:=AT91Bootstrap for SAMA5D2 Xplained board (SDcard/EMMC) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define AT91Bootstrap/sama5d3_xplainednf_uboot TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (Nand Flash) - BUILD_SUBTARGET:=sama5d3 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define AT91Bootstrap/sama5d3_xplainedsd_uboot TITLE:=AT91Bootstrap for SAMA5D3 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5d3 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define AT91Bootstrap/sama5d4_xplainednf_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (Nand Flash) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define AT91Bootstrap/sama5d4_xplaineddf_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define AT91Bootstrap/sama5d4_xplainedsd_uboot_secure TITLE:=AT91Bootstrap for SAMA5D4 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define AT91Bootstrap/sama5d27_som1_eksd_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard0) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef define AT91Bootstrap/sama5d27_som1_eksd1_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (SDcard1) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef define AT91Bootstrap/sama5d27_som1_ekqspi_uboot TITLE:=AT91Bootstrap for SAMA5D27 SOM1 Ek (QSPI Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef define AT91Bootstrap/sama5d2_ptc_eknf_uboot TITLE:=AT91Bootstrap for SAMA5D2 PTC EK (Nand Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_ptc_ek endef define AT91Bootstrap/sama5d2_ptc_eksd_uboot TITLE:=AT91Bootstrap for SAMA5D2 PTC EK (SDCard) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_ptc_ek endef diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index f0a4ba56c2..23bd2d2b01 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -40,67 +40,67 @@ endef define U-Boot/sama5d3_xplained_nandflash NAME:=SAMA5D3 Xplained board (NandFlash) - BUILD_SUBTARGET:=sama5d3 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define U-Boot/sama5d3_xplained_mmc NAME:=SAMA5D3 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5d3 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d3_xplained endef define U-Boot/sama5d2_xplained_spiflash NAME:=SAMA5D2 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define U-Boot/sama5d2_xplained_mmc NAME:=SAMA5D2 Xplained board (SDcard/EMMC) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_xplained endef define U-Boot/sama5d4_xplained_spiflash NAME:=SAMA5D4 Xplained board (SPI Flash) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define U-Boot/sama5d4_xplained_mmc NAME:=SAMA5D4 Xplained board (SDcard) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define U-Boot/sama5d4_xplained_nandflash NAME:=SAMA5D4 Xplained board (NandFlash) - BUILD_SUBTARGET:=sama5d4 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d4_xplained endef define U-Boot/sama5d27_som1_ek_mmc NAME:=SAMA5D27 SOM1 Ek (SDCard) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef define U-Boot/sama5d27_som1_ek_spiflash NAME:=SAMA5D27 SOM1 Ek (QSPI Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d27_som1_ek endef define U-Boot/sama5d2_ptc_ek_nandflash NAME:=SAMA5D2 PTC Ek (Nand Flash) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_ptc_ek endef define U-Boot/sama5d2_ptc_ek_mmc NAME:=SAMA5D2 PTC Ek (SDCard) - BUILD_SUBTARGET:=sama5d2 + BUILD_SUBTARGET:=sama5 BUILD_DEVICES:=at91-sama5d2_ptc_ek endef diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index d71e0850ff..cae3c6278b 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -11,7 +11,7 @@ BOARD:=at91 MAINTAINER:=Claudio Mignanti BOARDNAME:=Microchip (Atmel AT91) FEATURES:=ext4 squashfs targz usb usbgadget ubifs -SUBTARGETS:=sama5d2 sama5d3 sama5d4 legacy +SUBTARGETS:=sama5 legacy KERNEL_PATCHVER:=4.9 diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.9 index 452cfd5aa3..ad18d6b826 100644 --- a/target/linux/at91/config-4.9 +++ b/target/linux/at91/config-4.9 @@ -214,6 +214,7 @@ 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_GENERATED_CLK=y CONFIG_HAVE_AT91_H32MX=y CONFIG_HAVE_AT91_SMD=y CONFIG_HAVE_AT91_USB_CLK=y @@ -464,8 +465,8 @@ CONFIG_SND_SUPPORT_OLD_API=y CONFIG_SND_TIMER=y CONFIG_SOC_BUS=y CONFIG_SOC_SAMA5=y -# CONFIG_SOC_SAMA5D2 is not set -# CONFIG_SOC_SAMA5D3 is not set +CONFIG_SOC_SAMA5D2=y +CONFIG_SOC_SAMA5D3=y CONFIG_SOC_SAMA5D4=y CONFIG_SOC_SAM_V7=y CONFIG_SOUND=y diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index 49d93aa97d..f4d942b682 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -16,14 +16,8 @@ endef ifeq ($(SUBTARGET),legacy) include ./legacy.mk endif -ifeq ($(SUBTARGET),sama5d2) -include ./sama5d2.mk -endif -ifeq ($(SUBTARGET),sama5d3) -include ./sama5d3.mk -endif -ifeq ($(SUBTARGET),sama5d4) -include ./sama5d4.mk +ifeq ($(SUBTARGET),sama5) +include ./sama5.mk endif AT91_SD_BOOT_PARTSIZE:=64 diff --git a/target/linux/at91/image/sama5.mk b/target/linux/at91/image/sama5.mk new file mode 100644 index 0000000000..f9a190c8b2 --- /dev/null +++ b/target/linux/at91/image/sama5.mk @@ -0,0 +1,71 @@ + +define Device/default-nand + BLOCKSIZE := 128k + PAGESIZE := 2048 + SUBPAGESIZE := 2048 + MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048 +endef + +define Device/at91-sama5d2_xplained + $(Device/evaluation-dtb) + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 Xplained + KERNEL_SIZE := 6144k + $(Device/evaluation-sdimage) +endef +TARGET_DEVICES += at91-sama5d2_xplained + +define Device/at91-sama5d27_som1_ek + $(Device/evaluation-dtb) + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D27 SOM1 Ek + KERNEL_SIZE := 6144k + $(Device/evaluation-sdimage) +endef +TARGET_DEVICES += at91-sama5d27_som1_ek + +define Device/at91-sama5d2_ptc_ek + $(Device/evaluation-dtb) + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 PTC Ek + KERNEL_SIZE := 6144k + $(Device/evaluation-sdimage) +endef +TARGET_DEVICES += at91-sama5d2_ptc_ek + + +define Device/at91-sama5d3_xplained + $(Device/evaluation-dtb) + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D3 Xplained + KERNEL_SIZE := 6144k + $(Device/evaluation-sdimage) +endef +TARGET_DEVICES += at91-sama5d3_xplained + +ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") + ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") + define Device/wb50n + $(Device/evaluation-fit) + DEVICE_TITLE := Laird WB50N + DEVICE_PACKAGES := \ + kmod-mmc-at91 kmod-ath6kl-sdio ath6k-firmware \ + kmod-usb-storage kmod-fs-vfat kmod-fs-msdos \ + kmod-leds-gpio + BLOCKSIZE := 128k + PAGESIZE := 2048 + SUBPAGESIZE := 2048 + MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 955 + endef + TARGET_DEVICES += wb50n + endif +endif + + +define Device/at91-sama5d4_xplained + $(Device/evaluation-dtb) + DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D4 Xplained + KERNEL_SIZE := 6144k + BLOCKSIZE := 256k + PAGESIZE := 4096 + SUBPAGESIZE := 2048 + MKUBIFS_OPTS := -m $$(PAGESIZE) -e 248KiB -c 2082 + $(Device/evaluation-sdimage) +endef +TARGET_DEVICES += at91-sama5d4_xplained diff --git a/target/linux/at91/image/sama5d2.mk b/target/linux/at91/image/sama5d2.mk deleted file mode 100644 index b841448633..0000000000 --- a/target/linux/at91/image/sama5d2.mk +++ /dev/null @@ -1,31 +0,0 @@ - -define Device/default-nand - BLOCKSIZE := 128k - PAGESIZE := 2048 - SUBPAGESIZE := 2048 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048 -endef - -define Device/at91-sama5d2_xplained - $(Device/evaluation-dtb) - DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 Xplained - KERNEL_SIZE := 6144k - $(Device/evaluation-sdimage) -endef -TARGET_DEVICES += at91-sama5d2_xplained - -define Device/at91-sama5d27_som1_ek - $(Device/evaluation-dtb) - DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D27 SOM1 Ek - KERNEL_SIZE := 6144k - $(Device/evaluation-sdimage) -endef -TARGET_DEVICES += at91-sama5d27_som1_ek - -define Device/at91-sama5d2_ptc_ek - $(Device/evaluation-dtb) - DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D2 PTC Ek - KERNEL_SIZE := 6144k - $(Device/evaluation-sdimage) -endef -TARGET_DEVICES += at91-sama5d2_ptc_ek diff --git a/target/linux/at91/image/sama5d3.mk b/target/linux/at91/image/sama5d3.mk index f48c981030..e69de29bb2 100644 --- a/target/linux/at91/image/sama5d3.mk +++ b/target/linux/at91/image/sama5d3.mk @@ -1,33 +0,0 @@ - -define Device/default-nand - BLOCKSIZE := 128k - PAGESIZE := 2048 - SUBPAGESIZE := 2048 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048 -endef - -define Device/at91-sama5d3_xplained - $(Device/evaluation-dtb) - DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D3 Xplained - KERNEL_SIZE := 6144k - $(Device/evaluation-sdimage) -endef -TARGET_DEVICES += at91-sama5d3_xplained - -ifeq ($(strip $(CONFIG_EXTERNAL_KERNEL_TREE)),"") - ifeq ($(strip $(CONFIG_KERNEL_GIT_CLONE_URI)),"") - define Device/wb50n - $(Device/evaluation-fit) - DEVICE_TITLE := Laird WB50N - DEVICE_PACKAGES := \ - kmod-mmc-at91 kmod-ath6kl-sdio ath6k-firmware \ - kmod-usb-storage kmod-fs-vfat kmod-fs-msdos \ - kmod-leds-gpio - BLOCKSIZE := 128k - PAGESIZE := 2048 - SUBPAGESIZE := 2048 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 955 - endef - TARGET_DEVICES += wb50n - endif -endif diff --git a/target/linux/at91/image/sama5d4.mk b/target/linux/at91/image/sama5d4.mk index 1140c3c4b2..e69de29bb2 100644 --- a/target/linux/at91/image/sama5d4.mk +++ b/target/linux/at91/image/sama5d4.mk @@ -1,19 +0,0 @@ - -define Device/default-nand - BLOCKSIZE := 128k - PAGESIZE := 2048 - SUBPAGESIZE := 2048 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 124KiB -c 2048 -endef - -define Device/at91-sama5d4_xplained - $(Device/evaluation-dtb) - DEVICE_TITLE := Microchip(Atmel AT91) SAMA5D4 Xplained - KERNEL_SIZE := 6144k - BLOCKSIZE := 256k - PAGESIZE := 4096 - SUBPAGESIZE := 2048 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 248KiB -c 2082 - $(Device/evaluation-sdimage) -endef -TARGET_DEVICES += at91-sama5d4_xplained diff --git a/target/linux/at91/sama5/config-default b/target/linux/at91/sama5/config-default new file mode 100644 index 0000000000..e69de29bb2 diff --git a/target/linux/at91/sama5/target.mk b/target/linux/at91/sama5/target.mk new file mode 100644 index 0000000000..35df05b70d --- /dev/null +++ b/target/linux/at91/sama5/target.mk @@ -0,0 +1,10 @@ +BOARDNAME:=SAMA5 boards(Cortex-A5) +CPU_TYPE:=cortex-a5 +CPU_SUBTYPE:=vfpv4 +FEATURES+=fpu +DEFAULT_PACKAGES += kmod-usb2 + +define Target/Description + Build generic firmware for Microchip(Atmel AT91) SAMA5D2, + SAMA5D3 and SAMA5D4 MPU's using the ARMv7 instruction set. +endef diff --git a/target/linux/at91/sama5d2/config-default b/target/linux/at91/sama5d2/config-default deleted file mode 100644 index 1724375c33..0000000000 --- a/target/linux/at91/sama5d2/config-default +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_HAVE_AT91_GENERATED_CLK=y -CONFIG_SOC_SAMA5D2=y -# CONFIG_SOC_SAMA5D4 is not set diff --git a/target/linux/at91/sama5d2/target.mk b/target/linux/at91/sama5d2/target.mk deleted file mode 100644 index 63f50aeea1..0000000000 --- a/target/linux/at91/sama5d2/target.mk +++ /dev/null @@ -1,10 +0,0 @@ -BOARDNAME:=SAMA5D2 boards(Cortex-A5) -CPU_TYPE:=cortex-a5 -CPU_SUBTYPE:=neon-vfpv4 -FEATURES+=fpu -DEFAULT_PACKAGES += kmod-usb2 - -define Target/Description - Build generic firmware for Microchip(Atmel AT91) SAMA5D2 MPU's - using the ARMv7 instruction set. -endef diff --git a/target/linux/at91/sama5d3/config-default b/target/linux/at91/sama5d3/config-default deleted file mode 100644 index eb0ec01cb9..0000000000 --- a/target/linux/at91/sama5d3/config-default +++ /dev/null @@ -1,2 +0,0 @@ -CONFIG_SOC_SAMA5D3=y -# CONFIG_SOC_SAMA5D4 is not set diff --git a/target/linux/at91/sama5d3/target.mk b/target/linux/at91/sama5d3/target.mk deleted file mode 100644 index d30931bfc0..0000000000 --- a/target/linux/at91/sama5d3/target.mk +++ /dev/null @@ -1,10 +0,0 @@ -BOARDNAME:=SAMA5D3 boards(Cortex-A5) -CPU_TYPE:=cortex-a5 -CPU_SUBTYPE:=vfpv4 -FEATURES+=fpu -DEFAULT_PACKAGES += kmod-usb2 - -define Target/Description - Build generic firmware for Microchip(Atmel AT91) SAMA5D3 MPU's - using the ARMv7 instruction set. -endef diff --git a/target/linux/at91/sama5d4/target.mk b/target/linux/at91/sama5d4/target.mk deleted file mode 100644 index 2bbab60d81..0000000000 --- a/target/linux/at91/sama5d4/target.mk +++ /dev/null @@ -1,10 +0,0 @@ -BOARDNAME:=SAMA5D4 boards(Cortex-A5) -CPU_TYPE:=cortex-a5 -CPU_SUBTYPE:=neon-vfpv4 -FEATURES+=fpu -DEFAULT_PACKAGES += kmod-usb2 - -define Target/Description - Build generic firmware for Microchip(Atmel AT91) SAMA5D4 MPU's - using the ARMv7 instruction set. -endef From patchwork Sat May 11 11:53:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hauke Mehrtens X-Patchwork-Id: 1098425 X-Patchwork-Delegate: hauke@hauke-m.de Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:e::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=hauke-m.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="qWHbFVWC"; dkim-atps=neutral Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:e::133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 451QVw19xfz9s9N for ; Sat, 11 May 2019 21:55:04 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:Subject:MIME-Version:References: In-Reply-To:Message-Id:Date:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=V/ebqdAQiseyfSChbDWjUV+69dXGFsesCZSvc9XiM1U=; b=qWHbFVWC+t04Sq QddEoLUdHQWz+kSU7QWRcQnT5gelthzfjQUloUre70zNkX9O7ZmYGzWAf6M6at23uiZ9FrkuTuBAD pBgSBTdAxp7x71axSziwm5mx3C5d7yCqUkND6SK8gYt6d0yv2Y+LOyOMD0rp1BUjD7P8dJTJLr7ZX PMYS0lAno9IJV+azwxsjvHTIijzbihFcUXJuvkvBC9XV982HuJ8bpfqsWaS2Q61iq1y4Lksz6glNn tcNRwjRnZtelhAe4XlLnhxaF0KpmlvXg8Fx2MhMBXrs3Zj8vzJhnfehj3uZHUC/YFONBf3g4V3cxs Grg+OlX5jvBhSdKLR3iw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQaZ-0002r8-Ik; Sat, 11 May 2019 11:54:51 +0000 Received: from mx2a.mailbox.org ([2001:67c:2050:104:0:2:25:2] helo=mx2.mailbox.org) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1hPQZt-0001pl-PH for openwrt-devel@lists.openwrt.org; Sat, 11 May 2019 11:54:30 +0000 Received: from smtp1.mailbox.org (smtp1.mailbox.org [80.241.60.240]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by mx2.mailbox.org (Postfix) with ESMTPS id 73213A01F6; Sat, 11 May 2019 13:54:08 +0200 (CEST) X-Virus-Scanned: amavisd-new at heinlein-support.de Received: from smtp1.mailbox.org ([80.241.60.240]) by hefe.heinlein-support.de (hefe.heinlein-support.de [91.198.250.172]) (amavisd-new, port 10030) with ESMTP id 8z1QOXjuXamI; Sat, 11 May 2019 13:53:59 +0200 (CEST) From: Hauke Mehrtens To: openwrt-devel@lists.openwrt.org Date: Sat, 11 May 2019 13:53:20 +0200 Message-Id: <20190511115320.12285-5-hauke@hauke-m.de> In-Reply-To: <20190511115320.12285-1-hauke@hauke-m.de> References: <20190511115320.12285-1-hauke@hauke-m.de> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190511_045410_440827_C6FFD348 X-CRM114-Status: GOOD ( 16.51 ) X-Spam-Score: -0.7 (/) X-Spam-Report: SpamAssassin version 3.4.2 on bombadil.infradead.org summary: Content analysis details: (-0.7 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.7 RCVD_IN_DNSWL_LOW RBL: Sender listed at https://www.dnswl.org/, low trust [2001:67c:2050:104:0:2:25:2 listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record Subject: [OpenWrt-Devel] [PATCH 4/4] at91: Update kernel to version 4.14 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: c.mignanti@gmail.com, sandeepsheriker.mallikarjun@microchip.com, Hauke Mehrtens Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org This adds support for kernel 4.14 to the target and directly make it the default kernel version to use. Signed-off-by: Hauke Mehrtens --- target/linux/at91/Makefile | 2 +- target/linux/at91/{config-4.9 => config-4.14} | 45 +- target/linux/at91/legacy/config-default | 1 + .../100-ARM-at91-build-dtb-for-LMU5000.patch | 2 +- .../101-ARM-at91-build-dtb-for-q5xr5.patch | 2 +- .../102-ARM-at91-build-dtb-for-wb45n.patch | 4 +- .../103-ARM-at91-build-dtb-for-wb50n.patch | 2 +- ...RM-at91-build-dtb-for-sama5d2-ptc-Ek.patch | 5 +- ...-at91-build-dtb-for-sama5d27-SOM1-Ek.patch | 893 ------------------ target/linux/generic/config-4.14 | 2 + target/linux/generic/config-4.19 | 2 + 11 files changed, 48 insertions(+), 912 deletions(-) rename target/linux/at91/{config-4.9 => config-4.14} (93%) rename target/linux/at91/{patches-4.9 => patches-4.14}/100-ARM-at91-build-dtb-for-LMU5000.patch (80%) rename target/linux/at91/{patches-4.9 => patches-4.14}/101-ARM-at91-build-dtb-for-q5xr5.patch (82%) rename target/linux/at91/{patches-4.9 => patches-4.14}/102-ARM-at91-build-dtb-for-wb45n.patch (74%) rename target/linux/at91/{patches-4.9 => patches-4.14}/103-ARM-at91-build-dtb-for-wb50n.patch (85%) rename target/linux/at91/{patches-4.9 => patches-4.14}/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch (98%) delete mode 100644 target/linux/at91/patches-4.9/104-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index cae3c6278b..4dc70ebac1 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -13,7 +13,7 @@ BOARDNAME:=Microchip (Atmel AT91) FEATURES:=ext4 squashfs targz usb usbgadget ubifs SUBTARGETS:=sama5 legacy -KERNEL_PATCHVER:=4.9 +KERNEL_PATCHVER:=4.14 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/at91/config-4.9 b/target/linux/at91/config-4.14 similarity index 93% rename from target/linux/at91/config-4.9 rename to target/linux/at91/config-4.14 index ad18d6b826..ca526b9d74 100644 --- a/target/linux/at91/config-4.9 +++ b/target/linux/at91/config-4.14 @@ -1,9 +1,13 @@ 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 @@ -12,6 +16,8 @@ CONFIG_ARCH_MULTIPLATFORM=y CONFIG_ARCH_MULTI_V6_V7=y CONFIG_ARCH_MULTI_V7=y CONFIG_ARCH_NR_GPIO=0 +CONFIG_ARCH_OPTIONAL_KERNEL_RWX=y +CONFIG_ARCH_OPTIONAL_KERNEL_RWX_DEFAULT=y # CONFIG_ARCH_SELECT_MEMORY_MODEL is not set # CONFIG_ARCH_SPARSEMEM_DEFAULT is not set CONFIG_ARCH_SUPPORTS_ATOMIC_RMW=y @@ -38,9 +44,11 @@ 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 @@ -58,12 +66,9 @@ 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_CC_OPTIMIZE_FOR_PERFORMANCE=y -# CONFIG_CC_OPTIMIZE_FOR_SIZE is not set CONFIG_CLKDEV_LOOKUP=y -CONFIG_CLKSRC_OF=y -CONFIG_CLKSRC_PROBE=y CONFIG_CLONE_BACKWARDS=y CONFIG_CMA=y CONFIG_CMA_ALIGNMENT=8 @@ -98,13 +103,16 @@ 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 @@ -149,11 +157,13 @@ 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 @@ -171,6 +181,7 @@ 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 @@ -184,6 +195,7 @@ 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 @@ -196,9 +208,11 @@ 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 @@ -214,13 +228,13 @@ 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_CBPF_JIT=y CONFIG_HAVE_CC_STACKPROTECTOR=y CONFIG_HAVE_CLK=y CONFIG_HAVE_CLK_PREPARE=y @@ -230,6 +244,8 @@ 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 @@ -307,9 +323,11 @@ 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_BOARDINFO=y +CONFIG_MDIO_BUS=y +CONFIG_MDIO_DEVICE=y CONFIG_MEDIA_CAMERA_SUPPORT=y CONFIG_MEDIA_SUPPORT=y CONFIG_MEDIA_USB_SUPPORT=y @@ -318,6 +336,7 @@ 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 @@ -327,9 +346,7 @@ CONFIG_MIGRATION=y CONFIG_MMC=y CONFIG_MMC_ATMELMCI=y CONFIG_MMC_BLOCK=y -# CONFIG_MMC_BLOCK_BOUNCE is not set CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_IO_ACCESSORS=y CONFIG_MMC_SDHCI_OF_AT91=y CONFIG_MMC_SDHCI_PLTFM=y CONFIG_MODULES_USE_ELF_REL=y @@ -411,6 +428,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_REGMAP=y CONFIG_REGMAP_I2C=y @@ -420,7 +438,6 @@ CONFIG_REGULATOR=y CONFIG_REGULATOR_ACT8865=y CONFIG_REGULATOR_ACT8945A=y CONFIG_REGULATOR_FIXED_VOLTAGE=y -CONFIG_RFKILL_REGULATOR=y CONFIG_RTC_CLASS=y CONFIG_RTC_DRV_AT91RM9200=y # CONFIG_RTC_DRV_AT91SAM9 is not set @@ -449,6 +466,7 @@ 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 @@ -470,6 +488,8 @@ 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 @@ -479,6 +499,7 @@ 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 @@ -486,11 +507,14 @@ 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_ATMEL_MXT_T37 is not set CONFIG_TOUCHSCREEN_PROPERTIES=y CONFIG_UACCESS_WITH_MEMCPY=y CONFIG_UBIFS_FS=y @@ -527,6 +551,7 @@ 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 diff --git a/target/linux/at91/legacy/config-default b/target/linux/at91/legacy/config-default index 4f73051f1c..a8923a6efe 100644 --- a/target/linux/at91/legacy/config-default +++ b/target/linux/at91/legacy/config-default @@ -3,6 +3,7 @@ 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_ARM_L1_CACHE_SHIFT=5 # CONFIG_AT91RM9200_WATCHDOG is not set diff --git a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch similarity index 80% rename from target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch rename to target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch index 2a64fb8a5c..c0eb6dafb2 100644 --- a/target/linux/at91/patches-4.9/100-ARM-at91-build-dtb-for-LMU5000.patch +++ b/target/linux/at91/patches-4.14/100-ARM-at91-build-dtb-for-LMU5000.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -32,6 +32,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -33,6 +33,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ usb_a9g20.dtb \ usb_a9g20_lpw.dtb \ at91sam9m10g45ek.dtb \ diff --git a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch similarity index 82% rename from target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch rename to target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch index 1cee5588a0..6c84c9401b 100644 --- a/target/linux/at91/patches-4.9/101-ARM-at91-build-dtb-for-q5xr5.patch +++ b/target/linux/at91/patches-4.14/101-ARM-at91-build-dtb-for-q5xr5.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -40,6 +40,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -41,6 +41,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ at91-ariettag25.dtb \ at91-cosino_mega2560.dtb \ at91-kizboxmini.dtb \ diff --git a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch similarity index 74% rename from target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch rename to target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch index aeb523a5b9..f6190c4959 100644 --- a/target/linux/at91/patches-4.9/102-ARM-at91-build-dtb-for-wb45n.patch +++ b/target/linux/at91/patches-4.14/102-ARM-at91-build-dtb-for-wb45n.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -45,7 +45,8 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -46,7 +46,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-sama5d2_xplained.dtb \ + at91-sama5d27_som1_ek.dtb \ diff --git a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch similarity index 85% rename from target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch rename to target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch index a30a803c98..324017c517 100644 --- a/target/linux/at91/patches-4.9/103-ARM-at91-build-dtb-for-wb50n.patch +++ b/target/linux/at91/patches-4.14/103-ARM-at91-build-dtb-for-wb50n.patch @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -59,7 +59,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ +@@ -63,7 +63,8 @@ dtb-$(CONFIG_SOC_SAM_V7) += \ at91-sama5d4_ma5d4evk.dtb \ at91-sama5d4_xplained.dtb \ at91-sama5d4ek.dtb \ diff --git a/target/linux/at91/patches-4.9/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 similarity index 98% rename from target/linux/at91/patches-4.9/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch rename to target/linux/at91/patches-4.14/105-ARM-at91-build-dtb-for-sama5d2-ptc-Ek.patch index e33840cfd8..b3bede41dc 100644 --- a/target/linux/at91/patches-4.9/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 @@ -1,6 +1,6 @@ --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile -@@ -49,6 +49,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ +@@ -50,6 +50,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ wb45n.dtb dtb-$(CONFIG_SOC_SAM_V7) += \ at91-kizbox2.dtb \ @@ -10,7 +10,7 @@ at91-sama5d3_xplained.dtb \ --- /dev/null +++ b/arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts -@@ -0,0 +1,422 @@ +@@ -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 @@ -316,7 +316,6 @@ + , + ; + bias-pull-up; -+ drive-strength = ; + }; + + ale_cle_rdy_cs { diff --git a/target/linux/at91/patches-4.9/104-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch b/target/linux/at91/patches-4.9/104-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch deleted file mode 100644 index 20c69f39ed..0000000000 --- a/target/linux/at91/patches-4.9/104-ARM-at91-build-dtb-for-sama5d27-SOM1-Ek.patch +++ /dev/null @@ -1,893 +0,0 @@ ---- a/Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt -+++ b/Documentation/devicetree/bindings/pinctrl/atmel,at91-pio4-pinctrl.txt -@@ -35,7 +35,12 @@ right representation of the pin. - Optional properties: - - GENERIC_PINCONFIG: generic pinconfig options to use, bias-disable, - bias-pull-down, bias-pull-up, drive-open-drain, input-schmitt-enable, --input-debounce, output-low, output-high. -+input-debounce, output-low, output-high, drive-strength. -+ -+Concerning the drive-strength property, the values accepted are -+ATMEL_PIO_DRVSTR_LO, ATMEL_PIO_DRVSTR_ME, ATMEL_PIO_DRVSTR_HI. The current -+depends on VDDIOP. You can find the details in the DC Characteristics table -+from the datasheet. - - Example: - ---- a/arch/arm/boot/dts/Makefile -+++ b/arch/arm/boot/dts/Makefile -@@ -49,6 +49,7 @@ dtb-$(CONFIG_SOC_AT91SAM9) += \ - wb45n.dtb - dtb-$(CONFIG_SOC_SAM_V7) += \ - at91-kizbox2.dtb \ -+ at91-sama5d27_som1_ek.dtb \ - at91-sama5d2_xplained.dtb \ - at91-sama5d3_xplained.dtb \ - sama5d31ek.dtb \ ---- /dev/null -+++ b/arch/arm/boot/dts/at91-sama5d27_som1.dtsi -@@ -0,0 +1,175 @@ -+/* -+ * at91-sama5d27_som1.dtsi - Device Tree file for SAMA5D27 SoM1 board -+ * -+ * Copyright (c) 2017, Microchip Technology Inc. -+ * 2017 Cristian Birsan -+ * 2017 Claudiu Beznea -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+#include "sama5d2.dtsi" -+#include "sama5d2-pinfunc.h" -+ -+/ { -+ model = "Atmel SAMA5D27 SoM1"; -+ compatible = "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; -+ -+ clocks { -+ slow_xtal { -+ clock-frequency = <32768>; -+ }; -+ -+ main_xtal { -+ clock-frequency = <24000000>; -+ }; -+ }; -+ -+ ahb { -+ apb { -+ qspi1: spi@f0024000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_qspi1_default>; -+ -+ flash@0 { -+ #address-cells = <1>; -+ #size-cells = <1>; -+ compatible = "jedec,spi-nor"; -+ reg = <0>; -+ spi-max-frequency = <80000000>; -+ m25p,fast-read; -+ -+ at91bootstrap@00000000 { -+ label = "at91bootstrap"; -+ reg = <0x00000000 0x00010000>; -+ }; -+ -+ bootloader@00010000 { -+ label = "bootloader"; -+ reg = <0x00010000 0x000a0000>; -+ }; -+ -+ bootloaderenv@000b0000 { -+ label = "bootloader env"; -+ reg = <0x000b0000 0x00010000>; -+ }; -+ -+ dtb@000c0000 { -+ label = "device tree"; -+ reg = <0x000c0000 0x0020000>; -+ }; -+ -+ kernel@000e0000 { -+ label = "kernel"; -+ reg = <0x000e0000 0x0400000>; -+ }; -+ }; -+ }; -+ -+ macb0: ethernet@f8008000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_macb0_default>; -+ phy-mode = "rmii"; -+ -+ ethernet-phy@0 { -+ reg = <0x0>; -+ interrupt-parent = <&pioA>; -+ interrupts = ; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_macb0_phy_irq>; -+ }; -+ }; -+ -+ i2c0: i2c@f8028000 { -+ dmas = <0>, <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_i2c0_default>; -+ status = "okay"; -+ -+ at24@50 { -+ compatible = "24c02"; -+ reg = <0x50>; -+ pagesize = <8>; -+ }; -+ }; -+ -+ pinctrl@fc038000 { -+ pinctrl_i2c0_default: i2c0_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_qspi1_default: qspi1_default { -+ sck_cs { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ data { -+ pinmux = , -+ , -+ , -+ ; -+ bias-pull-up; -+ }; -+ }; -+ -+ pinctrl_macb0_default: macb0_default { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_macb0_phy_irq: macb0_phy_irq { -+ pinmux = ; -+ bias-disable; -+ }; -+ }; -+ }; -+ }; -+}; ---- /dev/null -+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek.dts -@@ -0,0 +1,53 @@ -+/* -+ * at91-sama5d27_som1_ek.dts - Device Tree file for SAMA5D27-SOM1-EK board -+ * -+ * Copyright (c) 2017, Microchip Technology Inc. -+ * 2016 Nicolas Ferre -+ * 2017 Cristian Birsan -+ * 2017 Claudiu Beznea -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+/dts-v1/; -+#include "at91-sama5d27_som1_ek_common.dtsi" -+ -+/ { -+ model = "Atmel SAMA5D27 SOM1 EK"; -+ compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; -+}; ---- /dev/null -+++ b/arch/arm/boot/dts/at91-sama5d27_som1_ek_common.dtsi -@@ -0,0 +1,619 @@ -+/* -+ * at91-sama5d27_som1_ek_common.dtsi - Device Tree file for SAMA5D27-SOM1-EK board -+ * -+ * Copyright (c) 2017, Microchip Technology Inc. -+ * 2016 Nicolas Ferre -+ * 2017 Cristian Birsan -+ * 2017 Claudiu Beznea -+ * -+ * This file is dual-licensed: you can use it either under the terms -+ * of the GPL or the X11 license, at your option. Note that this dual -+ * licensing only applies to this file, and not this project as a -+ * whole. -+ * -+ * a) This file is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU General Public License as -+ * published by the Free Software Foundation; either version 2 of the -+ * License, or (at your option) any later version. -+ * -+ * This file is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+ * GNU General Public License for more details. -+ * -+ * Or, alternatively, -+ * -+ * b) Permission is hereby granted, free of charge, to any person -+ * obtaining a copy of this software and associated documentation -+ * files (the "Software"), to deal in the Software without -+ * restriction, including without limitation the rights to use, -+ * copy, modify, merge, publish, distribute, sublicense, and/or -+ * sell copies of the Software, and to permit persons to whom the -+ * Software is furnished to do so, subject to the following -+ * conditions: -+ * -+ * The above copyright notice and this permission notice shall be -+ * included in all copies or substantial portions of the Software. -+ * -+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND -+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT -+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, -+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING -+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR -+ * OTHER DEALINGS IN THE SOFTWARE. -+ */ -+#include "at91-sama5d27_som1.dtsi" -+#include -+#include -+#include -+ -+/ { -+ model = "Atmel SAMA5D27 SOM1 EK"; -+ compatible = "atmel,sama5d27-som1-ek", "atmel,sama5d27-som1", "atmel,sama5d27", "atmel,sama5d2", "atmel,sama5"; -+ -+ aliases { -+ serial0 = &uart1; /* DBGU */ -+ serial1 = &uart4; /* mikro BUS 1 */ -+ serial2 = &uart2; /* mikro BUS 2 */ -+ i2c1 = &i2c1; -+ i2c2 = &i2c2; -+ }; -+ -+ chosen { -+ stdout-path = "serial0:115200n8"; -+ }; -+ -+ ahb { -+ usb0: gadget@00300000 { -+ atmel,vbus-gpio = <&pioA PIN_PD20 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_PD20 GPIO_ACTIVE_HIGH */ -+ &pioA PIN_PA27 GPIO_ACTIVE_HIGH -+ 0 -+ >; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_usb_default>; -+ status = "okay"; -+ }; -+ -+ usb2: ehci@00500000 { -+ status = "okay"; -+ }; -+ -+ sdmmc0: sdio-host@a0000000 { -+ bus-width = <8>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_sdmmc0_default>; -+ status = "okay"; -+ }; -+ -+ sdmmc1: sdio-host@b0000000 { -+ bus-width = <4>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_sdmmc1_default>; -+ status = "okay"; -+ }; -+ -+ apb { -+ hlcdc: hlcdc@f0000000 { -+ status = "disabled"; -+ -+ hlcdc-display-controller { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_lcd_base &pinctrl_lcd_rgb>; -+ }; -+ -+ hlcdc_pwm: hlcdc-pwm { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_lcd_pwm>; -+ }; -+ }; -+ -+ 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; -+ }; -+ }; -+ }; -+ -+ isc: isc@f0008000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_isc_base &pinctrl_isc_data_8bit &pinctrl_isc_data_9_10 &pinctrl_isc_data_11_12>; -+ status = "okay"; -+ }; -+ -+ qspi1: spi@f0024000 { -+ status = "okay"; -+ }; -+ -+ spi0: spi@f8000000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_spi0_default>; -+ status = "okay"; -+ }; -+ -+ macb0: ethernet@f8008000 { -+ status = "okay"; -+ }; -+ -+ uart1: serial@f8020000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart1_default>; -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ status = "okay"; -+ }; -+ -+ uart2: serial@f8024000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_mikrobus2_uart>; -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ status = "okay"; -+ }; -+ -+ pwm0: pwm@f802c000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_mikrobus1_pwm &pinctrl_mikrobus2_pwm>; -+ status = "disabled"; /* Conflict with leds. */ -+ }; -+ -+ flx1: flexcom@f8038000 { -+ atmel,flexcom-mode = ; -+ status = "okay"; -+ -+ i2c2: i2c@600 { -+ compatible = "atmel,sama5d2-i2c"; -+ reg = <0x600 0x200>; -+ interrupts = <20 IRQ_TYPE_LEVEL_HIGH 7>; -+ dmas = <0>, <0>; -+ dma-names = "tx", "rx"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clocks = <&flx1_clk>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_mikrobus_i2c>; -+ atmel,fifo-size = <16>; -+ status = "okay"; -+ }; -+ }; -+ -+ shdwc@f8048010 { -+ atmel,shdwc-debouncer = <976>; -+ atmel,wakeup-rtc-timer; -+ -+ input@0 { -+ reg = <0>; -+ atmel,wakeup-type = "low"; -+ }; -+ }; -+ -+ watchdog@f8048040 { -+ status = "okay"; -+ }; -+ -+ uart3: serial@fc008000 { -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_uart3_default>; -+ status = "disabled"; /* Conflict with isc. */ -+ }; -+ -+ uart4: serial@fc00c000 { -+ atmel,use-dma-rx; -+ atmel,use-dma-tx; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_mikrobus1_uart>; -+ status = "okay"; -+ }; -+ -+ flx3: flexcom@fc014000 { -+ atmel,flexcom-mode = ; -+ status = "disabled"; -+ -+ uart7: serial@200 { -+ compatible = "atmel,at91sam9260-usart"; -+ reg = <0x200 0x200>; -+ interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; -+ clocks = <&flx3_clk>; -+ clock-names = "usart"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_flx3_default>; -+ atmel,fifo-size = <32>; -+ status = "disabled"; /* Conflict with isc. */ -+ }; -+ -+ spi2: spi@400 { -+ compatible = "atmel,at91rm9200-spi"; -+ reg = <0x400 0x200>; -+ interrupts = <22 IRQ_TYPE_LEVEL_HIGH 7>; -+ clocks = <&flx3_clk>; -+ clock-names = "spi_clk"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_flx3_default>; -+ atmel,fifo-size = <16>; -+ status = "disabled"; /* Conflict with isc. */ -+ }; -+ }; -+ -+ flx4: flexcom@fc018000 { -+ atmel,flexcom-mode = ; -+ status = "okay"; -+ -+ uart6: serial@200 { -+ compatible = "atmel,at91sam9260-usart"; -+ reg = <0x200 0x200>; -+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; -+ clocks = <&flx4_clk>; -+ clock-names = "usart"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_flx4_default>; -+ atmel,fifo-size = <32>; -+ status = "disabled"; /* Conflict with spi3 and i2c3. */ -+ }; -+ -+ spi3: spi@400 { -+ compatible = "atmel,at91rm9200-spi"; -+ reg = <0x400 0x200>; -+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; -+ clocks = <&flx4_clk>; -+ clock-names = "spi_clk"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_mikrobus_spi &pinctrl_mikrobus1_spi_cs &pinctrl_mikrobus2_spi_cs>; -+ atmel,fifo-size = <16>; -+ status = "okay"; -+ }; -+ -+ i2c3: i2c@600 { -+ compatible = "atmel,sama5d2-i2c"; -+ reg = <0x600 0x200>; -+ interrupts = <23 IRQ_TYPE_LEVEL_HIGH 7>; -+ dmas = <0>, <0>; -+ dma-names = "tx", "rx"; -+ #address-cells = <1>; -+ #size-cells = <0>; -+ clocks = <&flx4_clk>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_flx4_default>; -+ atmel,fifo-size = <16>; -+ status = "disabled"; /* Conflict with uart6 and spi3. */ -+ }; -+ }; -+ -+ i2c1: i2c@fc028000 { -+ dmas = <0>, <0>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_i2c1_default>; -+ status = "okay"; -+ }; -+ -+ pinctrl@fc038000 { -+ -+ pinctrl_lcd_base: pinctrl_lcd_base { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ drive-strength = ; -+ }; -+ -+ pinctrl_lcd_rgb: pinctrl_lcd_rgb { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_lcd_pwm: pinctrl_lcd_pwm { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_can1_default: can1_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_flx3_default: flx3_default { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_i2c1_default: i2c1_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_isc_base: isc_base { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_isc_data_8bit: isc_data_8bit { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_isc_data_9_10: isc_data_9_10 { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_isc_data_11_12: isc_data_11_12 { -+ 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_sdmmc0_default: sdmmc0_default { -+ cmd_data { -+ pinmux = , -+ , -+ , -+ , -+ , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ ck_cd_vddsel { -+ pinmux = , -+ , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_sdmmc1_default: sdmmc1_default { -+ cmd_data { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ conf-ck_cd { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ pinctrl_spi0_default: spi0_default { -+ pinmux = , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_uart1_default: uart1_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_uart3_default: uart3_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_usb_default: usb_default { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_usba_vbus: usba_vbus { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_an: mikrobus1_an { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_an: mikrobus2_an { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_rst: mikrobus1_rst { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_rst: mikrobus2_rst { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_spi_cs: mikrobus1_spi_cs { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_spi_cs: mikrobus2_spi_cs { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus_spi: mikrobus_spi { -+ pinmux = , -+ , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_pwm: mikrobus1_pwm { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_pwm: mikrobus2_pwm { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_int: mikrobus1_int { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_int: mikrobus2_int { -+ pinmux = ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus1_uart: mikrobus1_uart { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus2_uart: mikrobus2_uart { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_mikrobus_i2c: mikrobus1_i2c { -+ pinmux = , -+ ; -+ bias-disable; -+ }; -+ -+ pinctrl_flx4_default: flx4_uart_default { -+ pinmux = , -+ , -+ , -+ , -+ ; -+ bias-disable; -+ }; -+ }; -+ -+ can1: can@fc050000 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_can1_default>; -+ status = "okay"; -+ }; -+ }; -+ }; -+ -+ gpio_keys { -+ compatible = "gpio-keys"; -+ -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_key_gpio_default>; -+ -+ pb4 { -+ label = "USER"; -+ gpios = <&pioA PIN_PA29 GPIO_ACTIVE_LOW>; -+ linux,code = <0x104>; -+ wakeup-source; -+ }; -+ }; -+ -+ leds { -+ compatible = "gpio-leds"; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&pinctrl_led_gpio_default>; -+ status = "okay"; /* Conflict with pwm0. */ -+ -+ red { -+ label = "red"; -+ gpios = <&pioA PIN_PA10 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ green { -+ label = "green"; -+ gpios = <&pioA PIN_PB1 GPIO_ACTIVE_HIGH>; -+ }; -+ -+ blue { -+ label = "blue"; -+ gpios = <&pioA PIN_PA31 GPIO_ACTIVE_HIGH>; -+ linux,default-trigger = "heartbeat"; -+ }; -+ }; -+}; ---- a/include/dt-bindings/pinctrl/at91.h -+++ b/include/dt-bindings/pinctrl/at91.h -@@ -37,4 +37,8 @@ - #define AT91_PERIPH_C 3 - #define AT91_PERIPH_D 4 - -+#define ATMEL_PIO_DRVSTR_LO 1 -+#define ATMEL_PIO_DRVSTR_ME 2 -+#define ATMEL_PIO_DRVSTR_HI 3 -+ - #endif /* __DT_BINDINGS_AT91_PINCTRL_H__ */ diff --git a/target/linux/generic/config-4.14 b/target/linux/generic/config-4.14 index 888401376c..1f09ed3c82 100644 --- a/target/linux/generic/config-4.14 +++ b/target/linux/generic/config-4.14 @@ -900,6 +900,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_DEV_ATMEL_AES is not set +# CONFIG_CRYPTO_DEV_ATMEL_AUTHENC is not set +# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA is not set # CONFIG_CRYPTO_DEV_ATMEL_TDES is not set # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set diff --git a/target/linux/generic/config-4.19 b/target/linux/generic/config-4.19 index de8eb9d53a..fb19363e2e 100644 --- a/target/linux/generic/config-4.19 +++ b/target/linux/generic/config-4.19 @@ -944,6 +944,8 @@ CONFIG_CRYPTO_BLKCIPHER2=y # CONFIG_CRYPTO_DEFLATE is not set # CONFIG_CRYPTO_DES is not set # CONFIG_CRYPTO_DEV_ATMEL_AES is not set +# CONFIG_CRYPTO_DEV_ATMEL_AUTHENC is not set +# CONFIG_CRYPTO_DEV_ATMEL_ECC is not set # CONFIG_CRYPTO_DEV_ATMEL_SHA is not set # CONFIG_CRYPTO_DEV_ATMEL_TDES is not set # CONFIG_CRYPTO_DEV_CAVIUM_ZIP is not set