diff options
| -rw-r--r-- | package/xkeyboard-config/Makefile | 2 | ||||
| -rw-r--r-- | target/aarch64/Makefile | 8 | ||||
| -rw-r--r-- | target/linux/Config.in.kernelversion | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/package/xkeyboard-config/Makefile b/package/xkeyboard-config/Makefile index e9fe7babf..182812e57 100644 --- a/package/xkeyboard-config/Makefile +++ b/package/xkeyboard-config/Makefile @@ -9,7 +9,7 @@ PKG_RELEASE:= 1 PKG_HASH:= eb1383a5ac4b6210d7c7302b9d6fab052abdf51c5d2c9b55f1f779997ba68c6c PKG_DESCR:= keyboard config PKG_SECTION:= x11/misc -PKG_BUILDDEP:= util-macros-host xkbcomp +PKG_BUILDDEP:= util-macros-host xkbcomp meson-host PKG_SITES:= http://www.x.org/releases/individual/data/xkeyboard-config/ include $(ADK_TOPDIR)/mk/package.mk diff --git a/target/aarch64/Makefile b/target/aarch64/Makefile index 81d0ff4d8..9c765aeb3 100644 --- a/target/aarch64/Makefile +++ b/target/aarch64/Makefile @@ -66,12 +66,20 @@ ifeq ($(ADK_TARGET_QEMU),y) @echo 'qemu-system-${ADK_TARGET_CPU_ARCH} ${QEMU_ARGS} -kernel $(FW_DIR)/$(TARGET_KERNEL)' endif endif +ifeq ($(ADK_TARGET_FS),nfsroot) +targethelp: + @echo 'The kernel file is: $(FW_DIR)/${TARGET_KERNEL}' + @echo "The RootFS tarball is: $(FW_DIR)/$(ROOTFSUSERTARBALL)" +endif ifeq ($(ADK_TARGET_FS),genimage) targethelp: @echo "The disk image is: $(FW_DIR)/sdcard.img" @echo "Use following command to install it on SD card:" @echo 'sudo dd if=$(FW_DIR)/sdcard.img of=/dev/sdX bs=2048k' endif +ifeq ($(ADK_TARGET_FS),nfsroot) +imageinstall: kernel-install $(FW_DIR)/$(ROOTFSUSERTARBALL) targethelp +endif kernel-strip: @cp $(KERNEL) $(BUILD_DIR)/$(TARGET_KERNEL) diff --git a/target/linux/Config.in.kernelversion b/target/linux/Config.in.kernelversion index ae0bb4d95..8f65156c3 100644 --- a/target/linux/Config.in.kernelversion +++ b/target/linux/Config.in.kernelversion @@ -219,7 +219,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "b02c139d3608c8ae87f5398a3a29854f6df7a041" if ADK_TARGET_ARCH_KVX default "6a2f2e4198eaff63ee75f6085ce9f966c47b4441" if ADK_TARGET_ARCH_LM32 - default "b6bfece0d9ddf21e1526fead81340ef02f98f6ad" if ADK_TARGET_BOARD_BCM28XX + default "e01f00b8f84cb017d4e7581b8ef24e78a1ceba09" if ADK_TARGET_BOARD_BCM28XX default "f8d3b2a0fa5054aaed0f14cd457db9d8922bb167" if ADK_TARGET_SYSTEM_ADSP_BF537 default "e7c8afc1dda7b7c18596d90ad6a17ae886650b72" if ADK_TARGET_SYSTEM_KINETIS_K70 default "902739f3353150ac9eb69ad995098f3079d862a3" if ADK_TARGET_SYSTEM_SOLIDRUN_CLEARFOG @@ -233,7 +233,7 @@ config ADK_TARGET_LINUX_KERNEL_GIT_VER string "kernel version" depends on ADK_TARGET_LINUX_KERNEL_VERSION_GIT default "5.19" if ADK_TARGET_LINUX_ARCH_LOONGARCH - default "6.1.58" if ADK_TARGET_BOARD_BCM28XX + default "6.1.65" if ADK_TARGET_BOARD_BCM28XX default "5.10.110" if ADK_TARGET_SYSTEM_ROCKPI4_PLUS default "4.4.37" if ADK_TARGET_SYSTEM_BEAGLEBONE_BLACK default "4.4.52" if ADK_TARGET_SYSTEM_PHYTEC_WEGA |