diff --git a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua index df7e19fc24..f4fbca2381 100644 --- a/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua +++ b/package/lean/luci-app-ssr-plus/root/usr/share/shadowsocksr/gentrojanconfig.lua @@ -21,7 +21,8 @@ local trojan = { verify = false, verify_hostname = (server.tls == "1") and false or true, cert = "", - ciper = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:RSA-AES128-GCM-SHA256:RSA-AES256-GCM-SHA384:RSA-AES128-SHA:RSA-AES256-SHA:RSA-3DES-EDE-SHA", + ciper = "ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES128-SHA:DHE-RSA-AES256-SHA:AES128-SHA:AES256-SHA:DES-CBC3-SHA", + cipher_tls13 = "TLS_AES_128_GCM_SHA256:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_256_GCM_SHA384", sni = server.tls_host, alpn = {"h2", "http/1.1"}, curve = "", diff --git a/package/lean/qBittorrent-Enhanced-Edition/Makefile b/package/lean/qBittorrent-Enhanced-Edition/Makefile index e5c2463a58..86e6026197 100644 --- a/package/lean/qBittorrent-Enhanced-Edition/Makefile +++ b/package/lean/qBittorrent-Enhanced-Edition/Makefile @@ -43,7 +43,7 @@ CONFIGURE_VARS += \ CONFIGURE_ARGS += \ --disable-gui \ --enable-stacktrace=no \ - --with-boost=$(STAGING_DIR)/usr + --with-boost="$(STAGING_DIR)/usr" MAKE_VARS += \ INSTALL_ROOT="$(PKG_INSTALL_DIR)" diff --git a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips index 68c1285eb4..003a4dda7b 100644 --- a/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips +++ b/target/linux/ramips/base-files/lib/preinit/07_set_preinit_iface_ramips @@ -3,54 +3,27 @@ # Copyright (C) 2013 OpenWrt.org # -. /lib/functions.sh - -ramips_switchdev_from_soc() { - # The ethernet switch driver enables VLAN by default, but - # failsafe uses eth0, making the device unreachable: - # https://dev.openwrt.org/ticket/18768 - - local switchdev - local RT3X5X=$(grep -E "(RT3.5|RT5350|MT7628|MT7688|MT7620|MT7621)" /proc/cpuinfo) - - [ -n "$RT3X5X" ] || return 1 - - case "$RT3X5X" in - *MT7620*) - switchdev=mt7620 - ;; - *MT7621*) - switchdev=mt7530 - ;; - *) - switchdev=rt305x - ;; - esac - - echo "$switchdev" -} - -ramips_switchdev_from_board() { - # For these devices, external ethernet switch should be used - # instead of the SoC internal switch. - - local switchdev - local board=$(board_name) - - case "$board" in - esac - - echo "$switchdev" -} - ramips_set_preinit_iface() { - local switchdev=$(ramips_switchdev_from_board) - [ -n "$switchdev" ] || switchdev=$(ramips_switchdev_from_soc) + RT3X5X=$(grep -E "(RT3.5|RT5350|MT7628|MT7688|MT7620|MT7621)" /proc/cpuinfo) - if [ -n "$switchdev" ]; then - swconfig dev $switchdev set reset 1 - swconfig dev $switchdev set enable_vlan 0 - swconfig dev $switchdev set apply 1 + if [ -n "${RT3X5X}" ]; then + # The ethernet switch driver enables VLAN by default, but + # failsafe uses eth0, making the device unreachable: + # https://dev.openwrt.org/ticket/18768 + case "${RT3X5X}" in + *MT7620*) + ralink_switchdev=mt7620 + ;; + *MT7621*) + ralink_switchdev=mt7530 + ;; + *) + ralink_switchdev=rt305x + ;; + esac + swconfig dev $ralink_switchdev set reset 1 + swconfig dev $ralink_switchdev set enable_vlan 0 + swconfig dev $ralink_switchdev set apply 1 fi ifname=eth0 diff --git a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts b/target/linux/ramips/dts/mt7621_netis_wf2881.dts similarity index 82% rename from target/linux/ramips/dts/mt7621_netis_wf-2881.dts rename to target/linux/ramips/dts/mt7621_netis_wf2881.dts index a7e8e06ff2..63a4975dcf 100644 --- a/target/linux/ramips/dts/mt7621_netis_wf-2881.dts +++ b/target/linux/ramips/dts/mt7621_netis_wf2881.dts @@ -6,8 +6,8 @@ #include / { - compatible = "netis,wf-2881", "mediatek,mt7621-soc"; - model = "NETIS WF-2881"; + compatible = "netis,wf2881", "mediatek,mt7621-soc"; + model = "NETIS WF2881"; aliases { led-boot = &led_wps; @@ -25,14 +25,14 @@ compatible = "gpio-leds"; usb { - label = "wf-2881:green:usb"; + label = "wf2881:green:usb"; gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; trigger-sources = <&xhci_ehci_port1>, <&ehci_port2>; linux,default-trigger = "usbport"; }; led_wps: wps { - label = "wf-2881:green:wps"; + label = "wf2881:green:wps"; gpios = <&gpio0 0 GPIO_ACTIVE_LOW>; }; }; @@ -75,9 +75,22 @@ }; partition@140000 { - compatible = "denx,uimage"; label = "firmware"; reg = <0x140000 0x7e40000>; + + compatible = "fixed-partitions"; + #address-cells = <1>; + #size-cells = <1>; + + partition@0 { + label = "kernel"; + reg = <0x0 0x400000>; + }; + + partition@400000 { + label = "ubi"; + reg = <0x400000 0x7a40000>; + }; }; }; }; diff --git a/target/linux/ramips/image/mt7621.mk b/target/linux/ramips/image/mt7621.mk index dbaa5a786c..336b0fdea8 100644 --- a/target/linux/ramips/image/mt7621.mk +++ b/target/linux/ramips/image/mt7621.mk @@ -7,6 +7,21 @@ include ./common-tp-link.mk DEFAULT_SOC := mt7621 KERNEL_DTB += -d21 +DEVICE_VARS += UIMAGE_MAGIC + +# The OEM webinterface expects an kernel with initramfs which has the uImage +# header field ih_name. +# We don't want to set the header name field for the kernel include in the +# sysupgrade image as well, as this image shouldn't be accepted by the OEM +# webinterface. It will soft-brick the board. +define Build/custom-initramfs-uimage + mkimage -A $(LINUX_KARCH) \ + -O linux -T kernel \ + -C lzma -a $(KERNEL_LOADADDR) $(if $(UIMAGE_MAGIC),-M $(UIMAGE_MAGIC),) \ + -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ + -n '$(1)' -d $@ $@.new + mv $@.new $@ +endef define Build/elecom-gst-factory $(eval product=$(word 1,$(1))) @@ -74,19 +89,6 @@ define Build/ubnt-erx-factory-image fi endef -# The OEM webinterface expects an kernel with initramfs which has the uImage -# header field ih_name. -# We don't wan't to set the header name field for the kernel include in the -# sysupgrade image as well, as this image shouldn't be accepted by the OEM -# webinterface. It will soft-brick the board. -define Build/wr1201-factory-header - mkimage -A $(LINUX_KARCH) \ - -O linux -T kernel \ - -C lzma -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ - -n 'WR1201_8_128' -d $@ $@.new - mv $@.new $@ -endef - define Device/afoundry_ew1200 IMAGE_SIZE := 16064k DEVICE_VENDOR := AFOUNDRY @@ -466,7 +468,7 @@ define Device/mtc_wr1201 IMAGE_SIZE := 16000k DEVICE_VENDOR := MTC DEVICE_MODEL := Wireless Router WR1201 - KERNEL_INITRAMFS := $(KERNEL_DTB) | wr1201-factory-header + KERNEL_INITRAMFS := $(KERNEL_DTB) | custom-initramfs-uimage WR1201_8_128 DEVICE_PACKAGES := kmod-sdhci-mt7620 kmod-mt76x2 kmod-usb3 \ kmod-usb-ledtrig-usbport wpad-openssl endef @@ -586,21 +588,24 @@ define Device/netgear_wndr3700-v5 endef TARGET_DEVICES += netgear_wndr3700-v5 -define Device/netis_wf-2881 +define Device/netis_wf2881 BLOCKSIZE := 128k PAGESIZE := 2048 FILESYSTEMS := squashfs + KERNEL_SIZE := 4096k IMAGE_SIZE := 129280k KERNEL := $(KERNEL_DTB) | pad-offset $$(BLOCKSIZE) 64 | uImage lzma UBINIZE_OPTS := -E 5 - IMAGE/sysupgrade.bin := append-kernel | append-ubi | append-metadata | \ + IMAGES += factory.bin + IMAGE/sysupgrade.bin := sysupgrade-tar | append-metadata + IMAGE/factory.bin := append-kernel | pad-to $$$$(KERNEL_SIZE) | append-ubi | \ check-size $$$$(IMAGE_SIZE) DEVICE_VENDOR := NETIS - DEVICE_MODEL := WF-2881 + DEVICE_MODEL := WF2881 DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport wpad-openssl SUPPORTED_DEVICES += wf-2881 endef -TARGET_DEVICES += netis_wf-2881 +TARGET_DEVICES += netis_wf2881 define Device/phicomm_k2p IMAGE_SIZE := 15744k diff --git a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network index 4e38e9df36..f53c8f11ea 100755 --- a/target/linux/ramips/mt7621/base-files/etc/board.d/02_network +++ b/target/linux/ramips/mt7621/base-files/etc/board.d/02_network @@ -48,7 +48,7 @@ ramips_setup_interfaces() netgear,r6800|\ netgear,r6850|\ netgear,wndr3700-v5|\ - netis,wf-2881|\ + netis,wf2881|\ wevo,11acnas|\ wevo,w2914ns-v2|\ zio,freezio) @@ -184,7 +184,7 @@ ramips_setup_macs() elecom,wrc-1900gst|\ elecom,wrc-2533gst|\ lenovo,newifi-d1|\ - netis,wf-2881|\ + netis,wf2881|\ phicomm,k2p|\ planex,vr500|\ samknows,whitebox-v8|\ diff --git a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh index 5c6863b1e6..ff19577bb3 100755 --- a/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/mt7621/base-files/lib/upgrade/platform.sh @@ -50,6 +50,7 @@ platform_do_upgrade() { netgear,r6350|\ netgear,r6800|\ netgear,r6850|\ + netis,wf2881|\ xiaomi,mir3g|\ xiaomi,mir3p) nand_do_upgrade "$1" diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile index 8d09d4e939..e1630fb441 100644 --- a/target/linux/sunxi/Makefile +++ b/target/linux/sunxi/Makefile @@ -9,12 +9,12 @@ include $(TOPDIR)/rules.mk ARCH:=arm BOARD:=sunxi -BOARDNAME:=Allwinner A1x/A20/A3x +BOARDNAME:=Allwinner A1x/A20/A3x/R40 FEATURES:=fpu usb ext4 display rtc squashfs SUBTARGETS:=cortexa8 cortexa7 cortexa53 MAINTAINER:=Zoltan HERPAI -KERNEL_PATCHVER:=4.14 +KERNEL_PATCHVER:=4.19 KERNELNAME:=zImage dtbs # A10: Cortex-A8 @@ -23,6 +23,7 @@ KERNELNAME:=zImage dtbs # A31: quad Cortex-A7 # A80: octa Cortex-A15/A7 # H3: quad Cortex-A7 +# R40: quad Cortex-A7 include $(INCLUDE_DIR)/target.mk diff --git a/target/linux/sunxi/config-4.14 b/target/linux/sunxi/config-4.14 index d7d9f60a6d..6e19f1599b 100644 --- a/target/linux/sunxi/config-4.14 +++ b/target/linux/sunxi/config-4.14 @@ -65,7 +65,6 @@ CONFIG_AXP20X_POWER=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_PWM=y -CONFIG_BINFMT_MISC=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_SCSI_REQUEST=y @@ -328,8 +327,6 @@ CONFIG_KVM_VFIO=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_LEDS_GPIO=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LIBFDT=y CONFIG_LOCK_SPIN_ON_OWNER=y CONFIG_LOGO=y diff --git a/target/linux/sunxi/config-4.19 b/target/linux/sunxi/config-4.19 index c684c04e17..9f3930303b 100644 --- a/target/linux/sunxi/config-4.19 +++ b/target/linux/sunxi/config-4.19 @@ -73,7 +73,6 @@ CONFIG_AXP20X_POWER=y CONFIG_BACKLIGHT_CLASS_DEVICE=y CONFIG_BACKLIGHT_LCD_SUPPORT=y CONFIG_BACKLIGHT_PWM=y -CONFIG_BINFMT_MISC=y CONFIG_BLK_DEV_LOOP=y CONFIG_BLK_DEV_SD=y CONFIG_BLK_SCSI_REQUEST=y @@ -211,6 +210,7 @@ CONFIG_GENERIC_EARLY_IOREMAP=y CONFIG_GENERIC_IDLE_POLL_SETUP=y CONFIG_GENERIC_IRQ_CHIP=y CONFIG_GENERIC_IRQ_EFFECTIVE_AFF_MASK=y +CONFIG_GENERIC_IRQ_MIGRATION=y CONFIG_GENERIC_IRQ_MULTI_HANDLER=y CONFIG_GENERIC_IRQ_SHOW=y CONFIG_GENERIC_IRQ_SHOW_LEVEL=y @@ -334,8 +334,6 @@ CONFIG_KVM_VFIO=y CONFIG_LCD_CLASS_DEVICE=y CONFIG_LCD_PLATFORM=y CONFIG_LEDS_GPIO=y -CONFIG_LEGACY_PTYS=y -CONFIG_LEGACY_PTY_COUNT=256 CONFIG_LIBFDT=y CONFIG_LOCK_DEBUGGING_SUPPORT=y CONFIG_LOCK_SPIN_ON_OWNER=y @@ -371,14 +369,11 @@ CONFIG_MMC_SUNXI=y CONFIG_MMU_NOTIFIER=y CONFIG_MODULES_TREE_LOOKUP=y CONFIG_MODULES_USE_ELF_REL=y -CONFIG_MTD=y -CONFIG_MTD_SPLIT_SUPPORT=y -CONFIG_MTD_SPLIT_FIT_FW=y -CONFIG_MTD_OF_PARTS=y -CONFIG_MTD_JEDECPROBE=y # CONFIG_MTD_IMPA7 is not set +CONFIG_MTD_JEDECPROBE=y CONFIG_MTD_M25P80=y CONFIG_MTD_SPI_NOR=y +CONFIG_MTD_SPLIT_FIT_FW=y CONFIG_MUTEX_SPIN_ON_OWNER=y CONFIG_NEED_DMA_MAP_STATE=y CONFIG_NEON=y @@ -518,6 +513,7 @@ CONFIG_SOUND_OSS_CORE=y CONFIG_SPARSE_IRQ=y CONFIG_SPI=y CONFIG_SPI_MASTER=y +CONFIG_SPI_MEM=y CONFIG_SPI_SUN4I=y CONFIG_SPI_SUN6I=y CONFIG_SRCU=y diff --git a/target/linux/sunxi/cortexa53/config-4.14 b/target/linux/sunxi/cortexa53/config-4.14 index b46c4aa414..1ba379ea65 100644 --- a/target/linux/sunxi/cortexa53/config-4.14 +++ b/target/linux/sunxi/cortexa53/config-4.14 @@ -35,7 +35,6 @@ CONFIG_ARM64_PAGE_SHIFT=12 # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set CONFIG_ARM64_SSBD=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_UAO is not set CONFIG_ARM64_VA_BITS=39 CONFIG_ARM64_VA_BITS_39=y @@ -45,7 +44,6 @@ CONFIG_ARM_AMBA=y CONFIG_ARM_GIC_V3=y # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -# CONFIG_COMPAT is not set CONFIG_DWMAC_SUN8I=y CONFIG_FRAME_POINTER=y CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y diff --git a/target/linux/sunxi/cortexa53/config-4.19 b/target/linux/sunxi/cortexa53/config-4.19 index a35c84b905..67ff2c2633 100644 --- a/target/linux/sunxi/cortexa53/config-4.19 +++ b/target/linux/sunxi/cortexa53/config-4.19 @@ -37,7 +37,6 @@ CONFIG_ARM64_PA_BITS_48=y # CONFIG_ARM64_PTDUMP_DEBUGFS is not set # CONFIG_ARM64_RANDOMIZE_TEXT_OFFSET is not set CONFIG_ARM64_SSBD=y -# CONFIG_ARM64_SW_TTBR0_PAN is not set # CONFIG_ARM64_UAO is not set CONFIG_ARM64_VA_BITS=39 CONFIG_ARM64_VA_BITS_39=y @@ -46,7 +45,6 @@ CONFIG_ARM64_VA_BITS_39=y CONFIG_ARM_AMBA=y # CONFIG_ARM_SP805_WATCHDOG is not set CONFIG_AUDIT_ARCH_COMPAT_GENERIC=y -# CONFIG_COMPAT is not set CONFIG_DMA_DIRECT_OPS=y CONFIG_DWMAC_SUN8I=y # CONFIG_FLATMEM_MANUAL is not set diff --git a/target/linux/sunxi/cortexa7/config-4.14 b/target/linux/sunxi/cortexa7/config-4.14 index ee8873e081..f0b6a7a861 100644 --- a/target/linux/sunxi/cortexa7/config-4.14 +++ b/target/linux/sunxi/cortexa7/config-4.14 @@ -3,7 +3,7 @@ CONFIG_HARDEN_BRANCH_PREDICTOR=y # CONFIG_MACH_SUN4I is not set # CONFIG_MACH_SUN5I is not set # CONFIG_PINCTRL_GR8 is not set -# CONFIG_PINCTRL_SUN4I_A10 is not set +CONFIG_PINCTRL_SUN4I_A10=y # CONFIG_PINCTRL_SUN5I_A10S is not set # CONFIG_PINCTRL_SUN5I_A13 is not set CONFIG_MDIO_BUS_MUX=y diff --git a/target/linux/sunxi/cortexa7/target.mk b/target/linux/sunxi/cortexa7/target.mk index 16aa9f7d0a..b6bdd483bb 100644 --- a/target/linux/sunxi/cortexa7/target.mk +++ b/target/linux/sunxi/cortexa7/target.mk @@ -7,6 +7,6 @@ include $(TOPDIR)/rules.mk -BOARDNAME:=Allwinner A20/A3x +BOARDNAME:=Allwinner A20/A3x/R40 CPU_TYPE:=cortex-a7 CPU_SUBTYPE:=neon-vfpv4 diff --git a/target/linux/sunxi/image/Makefile b/target/linux/sunxi/image/Makefile index 8f95c61906..705d409ac5 100644 --- a/target/linux/sunxi/image/Makefile +++ b/target/linux/sunxi/image/Makefile @@ -32,15 +32,26 @@ endef # why \x00\x00\x00\x00 for zImage-initramfs define Device/Default PROFILES := Default - DEVICE_VARS := SUNXI_DTS SUNXI_UBOOT + DEVICE_VARS := SUNXI_DTS SUNXI_DTS_DIR SUNXI_UBOOT KERNEL_NAME := zImage KERNEL := kernel-bin | uImage none IMAGES := sdcard.img.gz IMAGE/sdcard.img.gz := sunxi-sdcard | append-metadata | gzip + SUPPORTED_DEVICES := $(subst _,$(comma),$(1)) + SUNXI_DTS_DIR := + SUNXI_DTS = $$(SUNXI_DTS_DIR)$$(SOC)-$(lastword $(subst _, ,$(1))) endef +ifeq ($(SUBTARGET),cortexa7) include cortex-a7.mk +endif + +ifeq ($(SUBTARGET),cortexa8) include cortex-a8.mk +endif + +ifeq ($(SUBTARGET),cortexa53) include cortex-a53.mk +endif $(eval $(call BuildImage)) diff --git a/target/linux/sunxi/image/cortex-a53.mk b/target/linux/sunxi/image/cortex-a53.mk index 566f48b0f7..4f69b20449 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -5,25 +5,28 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa53) -define Device/sun50i-h5-nanopi-neo-plus2 - DEVICE_TITLE:=Nanopi NEO Plus2 (H5) +define Device/friendlyarm_nanopi-neo-plus2 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO Plus2 SUPPORTED_DEVICES:=nanopi-neo-plus2 - SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo-plus2 + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef +TARGET_DEVICES += friendlyarm_nanopi-neo-plus2 -TARGET_DEVICES += sun50i-h5-nanopi-neo-plus2 - -define Device/sun50i-h5-nanopi-neo2 - DEVICE_TITLE:=Nanopi NEO2 (H5) +define Device/friendlyarm_nanopi-neo2 + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO2 SUPPORTED_DEVICES:=nanopi-neo2 - SUNXI_DTS:=allwinner/sun50i-h5-nanopi-neo2 + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef +TARGET_DEVICES += friendlyarm_nanopi-neo2 TARGET_DEVICES += sun50i-h5-nanopi-neo2 @@ -48,38 +51,34 @@ define Device/sun50i-a64-pine64-plus KERNEL_NAME := Image KERNEL := kernel-bin endef +TARGET_DEVICES += pine64_pine64-plus -TARGET_DEVICES += sun50i-a64-pine64-plus - -define Device/sun50i-a64-sopine-baseboard - DEVICE_TITLE:=Pine64 Sopine - SUPPORTED_DEVICES:=pine64,sopine-baseboard - SUNXI_DTS:=allwinner/sun50i-a64-sopine-baseboard +define Device/pine64_sopine-baseboard + DEVICE_VENDOR := Pine64 + DEVICE_MODEL := SoPine + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-a64 KERNEL_NAME := Image KERNEL := kernel-bin endef +TARGET_DEVICES += pine64_sopine-baseboard -TARGET_DEVICES += sun50i-a64-sopine-baseboard - - -define Device/sun50i-h5-orangepi-zero-plus - DEVICE_TITLE:=Xunlong Orange Pi Zero Plus - SUPPORTED_DEVICES:=xunlong,orangepi-zero-plus - SUNXI_DTS:=allwinner/sun50i-h5-orangepi-zero-plus +define Device/xunlong_orangepi-pc2 + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi PC 2 + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef +TARGET_DEVICES += xunlong_orangepi-pc2 -TARGET_DEVICES += sun50i-h5-orangepi-zero-plus - -define Device/sun50i-h5-orangepi-pc2 - DEVICE_TITLE:=Xunlong Orange Pi PC2 - SUPPORTED_DEVICES:=xunlong,orangepi-pc2 - SUNXI_DTS:=allwinner/sun50i-h5-orangepi-pc2 +define Device/xunlong_orangepi-zero-plus + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi Zero Plus + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-h5 KERNEL_NAME := Image KERNEL := kernel-bin endef - -TARGET_DEVICES += sun50i-h5-orangepi-pc2 - -endif +TARGET_DEVICES += xunlong_orangepi-zero-plus diff --git a/target/linux/sunxi/image/cortex-a7.mk b/target/linux/sunxi/image/cortex-a7.mk index 0791145842..6481bfe058 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -6,155 +6,137 @@ # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa7) - -define Device/sun7i-a20-olinuxino-lime - DEVICE_TITLE:=Olimex A20-OLinuXino-LIME - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi - SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime - SUNXI_DTS:=sun7i-a20-olinuxino-lime -endef - -TARGET_DEVICES += sun7i-a20-olinuxino-lime - - -define Device/sun7i-a20-olinuxino-lime2 - DEVICE_TITLE:=Olimex A20-OLinuXino-LIME2 - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid - SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime2 - SUNXI_DTS:=sun7i-a20-olinuxino-lime2 -endef - -TARGET_DEVICES += sun7i-a20-olinuxino-lime2 - - -define Device/sun7i-a20-olinuxino-lime2-emmc - DEVICE_TITLE:=Olimex A20-OLinuXino-LIME2-eMMC - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid - SUPPORTED_DEVICES:=olimex,a20-olinuxino-lime2-emmc - SUNXI_DTS:=sun7i-a20-olinuxino-lime2-emmc -endef - -TARGET_DEVICES += sun7i-a20-olinuxino-lime2-emmc - - -define Device/sun7i-a20-olinuxino-micro - DEVICE_TITLE:=Olimex A20-Olinuxino Micro +define Device/cubietech_cubieboard2 + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubieboard2 DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUPPORTED_DEVICES:=olimex,a20-olinuxino-micro - SUNXI_DTS:=sun7i-a20-olinuxino-micro + SOC := sun7i-a20 endef +TARGET_DEVICES += cubietech_cubieboard2 -TARGET_DEVICES += sun7i-a20-olinuxino-micro - - -define Device/sun7i-a20-bananapi - DEVICE_TITLE:=LeMaker Banana Pi - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi - SUPPORTED_DEVICES:=lemaker,bananapi - SUNXI_DTS:=sun7i-a20-bananapi -endef - -TARGET_DEVICES += sun7i-a20-bananapi - - -define Device/sun7i-a20-bananapro - DEVICE_TITLE:=LeMaker Banana Pro - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac - SUPPORTED_DEVICES:=lemaker,bananapro - SUNXI_DTS:=sun7i-a20-bananapro -endef - -TARGET_DEVICES += sun7i-a20-bananapro - - -define Device/sun7i-a20-cubieboard2 - DEVICE_TITLE:=Cubietech Cubieboard2 - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUPPORTED_DEVICES:=cubietech,cubieboard2 - SUNXI_DTS:=sun7i-a20-cubieboard2 -endef - -TARGET_DEVICES += sun7i-a20-cubieboard2 - - -define Device/sun7i-a20-cubietruck - DEVICE_TITLE:=Cubietech Cubietruck +define Device/cubietech_cubietruck + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubietruck DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-brcmfmac - SUPPORTED_DEVICES:=cubietech,cubietruck - SUNXI_DTS:=sun7i-a20-cubietruck + SOC := sun7i-a20 endef +TARGET_DEVICES += cubietech_cubietruck -TARGET_DEVICES += sun7i-a20-cubietruck - - -define Device/sun7i-a20-lamobo-r1 - DEVICE_TITLE:=Lamobo R1 - DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic - SUPPORTED_DEVICES:=lamobo,lamobo-r1 - SUNXI_DTS:=sun7i-a20-lamobo-r1 -endef - -TARGET_DEVICES += sun7i-a20-lamobo-r1 - - -define Device/sun6i-a31-m9 - DEVICE_TITLE:=Mele M9 top set box - DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SUPPORTED_DEVICES:=mele,m9 - SUNXI_DTS:=sun6i-a31-m9 -endef - -TARGET_DEVICES += sun6i-a31-m9 - - -define Device/sun8i-h2-plus-orangepi-zero - DEVICE_TITLE:=Xunlong Orange Pi Zero - DEVICE_PACKAGES:=kmod-rtc-sunxi - SUPPORTED_DEVICES:=xunlong,orangepi-zero - SUNXI_DTS:=sun8i-h2-plus-orangepi-zero -endef - -TARGET_DEVICES += sun8i-h2-plus-orangepi-zero - - -define Device/sun8i-h2-plus-orangepi-r1 - DEVICE_TITLE:=Xunlong Orange Pi R1 - DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 - SUPPORTED_DEVICES:=xunlong,orangepi-r1 - SUNXI_DTS:=sun8i-h2-plus-orangepi-r1 -endef - -TARGET_DEVICES += sun8i-h2-plus-orangepi-r1 - -define Device/sun8i-h3-bananapi-m2-plus - DEVICE_TITLE:=Sinovoip Banana Pi M2 Plus - DEVICE_PACKAGES:=kmod-rtc-sunxi \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ - kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic - SUPPORTED_DEVICES:=sinovoip,bananapi-m2-plus - SUNXI_DTS:=sun8i-h3-bananapi-m2-plus -endef - -TARGET_DEVICES += sun8i-h3-bananapi-m2-plus - -define Device/sun8i-h3-nanopi-m1-plus - DEVICE_TITLE:=FriendlyArm NanoPi M1 Plus - DEVICE_PACKAGES:=kmod-rtc-sunxi \ - kmod-leds-gpio kmod-ledtrig-heartbeat \ +define Device/friendlyarm_nanopi-m1-plus + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi M1 Plus + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic - SUPPORTED_DEVICES:=friendlyarm,nanopi-m1-plus - SUNXI_DTS:=sun8i-h3-nanopi-m1-plus + SOC := sun8i-h3 endef +TARGET_DEVICES += friendlyarm_nanopi-m1-plus -TARGET_DEVICES += sun8i-h3-nanopi-m1-plus - - -define Device/sun8i-h3-nanopi-neo - DEVICE_TITLE:=FriendlyARM NanoPi NEO - SUPPORTED_DEVICES:=friendlyarm,nanopi-neo - SUNXI_DTS:=sun8i-h3-nanopi-neo +define Device/friendlyarm_nanopi-neo + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO + SOC := sun8i-h3 endef +TARGET_DEVICES += friendlyarm_nanopi-neo + +define Device/friendlyarm_nanopi-neo-air + DEVICE_VENDOR := FriendlyARM + DEVICE_MODEL := NanoPi NEO Air + DEVICE_PACKAGES := kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-brcmfmac brcmfmac-firmware-43430-sdio wpad-basic + SOC := sun8i-h3 +endef +TARGET_DEVICES += friendlyarm_nanopi-neo-air + +define Device/lamobo_lamobo-r1 + DEVICE_VENDOR := Lamobo + DEVICE_MODEL := Lamobo R1 + DEVICE_PACKAGES:=kmod-ata-sunxi kmod-rtl8192cu swconfig wpad-basic + SOC := sun7i-a20 +endef +TARGET_DEVICES += lamobo_lamobo-r1 + +define Device/lemaker_bananapi + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pi + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi + SOC := sun7i-a20 +endef +TARGET_DEVICES += lemaker_bananapi + +define Device/lemaker_bananapi-m2-ultra + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pi M2 Ultra + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi + SOC := sun8i-r40 +endef +TARGET_DEVICES += lemaker_bananapi-m2-ultra + +define Device/lemaker_bananapro + DEVICE_VENDOR := LeMaker + DEVICE_MODEL := Banana Pro + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-brcmfmac + SOC := sun7i-a20 +endef +TARGET_DEVICES += lemaker_bananapro + +define Device/linksprite_pcduino3 + DEVICE_VENDOR := LinkSprite + DEVICE_MODEL := pcDuino3 + DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi \ + kmod-rtl8xxxu rtl8188eu-firmware + SOC := sun7i-a20 +endef +TARGET_DEVICES += linksprite_pcduino3 + +define Device/mele_m9 + DEVICE_VENDOR := Mele + DEVICE_MODEL := M9 + DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu + SOC := sun6i-a31 +endef +TARGET_DEVICES += mele_m9 + +define Device/olimex_a20-olinuxino-lime + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A20-OLinuXino-LIME + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi + SOC := sun7i +endef +TARGET_DEVICES += olimex_a20-olinuxino-lime + +define Device/olimex_a20-olinuxino-lime2 + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A20-OLinuXino-LIME2 + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid + SOC := sun7i +endef +TARGET_DEVICES += olimex_a20-olinuxino-lime2 + +define Device/olimex_a20-olinuxino-lime2-emmc + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A20-OLinuXino-LIME2 + DEVICE_VARIANT := eMMC + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-rtc-sunxi kmod-usb-hid + SOC := sun7i +endef +TARGET_DEVICES += olimex_a20-olinuxino-lime2-emmc + +define Device/olimex_a20-olinuxino-micro + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A20-OLinuXino-MICRO + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi + SOC := sun7i +endef +TARGET_DEVICES += olimex_a20-olinuxino-micro + +define Device/sinovoip_bananapi-m2-plus + DEVICE_VENDOR := Sinovoip + DEVICE_MODEL := Banana Pi M2+ + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-leds-gpio kmod-ledtrig-heartbeat \ + kmod-brcmfmac brcmfmac-firmware-43430a0-sdio wpad-basic + SOC := sun8i-h3 +endef +TARGET_DEVICES += sinovoip_bananapi-m2-plus TARGET_DEVICES += sun8i-h3-nanopi-neo @@ -183,60 +165,59 @@ TARGET_DEVICES += sun8i-h3-nanopi-r1 define Device/sun8i-h3-orangepi-one DEVICE_TITLE:=Xunlong Orange Pi One DEVICE_PACKAGES:=kmod-rtc-sunxi - SUPPORTED_DEVICES:=xunlong,orangepi-one - SUNXI_DTS:=sun8i-h3-orangepi-one + SOC := sun8i-h3 endef +TARGET_DEVICES += xunlong_orangepi-one -TARGET_DEVICES += sun8i-h3-orangepi-one - - -define Device/sun8i-h3-orangepi-pc - DEVICE_TITLE:=Xunlong Orange Pi PC +define Device/xunlong_orangepi-pc + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi PC DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug - SUPPORTED_DEVICES:=xunlong,orangepi-pc - SUNXI_DTS:=sun8i-h3-orangepi-pc + SOC := sun8i-h3 endef +TARGET_DEVICES += xunlong_orangepi-pc -TARGET_DEVICES += sun8i-h3-orangepi-pc - - -define Device/sun8i-h3-orangepi-pc-plus - DEVICE_TITLE:=Xunlong Orange Pi PC Plus +define Device/xunlong_orangepi-pc-plus + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi PC Plus DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-gpio-button-hotplug - SUPPORTED_DEVICES:=xunlong,orangepi-pc-plus - SUNXI_DTS:=sun8i-h3-orangepi-pc-plus + SOC := sun8i-h3 endef +TARGET_DEVICES += xunlong_orangepi-pc-plus -TARGET_DEVICES += sun8i-h3-orangepi-pc-plus - - -define Device/sun8i-h3-orangepi-plus - DEVICE_TITLE:=Xunlong Orange Pi Plus +define Device/xunlong_orangepi-plus + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi Plus DEVICE_PACKAGES:=kmod-rtc-sunxi - SUPPORTED_DEVICES:=xunlong,orangepi-plus - SUNXI_DTS:=sun8i-h3-orangepi-plus + SOC := sun8i-h3 endef +TARGET_DEVICES += xunlong_orangepi-plus -TARGET_DEVICES += sun8i-h3-orangepi-plus +define Device/xunlong_orangepi-r1 + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi R1 + DEVICE_PACKAGES:=kmod-rtc-sunxi kmod-usb-net kmod-usb-net-rtl8152 + SOC := sun8i-h2-plus +endef +TARGET_DEVICES += xunlong_orangepi-r1 -define Device/sun8i-h3-orangepi-2 - DEVICE_TITLE:=Xunlong Orange Pi 2 +define Device/xunlong_orangepi-zero + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi Zero DEVICE_PACKAGES:=kmod-rtc-sunxi - SUPPORTED_DEVICES:=xunlong,orangepi-2 - SUNXI_DTS:=sun8i-h3-orangepi-2 + SOC := sun8i-h2-plus endef +TARGET_DEVICES += xunlong_orangepi-zero -TARGET_DEVICES += sun8i-h3-orangepi-2 - - -define Device/sun7i-a20-pcduino3 - DEVICE_TITLE:=LinkSprite pcDuino3 - DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-ata-core kmod-ata-sunxi kmod-rtl8xxxu rtl8188eu-firmware - SUPPORTED_DEVICES:=linksprite,pcduino3 - SUNXI_DTS:=sun7i-a20-pcduino3 +define Device/xunlong_orangepi-2 + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := Orange Pi 2 + DEVICE_PACKAGES:=kmod-rtc-sunxi + SOC := sun8i-h3 endef TARGET_DEVICES += sun7i-a20-pcduino3 endif + diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index 564a66f938..de10d5d6cc 100644 --- a/target/linux/sunxi/image/cortex-a8.mk +++ b/target/linux/sunxi/image/cortex-a8.mk @@ -5,65 +5,54 @@ # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. # -ifeq ($(SUBTARGET),cortexa8) -define Device/sun4i-a10-olinuxino-lime - DEVICE_TITLE:=Olimex A10-OLinuXino-LIME +define Device/cubietech_a10-cubieboard + DEVICE_VENDOR := Cubietech + DEVICE_MODEL := Cubieboard DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUPPORTED_DEVICES:=olimex,a10-olinuxino-lime - SUNXI_DTS:=sun4i-a10-olinuxino-lime + SOC := sun4i endef +TARGET_DEVICES += cubietech_a10-cubieboard -TARGET_DEVICES += sun4i-a10-olinuxino-lime - - -define Device/sun5i-a13-olimex-som - DEVICE_TITLE:=Olimex A13 SOM - DEVICE_PACKAGES:=kmod-rtl8192cu - SUPPORTED_DEVICES:=olimex,a13-olinuxino - SUNXI_DTS:=sun5i-a13-olinuxino -endef - -TARGET_DEVICES += sun5i-a13-olimex-som - - -define Device/sun5i-a13-olinuxino - DEVICE_TITLE:=Olimex A13-Olinuxino - DEVICE_PACKAGES:=kmod-rtl8192cu - SUPPORTED_DEVICES:=olimex,a13-olinuxino - SUNXI_DTS:=sun5i-a13-olinuxino -endef - -TARGET_DEVICES += sun5i-a13-olinuxino - - -define Device/sun4i-a10-cubieboard - DEVICE_TITLE:=Cubietech Cubieboard - DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi - SUPPORTED_DEVICES:=cubietech,a10-cubieboard - SUNXI_DTS:=sun4i-a10-cubieboard -endef - -TARGET_DEVICES += sun4i-a10-cubieboard - - -define Device/sun4i-a10-pcduino - DEVICE_TITLE:=LinkSprite pcDuino +define Device/linksprite_a10-pcduino + DEVICE_VENDOR := LinkSprite + DEVICE_MODEL := pcDuino DEVICE_PACKAGES:=kmod-sun4i-emac kmod-rtc-sunxi kmod-rtl8192cu - SUPPORTED_DEVICES:=linksprite,a10-pcduino - SUNXI_DTS:=sun4i-a10-pcduino + SOC := sun4i endef +TARGET_DEVICES += linksprite_a10-pcduino -TARGET_DEVICES += sun4i-a10-pcduino - - -define Device/sun4i-a10-marsboard - DEVICE_TITLE:=HAOYU Electronics Marsboard A10 - DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi sound-soc-sunxi - SUPPORTED_DEVICES:=marsboard,a10-marsboard - SUNXI_DTS:=sun4i-a10-marsboard +define Device/marsboard_a10-marsboard + DEVICE_VENDOR := HAOYU Electronics + DEVICE_MODEL := MarsBoard A10 + DEVICE_PACKAGES:=mod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi \ + sound-soc-sunxi + SOC := sun4i endef +TARGET_DEVICES += marsboard_a10-marsboard -TARGET_DEVICES += sun4i-a10-marsboard +define Device/olimex_a10-olinuxino-lime + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A10-OLinuXino-LIME + DEVICE_PACKAGES:=kmod-ata-core kmod-ata-sunxi kmod-sun4i-emac kmod-rtc-sunxi + SOC := sun4i +endef +TARGET_DEVICES += olimex_a10-olinuxino-lime -endif +define Device/olimex_a13-olimex-som + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A13-SOM + DEVICE_PACKAGES:=kmod-rtl8192cu + SUPPORTED_DEVICES:=olimex,a13-olinuxino + SOC := sun5i-a13 + SUNXI_DTS := sun5i-a13-olinuxino +endef +TARGET_DEVICES += olimex_a13-olimex-som + +define Device/olimex_a13-olinuxino + DEVICE_VENDOR := Olimex + DEVICE_MODEL := A13-OLinuXino + DEVICE_PACKAGES:=kmod-rtl8192cu + SOC := sun5i +endef +TARGET_DEVICES += olimex_a13-olinuxino diff --git a/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh b/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh index bb89e3a0fc..7dc22761dd 100755 --- a/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh +++ b/target/linux/sunxi/image/gen_sunxi_sdcard_img.sh @@ -1,4 +1,4 @@ -#!/usr/bin/env bash +#!/bin/sh # # Copyright (C) 2013 OpenWrt.org # @@ -22,7 +22,7 @@ UBOOT="$6" head=4 sect=63 -set `ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M` +set $(ptgen -o $OUTPUT -h $head -s $sect -l 1024 -t c -p ${BOOTFSSIZE}M -t 83 -p ${ROOTFSSIZE}M) BOOTOFFSET="$(($1 / 512))" BOOTSIZE="$(($2 / 512))" diff --git a/target/linux/x86/64/config-4.19 b/target/linux/x86/64/config-4.19 index 4748e6befa..18979a085d 100644 --- a/target/linux/x86/64/config-4.19 +++ b/target/linux/x86/64/config-4.19 @@ -395,6 +395,7 @@ CONFIG_X86_AMD_FREQ_SENSITIVITY=y CONFIG_X86_CMOV=y CONFIG_X86_CPUID=y CONFIG_X86_DEBUGCTLMSR=y +CONFIG_X86_DECODER_SELFTEST=n CONFIG_X86_DEV_DMA_OPS=y CONFIG_X86_DIRECT_GBPAGES=y CONFIG_X86_INTEL_LPSS=y diff --git a/target/linux/x86/config-4.19 b/target/linux/x86/config-4.19 index 8d0276d8a6..0f5d3d062d 100644 --- a/target/linux/x86/config-4.19 +++ b/target/linux/x86/config-4.19 @@ -552,6 +552,7 @@ CONFIG_X86_CMPXCHG64=y # CONFIG_X86_CPUFREQ_NFORCE2 is not set # CONFIG_X86_CPUID is not set # CONFIG_X86_DEBUG_FPU is not set +CONFIG_X86_DECODER_SELFTEST=n # CONFIG_X86_EXTENDED_PLATFORM is not set # CONFIG_X86_E_POWERSAVER is not set CONFIG_X86_F00F_BUG=y