Skip to content

Commit ef56393

Browse files
committed
loongarch64: sync with upstream source
1 parent 96f3d37 commit ef56393

4 files changed

Lines changed: 17 additions & 25 deletions

File tree

target/linux/loongarch64/Makefile

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,15 +7,16 @@ include $(TOPDIR)/rules.mk
77
ARCH:=loongarch64
88
BOARD:=loongarch64
99
BOARDNAME:=Loongson LoongArch
10-
FEATURES:=audio display squashfs ext4 pcie boot-part rootfs-part rtc usb targz
10+
FEATURES:=audio display ext4 pcie boot-part rootfs-part rtc usb targz
11+
SUBTARGETS:=generic
1112

1213
KERNEL_PATCHVER:=6.6
1314

14-
KERNELNAME:=vmlinuz.efi
15+
KERNELNAME:=vmlinuz.efi dtbs
1516

1617
include $(INCLUDE_DIR)/target.mk
1718

1819
DEFAULT_PACKAGES += \
19-
partx-utils blkid e2fsprogs grub2-efi-loongarch64 htop wpad-openssl
20+
partx-utils blkid e2fsprogs grub2-efi-loongarch64
2021

2122
$(eval $(call BuildTarget))

target/linux/loongarch64/config-6.6

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,8 +93,6 @@ CONFIG_BSD_PROCESS_ACCT_V3=y
9393
CONFIG_BUFFER_HEAD=y
9494
CONFIG_BUG_ON_DATA_CORRUPTION=y
9595
CONFIG_CACHESTAT_SYSCALL=y
96-
CONFIG_CC_IMPLICIT_FALLTHROUGH="-Wimplicit-fallthrough=5"
97-
CONFIG_CC_NO_ARRAY_BOUNDS=y
9896
CONFIG_CDROM=y
9997
CONFIG_CFS_BANDWIDTH=y
10098
CONFIG_CGROUPS=y
@@ -171,7 +169,6 @@ CONFIG_CRYPTO_RNG2=y
171169
CONFIG_CRYPTO_RSA=y
172170
CONFIG_CRYPTO_SHA1=y
173171
CONFIG_CRYPTO_SHA256=y
174-
CONFIG_DCB=y
175172
CONFIG_DEBUG_BUGVERBOSE=y
176173
CONFIG_DEBUG_INFO=y
177174
CONFIG_DEBUG_INFO_COMPRESSED_NONE=y
@@ -234,8 +231,6 @@ CONFIG_ENCRYPTED_KEYS=y
234231
CONFIG_EXCLUSIVE_SYSTEM_RAM=y
235232
CONFIG_EXPORTFS_BLOCK_OPS=y
236233
CONFIG_EXT4_FS=y
237-
CONFIG_EXT4_FS_POSIX_ACL=y
238-
CONFIG_EXT4_FS_SECURITY=y
239234
CONFIG_FAILOVER=y
240235
CONFIG_FAIR_GROUP_SCHED=y
241236
CONFIG_FANOTIFY=y
@@ -282,13 +277,11 @@ CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y
282277
CONFIG_FREEZER=y
283278
CONFIG_FS_IOMAP=y
284279
CONFIG_FS_MBCACHE=y
285-
CONFIG_FS_POSIX_ACL=y
286280
CONFIG_FUNCTION_ALIGNMENT=0
287281
CONFIG_FW_CACHE=y
288282
# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
289283
CONFIG_FW_LOADER_PAGED_BUF=y
290284
CONFIG_FW_LOADER_SYSFS=y
291-
CONFIG_GCC11_NO_ARRAY_BOUNDS=y
292285
CONFIG_GENERIC_ALLOCATOR=y
293286
CONFIG_GENERIC_BUG=y
294287
CONFIG_GENERIC_BUG_RELATIVE_POINTERS=y
@@ -402,7 +395,6 @@ CONFIG_LEDS_TRIGGER_MTD=y
402395
CONFIG_LEDS_TRIGGER_PANIC=y
403396
CONFIG_LEGACY_TIOCSTI=y
404397
CONFIG_LIBFDT=y
405-
CONFIG_LIST_HARDENED=y
406398
CONFIG_LOCKUP_DETECTOR=y
407399
CONFIG_LOCK_DEBUGGING_SUPPORT=y
408400
CONFIG_LOCK_SPIN_ON_OWNER=y
@@ -532,7 +524,6 @@ CONFIG_PCI_LOONGSON=y
532524
CONFIG_PCI_MSI=y
533525
CONFIG_PCI_MSI_ARCH_FALLBACKS=y
534526
CONFIG_PCI_REALLOC_ENABLE_AUTO=y
535-
CONFIG_PCPU_DEV_REFCNT=y
536527
# CONFIG_PDS_CORE is not set
537528
CONFIG_PERF_USE_VMALLOC=y
538529
CONFIG_PGTABLE_3LEVEL=y
@@ -752,7 +743,6 @@ CONFIG_THERMAL_STATISTICS=y
752743
CONFIG_THERMAL_WRITABLE_TRIPS=y
753744
CONFIG_TICK_CPU_ACCOUNTING=y
754745
CONFIG_TMPFS_INODE64=y
755-
CONFIG_TMPFS_POSIX_ACL=y
756746
# CONFIG_TMPFS_QUOTA is not set
757747
CONFIG_TRANSPARENT_HUGEPAGE=y
758748
CONFIG_TRANSPARENT_HUGEPAGE_ALWAYS=y
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
BOARDNAME:=Generic

target/linux/loongarch64/image/Makefile

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ ifneq ($(CONFIG_GRUB_CONSOLE),)
1616
GRUB_TERMINALS += console
1717
endif
1818

19-
GRUB_SERIAL:=$(call qstrip,$(CONFIG_GRUB_SERIAL))
19+
GRUB_SERIAL:=$(call qstrip,$(CONFIG_TARGET_SERIAL))
2020

2121
GRUB_CONSOLE_CMDLINE += console=$(GRUB_SERIAL),$(CONFIG_GRUB_BAUDRATE)n8$(if $(CONFIG_GRUB_FLOWCONTROL),r,)
2222
GRUB_SERIAL_CONFIG := serial --unit=0 --speed=$(CONFIG_GRUB_BAUDRATE) --word=8 --parity=no --stop=1 --rtscts=$(if $(CONFIG_GRUB_FLOWCONTROL),on,off)
@@ -63,6 +63,17 @@ define Build/grub-config
6363
endef
6464

6565
define Device/Default
66+
KERNEL_INSTALL := 1
67+
ARTIFACTS := $$(ARTIFACTS-y)
68+
SUPPORTED_DEVICES :=
69+
endef
70+
71+
define Device/generic
72+
DEVICE_VENDOR := Generic
73+
DEVICE_MODEL := LoongArch64
74+
DEVICE_PACKAGES += kmod-r8169 kmod-drm-amdgpu
75+
KERNEL := kernel-bin
76+
KERNEL_NAME := vmlinuz.efi
6677
IMAGE/rootfs.img := append-rootfs | pad-to $(ROOTFS_PARTSIZE)
6778
IMAGE/rootfs.img.gz := append-rootfs | pad-to $(ROOTFS_PARTSIZE) | gzip
6879
IMAGE/combined-efi.img := grub-config efi | combined | append-metadata
@@ -74,18 +85,7 @@ define Device/Default
7485
IMAGES-y := rootfs.img
7586
IMAGES-$$(CONFIG_GRUB_EFI_IMAGES) += combined-efi.img
7687
endif
77-
KERNEL := kernel-bin
78-
KERNEL_INSTALL := 1
79-
KERNEL_NAME := vmlinuz.efi
8088
IMAGES := $$(IMAGES-y)
81-
ARTIFACTS := $$(ARTIFACTS-y)
82-
SUPPORTED_DEVICES :=
83-
endef
84-
85-
define Device/generic
86-
DEVICE_VENDOR := Generic
87-
DEVICE_MODEL := LoongArch64
88-
DEVICE_PACKAGES += kmod-r8169 kmod-drm-amdgpu
8989
endef
9090
TARGET_DEVICES += generic
9191

0 commit comments

Comments
 (0)