diff options
-rw-r--r-- | mk/linux-ver.mk | 4 | ||||
-rw-r--r-- | package/u-boot/Makefile | 11 | ||||
-rw-r--r-- | target/arm/kernel/pcduino-3b | 8 | ||||
-rw-r--r-- | target/arm/systems/pcduino-3b | 20 | ||||
-rw-r--r-- | target/linux/Config.in.kernelversion | 2 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/arc.patch (renamed from target/linux/patches/4.19.126/arc.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/darwin-dtc.patch | 26 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/darwin-file2alias.patch (renamed from target/linux/patches/4.19.126/darwin-file2alias.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/fec-coldfire.patch (renamed from target/linux/patches/4.19.126/fec-coldfire.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/or1k-more-ram.patch (renamed from target/linux/patches/4.19.126/or1k-more-ram.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/relocs.patch (renamed from target/linux/patches/4.19.126/relocs.patch) | 0 | ||||
-rw-r--r-- | target/linux/patches/4.19.132/startup.patch (renamed from target/linux/patches/4.19.126/startup.patch) | 0 |
12 files changed, 64 insertions, 7 deletions
diff --git a/mk/linux-ver.mk b/mk/linux-ver.mk index 227346a3c..7d73cd7cb 100644 --- a/mk/linux-ver.mk +++ b/mk/linux-ver.mk @@ -22,10 +22,10 @@ KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) KERNEL_HASH:= 4e431b7c0266a07b76fdb77f8917ad681f0fa34ffba0eb8a172b67f7ef57bc31 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_19),y) -KERNEL_FILE_VER:= 4.19.126 +KERNEL_FILE_VER:= 4.19.132 KERNEL_RELEASE:= 1 KERNEL_VERSION:= $(KERNEL_FILE_VER)-$(KERNEL_RELEASE) -KERNEL_HASH:= 6e2a7e0adbe31e39cc8f1a3bd7bfa0d92ec0a4ca5360bb25829db831378f3f89 +KERNEL_HASH:= d7d7ee94962ce4cc070e8db7f7f3755cbef122a3fd77c436d5381a61819a7d44 endif ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_4_14),y) KERNEL_FILE_VER:= 4.14.168 diff --git a/package/u-boot/Makefile b/package/u-boot/Makefile index b793e8540..04103bbe2 100644 --- a/package/u-boot/Makefile +++ b/package/u-boot/Makefile @@ -4,19 +4,19 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= u-boot -PKG_VERSION:= 2019.10 +PKG_VERSION:= 2020.07 PKG_RELEASE:= 1 -PKG_HASH:= 8d6d6070739522dd236cba7055b8736bfe92b4fac0ea18ad809829ca79667014 +PKG_HASH:= c1f5bf9ee6bb6e648edbf19ce2ca9452f614b08a9f886f1a566aa42e8cf05f6a PKG_DESCR:= portable bootloader PKG_SECTION:= base/boot HOST_BUILDDEP:= libressl-host dtc-host -PKG_BUILDDEP:= u-boot-host +PKG_BUILDDEP:= python3-host swig-host u-boot-host PKG_URL:= http://www.denx.de/wiki/U-Boot PKG_SITES:= ftp://ftp.denx.de/pub/u-boot/ DISTFILES:= $(PKG_NAME)-$(PKG_VERSION).tar.bz2 -PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 +PKG_SYSTEM_DEPENDS:= beaglebone-black orange-pi0 raspberry-pi raspberry-pi2 raspberry-pi3 banana-pro solidrun-imx6 solidrun-clearfog raspberry-pi3-64 raspberry-pi3p raspberry-pi3p-64 phytec-imx6 pcduino-3b include $(ADK_TOPDIR)/mk/host.mk include $(ADK_TOPDIR)/mk/package.mk @@ -37,6 +37,9 @@ ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) CONFIG:= mx6cuboxi_defconfig UBOOT:= u-boot.img endif +ifeq ($(ADK_TARGET_SYSTEM_PCDUINO_3B),y) +CONFIG:= Linksprite_pcDuino3_defconfig +endif ifeq ($(ADK_TARGET_SYSTEM_RASPBERRY_PI),y) CONFIG:= rpi_defconfig endif diff --git a/target/arm/kernel/pcduino-3b b/target/arm/kernel/pcduino-3b new file mode 100644 index 000000000..56e9cdb8f --- /dev/null +++ b/target/arm/kernel/pcduino-3b @@ -0,0 +1,8 @@ +CONFIG_ARM=y +CONFIG_ARM_PATCH_PHYS_VIRT=y +CONFIG_MMU=y +CONFIG_ARCH_MULTIPLATFORM=y +CONFIG_ARCH_MULTI_V7=y +CONFIG_ARCH_MULTI_V6_V7=y +CONFIG_ARCH_SUNXI=y +CONFIG_MACH_SUN7I=y diff --git a/target/arm/systems/pcduino-3b b/target/arm/systems/pcduino-3b new file mode 100644 index 000000000..71763d2e1 --- /dev/null +++ b/target/arm/systems/pcduino-3b @@ -0,0 +1,20 @@ +config ADK_TARGET_SYSTEM_PCDUINO_3B + bool "PCduino 3b" + depends on ADK_TARGET_OS_LINUX + select ADK_TARGET_LITTLE_ENDIAN + select ADK_TARGET_WITH_MMU + select ADK_TARGET_CPU_ARM_CORTEX_A7 + select ADK_TARGET_WITH_VGA + select ADK_TARGET_WITH_SERIAL + select ADK_TARGET_WITH_USB + select ADK_TARGET_WITH_INPUT + select ADK_TARGET_WITH_SD + select ADK_TARGET_WITH_NET + select ADK_TARGET_WITH_NETDEVICE + select ADK_TARGET_WITH_BLOCK + select ADK_TARGET_KERNEL_IMAGE + select ADK_PACKAGE_U_BOOT + help + PCduino 3b + + diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index 0bf3b3c42..1061f74bb 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -51,7 +51,7 @@ config ADK_TARGET_LINUX_KERNEL_VERSION_5_4 depends on !ADK_TARGET_CPU_ARM_CORTEX_A53 config ADK_TARGET_LINUX_KERNEL_VERSION_4_19 - bool "4.19.126" + bool "4.19.132" select ADK_TARGET_LINUX_KERNEL_NEW depends on !ADK_TARGET_ARCH_AVR32 depends on !ADK_TARGET_ARCH_BFIN diff --git a/target/linux/patches/4.19.126/arc.patch b/target/linux/patches/4.19.132/arc.patch index 20810ce64..20810ce64 100644 --- a/target/linux/patches/4.19.126/arc.patch +++ b/target/linux/patches/4.19.132/arc.patch diff --git a/target/linux/patches/4.19.132/darwin-dtc.patch b/target/linux/patches/4.19.132/darwin-dtc.patch new file mode 100644 index 000000000..0cdc23ab4 --- /dev/null +++ b/target/linux/patches/4.19.132/darwin-dtc.patch @@ -0,0 +1,26 @@ +diff -Nur linux-4.19.132.orig/scripts/dtc/dtc.h linux-4.19.132/scripts/dtc/dtc.h +--- linux-4.19.132.orig/scripts/dtc/dtc.h 2020-07-09 09:37:13.000000000 +0200 ++++ linux-4.19.132/scripts/dtc/dtc.h 2020-07-15 02:38:00.000000000 +0200 +@@ -33,8 +33,8 @@ + #include <unistd.h> + #include <inttypes.h> + +-#include <libfdt_env.h> +-#include <fdt.h> ++#include "libfdt/libfdt_env.h" ++#include "libfdt/fdt.h" + + #include "util.h" + +diff -Nur linux-4.19.132.orig/scripts/dtc/util.c linux-4.19.132/scripts/dtc/util.c +--- linux-4.19.132.orig/scripts/dtc/util.c 2020-07-09 09:37:13.000000000 +0200 ++++ linux-4.19.132/scripts/dtc/util.c 2020-07-15 02:38:18.000000000 +0200 +@@ -32,7 +32,7 @@ + #include <fcntl.h> + #include <unistd.h> + +-#include "libfdt.h" ++#include "libfdt/libfdt.h" + #include "util.h" + #include "version_gen.h" + diff --git a/target/linux/patches/4.19.126/darwin-file2alias.patch b/target/linux/patches/4.19.132/darwin-file2alias.patch index fdbc598a8..fdbc598a8 100644 --- a/target/linux/patches/4.19.126/darwin-file2alias.patch +++ b/target/linux/patches/4.19.132/darwin-file2alias.patch diff --git a/target/linux/patches/4.19.126/fec-coldfire.patch b/target/linux/patches/4.19.132/fec-coldfire.patch index 09d8ad047..09d8ad047 100644 --- a/target/linux/patches/4.19.126/fec-coldfire.patch +++ b/target/linux/patches/4.19.132/fec-coldfire.patch diff --git a/target/linux/patches/4.19.126/or1k-more-ram.patch b/target/linux/patches/4.19.132/or1k-more-ram.patch index de848c838..de848c838 100644 --- a/target/linux/patches/4.19.126/or1k-more-ram.patch +++ b/target/linux/patches/4.19.132/or1k-more-ram.patch diff --git a/target/linux/patches/4.19.126/relocs.patch b/target/linux/patches/4.19.132/relocs.patch index 5bcd974c7..5bcd974c7 100644 --- a/target/linux/patches/4.19.126/relocs.patch +++ b/target/linux/patches/4.19.132/relocs.patch diff --git a/target/linux/patches/4.19.126/startup.patch b/target/linux/patches/4.19.132/startup.patch index dd27de856..dd27de856 100644 --- a/target/linux/patches/4.19.126/startup.patch +++ b/target/linux/patches/4.19.132/startup.patch |