diff --git a/config/Config-images.in b/config/Config-images.in index b1f5b437198..26917267cf9 100644 --- a/config/Config-images.in +++ b/config/Config-images.in @@ -17,7 +17,7 @@ menu "Target Images" default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_lantiq default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_mpc85xx default TARGET_INITRAMFS_COMPRESSION_LZMA if TARGET_ramips - default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPERATE_INITRAMFS + default TARGET_INITRAMFS_COMPRESSION_XZ if USES_SEPARATE_INITRAMFS default TARGET_INITRAMFS_COMPRESSION_NONE depends on TARGET_ROOTFS_INITRAMFS help @@ -36,11 +36,11 @@ menu "Target Images" bool "lzma" config TARGET_INITRAMFS_COMPRESSION_LZO - depends on !TARGET_ROOTFS_INITRAMFS_SEPERATE + depends on !TARGET_ROOTFS_INITRAMFS_SEPARATE bool "lzo" config TARGET_INITRAMFS_COMPRESSION_LZ4 - depends on !TARGET_ROOTFS_INITRAMFS_SEPERATE + depends on !TARGET_ROOTFS_INITRAMFS_SEPARATE bool "lz4" config TARGET_INITRAMFS_COMPRESSION_XZ @@ -65,12 +65,12 @@ menu "Target Images" help Ignore the initramfs passed by the bootloader. - config TARGET_ROOTFS_INITRAMFS_SEPERATE - bool "seperate ramdisk" - depends on USES_SEPERATE_INITRAMFS && TARGET_ROOTFS_INITRAMFS && !TARGET_INITRAMFS_FORCE - default y if USES_SEPERATE_INITRAMFS + config TARGET_ROOTFS_INITRAMFS_SEPARATE + bool "separate ramdisk" + depends on USES_SEPARATE_INITRAMFS && TARGET_ROOTFS_INITRAMFS && !TARGET_INITRAMFS_FORCE + default y if USES_SEPARATE_INITRAMFS help - Generate seperate initrd.cpio instead of embedding it. + Generate separate initrd.cpio instead of embedding it. This is useful for generating images with a dedicated ramdisk e.g. in U-Boot's uImage and uImage.FIT formats. diff --git a/include/image-commands.mk b/include/image-commands.mk index a1edc3265e3..10b23e027b1 100644 --- a/include/image-commands.mk +++ b/include/image-commands.mk @@ -210,7 +210,7 @@ define Build/fit $(if $(word 2,$(1)),-d $(word 2,$(1))) -C $(word 1,$(1)) \ $(if $(findstring with-rootfs,$(word 3,$(1))),-r $(IMAGE_ROOTFS)) \ $(if $(findstring with-initrd,$(word 3,$(1))), \ - $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPERATE), \ + $(if $(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE), \ -i $(KERNEL_BUILD_DIR)/initrd.cpio$(strip $(call Build/initrd_compression)))) \ -a $(KERNEL_LOADADDR) -e $(if $(KERNEL_ENTRY),$(KERNEL_ENTRY),$(KERNEL_LOADADDR)) \ $(if $(DEVICE_FDT_NUM),-n $(DEVICE_FDT_NUM)) \ diff --git a/include/kernel-defaults.mk b/include/kernel-defaults.mk index c246857cd3a..ade31b0dc19 100644 --- a/include/kernel-defaults.mk +++ b/include/kernel-defaults.mk @@ -48,7 +48,7 @@ else endif ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS),y) - ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPERATE),y) + ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y) define Kernel/SetInitramfs/PreConfigure grep -v -e CONFIG_BLK_DEV_INITRD $(LINUX_DIR)/.config.old > $(LINUX_DIR)/.config echo 'CONFIG_BLK_DEV_INITRD=y' >> $(LINUX_DIR)/.config @@ -73,7 +73,7 @@ endif rm -f $(LINUX_DIR)/.config.prev mv $(LINUX_DIR)/.config $(LINUX_DIR)/.config.old $(call Kernel/SetInitramfs/PreConfigure) - ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPERATE),y) + ifneq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y) echo 'CONFIG_INITRAMFS_ROOT_UID=$(shell id -u)' >> $(LINUX_DIR)/.config echo 'CONFIG_INITRAMFS_ROOT_GID=$(shell id -g)' >> $(LINUX_DIR)/.config echo "$(if $(CONFIG_TARGET_INITRAMFS_FORCE),CONFIG_INITRAMFS_FORCE=y,# CONFIG_INITRAMFS_FORCE is not set)" >> $(LINUX_DIR)/.config @@ -159,7 +159,7 @@ define Kernel/CompileImage/Initramfs $(CP) $(GENERIC_PLATFORM_DIR)/other-files/init $(TARGET_DIR)/init $(if $(SOURCE_DATE_EPOCH),touch -hcd "@$(SOURCE_DATE_EPOCH)" $(TARGET_DIR)/init) rm -rf $(KERNEL_BUILD_DIR)/linux-$(LINUX_VERSION)/usr/initramfs_data.cpio* -ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPERATE),y) +ifeq ($(CONFIG_TARGET_ROOTFS_INITRAMFS_SEPARATE),y) ifeq ($(CONFIG_EXTERNAL_CPIO),y) $(CP) $(CONFIG_EXTERNAL_CPIO) $(KERNEL_BUILD_DIR)/initrd.cpio else diff --git a/package/base-files/image-config.in b/package/base-files/image-config.in index b5cd90f6152..ac406bc456b 100644 --- a/package/base-files/image-config.in +++ b/package/base-files/image-config.in @@ -119,7 +119,7 @@ menuconfig INITOPT prompt "Environment variables to set when starting init (start with none)" if INITOPT default "" help - Should be a space seperated list of variable assignments. These + Should be a space separated list of variable assignments. These variables will be present in the environment. Spaces may not be present (including through expansion) even in a quoted string (env doesn't understanding quoting). diff --git a/package/firmware/b43legacy-firmware/Makefile b/package/firmware/b43legacy-firmware/Makefile index ecbfc322930..9ca65a8a325 100644 --- a/package/firmware/b43legacy-firmware/Makefile +++ b/package/firmware/b43legacy-firmware/Makefile @@ -42,7 +42,7 @@ define Package/b43legacy-firmware/config depends on B43LEGACY_FW_SQUASH default "1,2,3,4" help - This is a comma seperated list of core revision numbers. + This is a comma separated list of core revision numbers. Example (keep files for rev4 only): 4 diff --git a/package/kernel/mac80211/broadcom.mk b/package/kernel/mac80211/broadcom.mk index fb576c5809a..473bbf597c3 100644 --- a/package/kernel/mac80211/broadcom.mk +++ b/package/kernel/mac80211/broadcom.mk @@ -209,7 +209,7 @@ config PACKAGE_B43_USE_BCMA default "16,28,29,30" if TARGET_bcm47xx_mips74k default "5,6,7,8,9,10,11,13,15,16,28,29,30" help - This is a comma seperated list of core revision numbers. + This is a comma separated list of core revision numbers. Example (keep files for rev5 only): 5 @@ -224,7 +224,7 @@ config PACKAGE_B43_USE_BCMA default "N,HT" if TARGET_bcm47xx_mips74k default "G,N,LP,HT" help - This is a comma seperated list of PHY types: + This is a comma separated list of PHY types: A => A-PHY AG => Dual A-PHY G-PHY G => G-PHY diff --git a/scripts/target-metadata.pl b/scripts/target-metadata.pl index 4128d544612..09a2d993c1b 100755 --- a/scripts/target-metadata.pl +++ b/scripts/target-metadata.pl @@ -33,7 +33,7 @@ sub target_config_features(@) { /^fpu$/ and $ret .= "\tselect HAS_FPU\n"; /^spe_fpu$/ and $ret .= "\tselect HAS_SPE_FPU\n"; /^ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n"; - /^seperate_ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n\tselect USES_SEPERATE_INITRAMFS\n"; + /^separate_ramdisk$/ and $ret .= "\tselect USES_INITRAMFS\n\tselect USES_SEPARATE_INITRAMFS\n"; /^powerpc64$/ and $ret .= "\tselect powerpc64\n"; /^nommu$/ and $ret .= "\tselect NOMMU\n"; /^mips16$/ and $ret .= "\tselect HAS_MIPS16\n"; diff --git a/target/Config.in b/target/Config.in index 9dbc5ffe465..86d39ce07c6 100644 --- a/target/Config.in +++ b/target/Config.in @@ -51,7 +51,7 @@ config USES_DEVICETREE config USES_INITRAMFS bool -config USES_SEPERATE_INITRAMFS +config USES_SEPARATE_INITRAMFS bool config USES_SQUASHFS diff --git a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch index c88f14f01fc..51eb42494e0 100644 --- a/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch +++ b/target/linux/layerscape/patches-5.4/802-can-0006-can-rx-offload-Prepare-for-CAN-FD-support.patch @@ -3,7 +3,7 @@ From: Joakim Zhang Date: Fri, 12 Jul 2019 08:02:38 +0000 Subject: [PATCH] can: rx-offload: Prepare for CAN FD support -The skbs for classic CAN and CAN FD frames are allocated with seperate +The skbs for classic CAN and CAN FD frames are allocated with separate functions: alloc_can_skb() and alloc_canfd_skb(). In order to support CAN FD frames via the rx-offload helper, the driver diff --git a/target/linux/mediatek/Makefile b/target/linux/mediatek/Makefile index e2e44c78bba..2ee00e5d176 100644 --- a/target/linux/mediatek/Makefile +++ b/target/linux/mediatek/Makefile @@ -6,7 +6,7 @@ ARCH:=arm BOARD:=mediatek BOARDNAME:=MediaTek Ralink ARM SUBTARGETS:=mt7622 mt7623 mt7629 -FEATURES:=squashfs nand seperate_ramdisk fpu +FEATURES:=squashfs nand separate_ramdisk fpu KERNEL_PATCHVER:=5.4 KERNEL_TESTING_PATCHVER:=5.10 diff --git a/target/linux/rockchip/patches-5.10/100-rockchip-use-system-LED-for-OpenWrt.patch b/target/linux/rockchip/patches-5.10/100-rockchip-use-system-LED-for-OpenWrt.patch index 7f9af85b1d3..7b3b50ffd85 100644 --- a/target/linux/rockchip/patches-5.10/100-rockchip-use-system-LED-for-OpenWrt.patch +++ b/target/linux/rockchip/patches-5.10/100-rockchip-use-system-LED-for-OpenWrt.patch @@ -5,7 +5,7 @@ Subject: [PATCH] rockchip: use system LED for OpenWrt Use the SYS LED on the casing for showing system status. -This patch is kept seperate from the NanoPi R2S support patch, as i plan +This patch is kept separate from the NanoPi R2S support patch, as i plan on submitting the device support upstream. Signed-off-by: David Bauer diff --git a/target/linux/rockchip/patches-5.4/100-rockchip-use-system-LED-for-OpenWrt.patch b/target/linux/rockchip/patches-5.4/100-rockchip-use-system-LED-for-OpenWrt.patch index 7f9af85b1d3..7b3b50ffd85 100644 --- a/target/linux/rockchip/patches-5.4/100-rockchip-use-system-LED-for-OpenWrt.patch +++ b/target/linux/rockchip/patches-5.4/100-rockchip-use-system-LED-for-OpenWrt.patch @@ -5,7 +5,7 @@ Subject: [PATCH] rockchip: use system LED for OpenWrt Use the SYS LED on the casing for showing system status. -This patch is kept seperate from the NanoPi R2S support patch, as i plan +This patch is kept separate from the NanoPi R2S support patch, as i plan on submitting the device support upstream. Signed-off-by: David Bauer