From: Sandeep Sheriker M Date: Tue, 28 May 2019 17:21:10 +0000 (-0700) Subject: at91:renaming subtraget legacy to sam9x X-Git-Tag: v19.07.0-rc1~553 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a765a2178cae2e39b7384149486b819cedf87603;p=oweals%2Fopenwrt.git at91:renaming subtraget legacy to sam9x renaming subtraget legacy to sam9x for adding new sam9 soc's Signed-off-by: Sandeep Sheriker M --- diff --git a/package/boot/uboot-at91/Makefile b/package/boot/uboot-at91/Makefile index 23bd2d2b01..a3262b5cd4 100644 --- a/package/boot/uboot-at91/Makefile +++ b/package/boot/uboot-at91/Makefile @@ -26,13 +26,13 @@ endef define U-Boot/at91sam9m10g45ek_nandflash NAME:=AT91SAM9M10G45-EK board (NandFlash) - BUILD_SUBTARGET:=legacy + BUILD_SUBTARGET:=sam9x BUILD_DEVICES:=at91sam9m10g45ek endef define U-Boot/at91sam9x5ek_nandflash NAME:=AT91SAM9X5-EK board (NandFlash) - BUILD_SUBTARGET:=legacy + BUILD_SUBTARGET:=sam9x BUILD_DEVICES:=at91sam9g15ek at91sam9g25ek \ at91sam9g35ek at91sam9x25ek \ at91sam9x35ek diff --git a/target/linux/at91/Makefile b/target/linux/at91/Makefile index 4dc70ebac1..6c1ba11c55 100644 --- a/target/linux/at91/Makefile +++ b/target/linux/at91/Makefile @@ -8,10 +8,11 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=at91 -MAINTAINER:=Claudio Mignanti +MAINTAINER:=Claudio Mignanti \ + Sandeep Sheriker BOARDNAME:=Microchip (Atmel AT91) FEATURES:=ext4 squashfs targz usb usbgadget ubifs -SUBTARGETS:=sama5 legacy +SUBTARGETS:=sama5 sam9x KERNEL_PATCHVER:=4.14 diff --git a/target/linux/at91/image/Makefile b/target/linux/at91/image/Makefile index f4d942b682..e4c17e3a3c 100644 --- a/target/linux/at91/image/Makefile +++ b/target/linux/at91/image/Makefile @@ -13,8 +13,8 @@ define Build/at91-install-zImage $(CP) $(KDIR)/zImage $@ endef -ifeq ($(SUBTARGET),legacy) -include ./legacy.mk +ifeq ($(SUBTARGET),sam9x) +include ./sam9x.mk endif ifeq ($(SUBTARGET),sama5) include ./sama5.mk diff --git a/target/linux/at91/image/legacy.mk b/target/linux/at91/image/legacy.mk deleted file mode 100644 index ae3c163d94..0000000000 --- a/target/linux/at91/image/legacy.mk +++ /dev/null @@ -1,133 +0,0 @@ -define Device/default-nand - BLOCKSIZE := 128k - PAGESIZE := 2048 - SUBPAGESIZE := 512 - MKUBIFS_OPTS := -m $$(PAGESIZE) -e 126KiB -c 2048 -endef - -define Device/at91sam9263ek - $(Device/evaluation-dtb) - DEVICE_TITLE := Atmel AT91SAM9263-EK -endef -TARGET_DEVICES += at91sam9263ek - -define Device/at91sam9g15ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9G15-EK -endef -TARGET_DEVICES += at91sam9g15ek - -define Device/at91sam9g20ek - $(Device/evaluation-dtb) - DEVICE_TITLE := Atmel AT91SAM9G20-EK -endef -TARGET_DEVICES += at91sam9g20ek - -define Device/at91sam9g20ek_2mmc - $(Device/evaluation-dtb) - DEVICE_TITLE := Atmel AT91SAM9G20-EK 2MMC -endef -TARGET_DEVICES += at91sam9g20ek_2mmc - -define Device/at91sam9g25ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9G25-EK -endef -TARGET_DEVICES += at91sam9g25ek - -define Device/at91sam9g35ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9G35-EK -endef -TARGET_DEVICES += at91sam9g35ek - -define Device/at91sam9m10g45ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9M10G45-EK -endef -TARGET_DEVICES += at91sam9m10g45ek - -define Device/at91sam9x25ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9X25-EK -endef -TARGET_DEVICES += at91sam9x25ek - -define Device/at91sam9x35ek - $(Device/evaluation) - DEVICE_TITLE := Atmel AT91SAM9X35-EK -endef -TARGET_DEVICES += at91sam9x35ek - -define Device/lmu5000 - $(Device/production) - DEVICE_TITLE := CalAmp 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 - -define Device/tny_a9260 - $(Device/production-dtb) - DEVICE_TITLE := Calao TNYA9260 -endef -TARGET_DEVICES += tny_a9260 - -define Device/tny_a9263 - $(Device/production-dtb) - DEVICE_TITLE := Calao TNYA9263 -endef -TARGET_DEVICES += tny_a9263 - -define Device/tny_a9g20 - $(Device/production-dtb) - DEVICE_TITLE := Calao TNYA9G20 -endef -TARGET_DEVICES += tny_a9g20 - -define Device/usb_a9260 - $(Device/production-dtb) - DEVICE_TITLE := Calao USBA9260 -endef -TARGET_DEVICES += usb_a9260 - -define Device/usb_a9263 - $(Device/production-dtb) - DEVICE_TITLE := Calao USBA9263 -endef -TARGET_DEVICES += usb_a9263 - -define Device/usb_a9g20 - $(Device/production-dtb) - DEVICE_TITLE := Calao USBA9G20 -endef -TARGET_DEVICES += usb_a9g20 - -define Device/ethernut5 - $(Device/evaluation) - DEVICE_TITLE := Ethernut 5 - UBINIZE_OPTS := -E 5 -endef -TARGET_DEVICES += ethernut5 - -define Device/at91-q5xr5 - $(Device/production-dtb) - DEVICE_TITLE := Exegin Q5XR5 - KERNEL_SIZE := 2048k -endef -#TARGET_DEVICES += at91-q5xr5 - -define Device/wb45n - $(Device/evaluation-fit) - DEVICE_TITLE := Laird WB45N - 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 += wb45n - diff --git a/target/linux/at91/image/sam9x.mk b/target/linux/at91/image/sam9x.mk new file mode 100644 index 0000000000..3aada4c72b --- /dev/null +++ b/target/linux/at91/image/sam9x.mk @@ -0,0 +1,132 @@ +define Device/default-nand + BLOCKSIZE := 128k + PAGESIZE := 2048 + SUBPAGESIZE := 512 + MKUBIFS_OPTS := -m $$(PAGESIZE) -e 126KiB -c 2048 +endef + +define Device/at91sam9263ek + $(Device/evaluation-dtb) + DEVICE_TITLE := Atmel AT91SAM9263-EK +endef +TARGET_DEVICES += at91sam9263ek + +define Device/at91sam9g15ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9G15-EK +endef +TARGET_DEVICES += at91sam9g15ek + +define Device/at91sam9g20ek + $(Device/evaluation-dtb) + DEVICE_TITLE := Atmel AT91SAM9G20-EK +endef +TARGET_DEVICES += at91sam9g20ek + +define Device/at91sam9g20ek_2mmc + $(Device/evaluation-dtb) + DEVICE_TITLE := Atmel AT91SAM9G20-EK 2MMC +endef +TARGET_DEVICES += at91sam9g20ek_2mmc + +define Device/at91sam9g25ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9G25-EK +endef +TARGET_DEVICES += at91sam9g25ek + +define Device/at91sam9g35ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9G35-EK +endef +TARGET_DEVICES += at91sam9g35ek + +define Device/at91sam9m10g45ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9M10G45-EK +endef +TARGET_DEVICES += at91sam9m10g45ek + +define Device/at91sam9x25ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9X25-EK +endef +TARGET_DEVICES += at91sam9x25ek + +define Device/at91sam9x35ek + $(Device/evaluation) + DEVICE_TITLE := Atmel AT91SAM9X35-EK +endef +TARGET_DEVICES += at91sam9x35ek + +define Device/lmu5000 + $(Device/production) + DEVICE_TITLE := CalAmp 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 + +define Device/tny_a9260 + $(Device/production-dtb) + DEVICE_TITLE := Calao TNYA9260 +endef +TARGET_DEVICES += tny_a9260 + +define Device/tny_a9263 + $(Device/production-dtb) + DEVICE_TITLE := Calao TNYA9263 +endef +TARGET_DEVICES += tny_a9263 + +define Device/tny_a9g20 + $(Device/production-dtb) + DEVICE_TITLE := Calao TNYA9G20 +endef +TARGET_DEVICES += tny_a9g20 + +define Device/usb_a9260 + $(Device/production-dtb) + DEVICE_TITLE := Calao USBA9260 +endef +TARGET_DEVICES += usb_a9260 + +define Device/usb_a9263 + $(Device/production-dtb) + DEVICE_TITLE := Calao USBA9263 +endef +TARGET_DEVICES += usb_a9263 + +define Device/usb_a9g20 + $(Device/production-dtb) + DEVICE_TITLE := Calao USBA9G20 +endef +TARGET_DEVICES += usb_a9g20 + +define Device/ethernut5 + $(Device/evaluation) + DEVICE_TITLE := Ethernut 5 + UBINIZE_OPTS := -E 5 +endef +TARGET_DEVICES += ethernut5 + +define Device/at91-q5xr5 + $(Device/production-dtb) + DEVICE_TITLE := Exegin Q5XR5 + KERNEL_SIZE := 2048k +endef +#TARGET_DEVICES += at91-q5xr5 + +define Device/wb45n + $(Device/evaluation-fit) + DEVICE_TITLE := Laird WB45N + 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 += wb45n diff --git a/target/linux/at91/legacy/config-default b/target/linux/at91/legacy/config-default deleted file mode 100644 index a8923a6efe..0000000000 --- a/target/linux/at91/legacy/config-default +++ /dev/null @@ -1,64 +0,0 @@ -# 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_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_BACKLIGHT_ATMEL_LCDC=y -# CONFIG_CACHE_L2X0 is not set -CONFIG_CMA_DEBUGFS=y -CONFIG_CPU_32v4T=y -CONFIG_CPU_32v5=y -CONFIG_CPU_ABRT_EV4T=y -CONFIG_CPU_ABRT_EV5TJ=y -CONFIG_CPU_ARM920T=y -CONFIG_CPU_ARM926T=y -# CONFIG_CPU_CACHE_ROUND_ROBIN is not set -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 -CONFIG_CPU_USE_DOMAINS=y -CONFIG_CRC7=y -CONFIG_CRC_CCITT=y -CONFIG_CRC_ITU_T=y -CONFIG_DEBUG_INFO=y -CONFIG_FB_ATMEL=y -CONFIG_FB_BACKLIGHT=y -CONFIG_FB_MODE_HELPERS=y -CONFIG_GENERIC_ATOMIC64=y -# CONFIG_HAVE_ARCH_BITREVERSE is not set -CONFIG_HZ=128 -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_SPI=y -# CONFIG_MTD_SPI_NOR is not set -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_SPLIT_PTLOCK_CPUS=999999 -CONFIG_TOUCHSCREEN_ADS7846=y -# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set diff --git a/target/linux/at91/legacy/target.mk b/target/linux/at91/legacy/target.mk deleted file mode 100644 index a3d99bbfb2..0000000000 --- a/target/linux/at91/legacy/target.mk +++ /dev/null @@ -1,7 +0,0 @@ -BOARDNAME:=Legacy (ARMv5) -CPU_TYPE:=arm926ej-s - -define Target/Description - Build generic firmware for legacy Atmel AT91 platforms - using the ARMv5 instruction set. -endef diff --git a/target/linux/at91/sam9x/config-default b/target/linux/at91/sam9x/config-default new file mode 100644 index 0000000000..a8923a6efe --- /dev/null +++ b/target/linux/at91/sam9x/config-default @@ -0,0 +1,64 @@ +# 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_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_BACKLIGHT_ATMEL_LCDC=y +# CONFIG_CACHE_L2X0 is not set +CONFIG_CMA_DEBUGFS=y +CONFIG_CPU_32v4T=y +CONFIG_CPU_32v5=y +CONFIG_CPU_ABRT_EV4T=y +CONFIG_CPU_ABRT_EV5TJ=y +CONFIG_CPU_ARM920T=y +CONFIG_CPU_ARM926T=y +# CONFIG_CPU_CACHE_ROUND_ROBIN is not set +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 +CONFIG_CPU_USE_DOMAINS=y +CONFIG_CRC7=y +CONFIG_CRC_CCITT=y +CONFIG_CRC_ITU_T=y +CONFIG_DEBUG_INFO=y +CONFIG_FB_ATMEL=y +CONFIG_FB_BACKLIGHT=y +CONFIG_FB_MODE_HELPERS=y +CONFIG_GENERIC_ATOMIC64=y +# CONFIG_HAVE_ARCH_BITREVERSE is not set +CONFIG_HZ=128 +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_SPI=y +# CONFIG_MTD_SPI_NOR is not set +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_SPLIT_PTLOCK_CPUS=999999 +CONFIG_TOUCHSCREEN_ADS7846=y +# CONFIG_TOUCHSCREEN_ATMEL_MXT is not set diff --git a/target/linux/at91/sam9x/target.mk b/target/linux/at91/sam9x/target.mk new file mode 100644 index 0000000000..f6da7c003c --- /dev/null +++ b/target/linux/at91/sam9x/target.mk @@ -0,0 +1,7 @@ +BOARDNAME:= SAM9X Boards (ARMv5) +CPU_TYPE:=arm926ej-s + +define Target/Description + Build generic firmware for Microchip AT91 SAM9x platforms + using the ARMv5 instruction set. +endef