From 7133ea672bffe04d1621da3d7fbe4f13f9c3252c Mon Sep 17 00:00:00 2001 From: AmadeusGhost <42570690+AmadeusGhost@users.noreply.github.com> Date: Sat, 8 Feb 2020 17:16:54 +0800 Subject: [PATCH] sunxi: switch to kernel 4.19 (#2976) --- target/linux/sunxi/Makefile | 5 +- target/linux/sunxi/config-4.14 | 3 - target/linux/sunxi/config-4.19 | 12 +- target/linux/sunxi/cortexa53/config-4.14 | 2 - target/linux/sunxi/cortexa53/config-4.19 | 2 - target/linux/sunxi/cortexa7/config-4.14 | 2 +- target/linux/sunxi/cortexa7/target.mk | 2 +- target/linux/sunxi/image/Makefile | 13 +- target/linux/sunxi/image/cortex-a53.mk | 74 ++-- target/linux/sunxi/image/cortex-a7.mk | 339 ++++++++---------- target/linux/sunxi/image/cortex-a8.mk | 93 +++-- .../linux/sunxi/image/gen_sunxi_sdcard_img.sh | 4 +- 12 files changed, 257 insertions(+), 294 deletions(-) diff --git a/target/linux/sunxi/Makefile b/target/linux/sunxi/Makefile index 8d09d4e93..e1630fb44 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 d7d9f60a6..6e19f1599 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 c684c04e1..9f3930303 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 b46c4aa41..1ba379ea6 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 a35c84b90..67ff2c263 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 ee8873e08..f0b6a7a86 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 16aa9f7d0..b6bdd483b 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 8f95c6190..705d409ac 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 65551407c..eeaaa887d 100644 --- a/target/linux/sunxi/image/cortex-a53.mk +++ b/target/linux/sunxi/image/cortex-a53.mk @@ -5,67 +5,65 @@ # 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 - -define Device/sun50i-a64-pine64-plus - DEVICE_TITLE:=Pine64 Plus A64 - SUPPORTED_DEVICES:=pine64,pine64-plus - SUNXI_DTS:=allwinner/sun50i-a64-pine64-plus +define Device/pine64_pine64-plus + DEVICE_VENDOR := Pine64 + DEVICE_MODEL := Pine64+ + SUNXI_DTS_DIR := allwinner/ + SOC := sun50i-a64 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 ce0cbe5a5..cc67f4dd6 100644 --- a/target/linux/sunxi/image/cortex-a7.mk +++ b/target/linux/sunxi/image/cortex-a7.mk @@ -6,215 +6,190 @@ # 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 -TARGET_DEVICES += sun8i-h3-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/sun8i-h3-orangepi-one - DEVICE_TITLE:=Xunlong Orange Pi One +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 + +define Device/xunlong_orangepi-one + DEVICE_VENDOR := Xunlong + DEVICE_MODEL := 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 +TARGET_DEVICES += xunlong_orangepi-2 diff --git a/target/linux/sunxi/image/cortex-a8.mk b/target/linux/sunxi/image/cortex-a8.mk index 564a66f93..de10d5d6c 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 bb89e3a0f..7dc22761d 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))"