diff options
Diffstat (limited to 'target/arm')
| -rw-r--r-- | target/arm/Makefile | 14 | ||||
| -rw-r--r-- | target/arm/uclibc-ng-nommu.config | 2 | ||||
| -rw-r--r-- | target/arm/uclibc-ng.config | 4 |
3 files changed, 14 insertions, 6 deletions
diff --git a/target/arm/Makefile b/target/arm/Makefile index e5c7a3a6d..d6dab6af0 100644 --- a/target/arm/Makefile +++ b/target/arm/Makefile @@ -175,7 +175,7 @@ ifeq ($(ADK_TARGET_FS),squashfs) dd conv=notrunc if=$(BUILD_DIR)/root.squashfs of=$(FW_DIR)/$(ROOTFSSQUASHFS) endif -ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6),y) +ifeq ($(ADK_TARGET_LINUX_KERNEL_VERSION_6_6)$(ADK_TARGET_LINUX_KERNEL_VERSION_6_9),y) ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_VERSATILEPB),y) VENDOR:=arm/ endif @@ -188,6 +188,12 @@ endif ifeq ($(ADK_TARGET_SYSTEM_QEMU_ARM_XILINX_ZYNQ),y) VENDOR:=xilinx/ endif +ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) +VENDOR:=st/ +endif +ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) +VENDOR:=nxp/imx/ +endif endif dtb-install: @@ -237,8 +243,8 @@ ifeq ($(ADK_TARGET_SYSTEM_BANANA_P2_ZERO),y) ${KERNEL_MAKE} sun8i-h2-plus-bananapi-m2-zero.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_IMX6),y) - ${KERNEL_MAKE} imx6q-cubox-i.dtb imx6dl-cubox-i.dtb \ - imx6dl-hummingboard.dtb imx6q-hummingboard.dtb $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)imx6q-cubox-i.dtb $(VENDOR)imx6dl-cubox-i.dtb \ + $(VENDOR)imx6dl-hummingboard.dtb $(VENDOR)imx6q-hummingboard.dtb $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG),y) ${KERNEL_MAKE} armada-388-clearfog.dtb $(MAKE_TRACE) @@ -250,7 +256,7 @@ ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F769),y) ${KERNEL_MAKE} dtbs $(MAKE_TRACE) endif ifeq ($(ADK_TARGET_SYSTEM_ST_STM32F746G),y) - ${KERNEL_MAKE} dtbs $(MAKE_TRACE) + ${KERNEL_MAKE} $(VENDOR)stm32f746-disco.dtb $(MAKE_TRACE) endif for x in $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb; do \ [[ -e "$$x" ]] && cp $(LINUX_DIR)/arch/arm/boot/dts/$(VENDOR)*.dtb $(FW_DIR); \ diff --git a/target/arm/uclibc-ng-nommu.config b/target/arm/uclibc-ng-nommu.config index 45db787b4..ada9e4bb6 100644 --- a/target/arm/uclibc-ng-nommu.config +++ b/target/arm/uclibc-ng-nommu.config @@ -78,7 +78,7 @@ UCLIBC_CTOR_DTOR=y HAS_NO_THREADS=y # UCLIBC_HAS_LINUXTHREADS is not set # UCLIBC_HAS_THREADS_NATIVE is not set -PTHREADS_STACK_DEFAULT_SIZE=2097152 +PTHREADS_STACK_DEFAULT_SIZE=16384 UCLIBC_HAS_SYSLOG=y UCLIBC_HAS_LFS=y MALLOC=y diff --git a/target/arm/uclibc-ng.config b/target/arm/uclibc-ng.config index 1febdc74d..64accdcd0 100644 --- a/target/arm/uclibc-ng.config +++ b/target/arm/uclibc-ng.config @@ -1,6 +1,6 @@ # # Automatically generated file; DO NOT EDIT. -# uClibc-ng 1.0.45 C Library Configuration +# uClibc-ng 1.0.47 C Library Configuration # # TARGET_aarch64 is not set # TARGET_alpha is not set @@ -80,6 +80,8 @@ LDSO_PRELOAD_FILE_SUPPORT=y LDSO_BASE_FILENAME="ld.so" # LDSO_STANDALONE_SUPPORT is not set # LDSO_PRELINK_SUPPORT is not set +ARCH_VDSO_SUPPORT=y +VDSO_SUPPORT=y # UCLIBC_STATIC_LDCONFIG is not set LDSO_RUNPATH=y LDSO_RUNPATH_OF_EXECUTABLE=y |