[OpenWrt-Devel] [PATCH 19.07] ramips: use upstream RAW_APPENDED_DTB instead of our OWRTDTB

Adrian Schmutzler mail at adrianschmutzler.de
Mon Nov 25 09:10:53 EST 2019


LGTM.

Best

Adrian

> -----Original Message-----
> From: openwrt-devel [mailto:openwrt-devel-bounces at lists.openwrt.org] On
> Behalf Of Piotr Dymacz
> Sent: Samstag, 23. November 2019 14:13
> To: openwrt-devel at lists.openwrt.org
> Cc: ynezz at true.cz; gch981213 at gmail.com; musashino.open at gmail.com
> Subject: [OpenWrt-Devel] [PATCH 19.07] ramips: use upstream
> RAW_APPENDED_DTB instead of our OWRTDTB
> 
> From: Chuanhong Guo <gch981213 at gmail.com>
> 
> Upstream kernel added support for RAW_APPENDED_DTB on ralink arch
> in the following commit:
> 02564fc89d3d ("ralink: Introduce fw_passed_dtb to arch/mips/ralink")
> 
> Use upstream solution and get rid of our OWRTDTB hack.
> This commit set DEVICE_DTS to $$(DTS) instead of replacing DTS with
> DEVICE_DTS in device profile because DTS variable will be dropped
> in later commits.
> 
> Signed-off-by: Chuanhong Guo <gch981213 at gmail.com>
> [Tested on mt7621/mt76x8]
> Tested-by: Chuanhong Guo <gch981213 at gmail.com>
> [Tested on rt305x/mt7620]
> Tested-by: INAGAKI Hiroshi <musashino.open at gmail.com>
> (cherry picked from commit 7a8d3432c739c6ff038295176e8b6324e92fc116)
> Signed-off-by: Piotr Dymacz <pepe2k at gmail.com>
> ---
>  target/linux/ramips/image/Makefile            | 11 +---
>  target/linux/ramips/image/mt7621.mk           |  2 +-
>  target/linux/ramips/image/rt3883.mk           |  2 +-
>  target/linux/ramips/mt7620/config-4.14        |  4 +-
>  target/linux/ramips/mt7621/config-4.14        |  4 +-
>  target/linux/ramips/mt76x8/config-4.14        |  4 +-
>  .../ramips/patches-4.14/0100-prom_fixes.patch | 66 -------------------
>  target/linux/ramips/rt305x/config-4.14        |  4 +-
>  target/linux/ramips/rt3883/config-4.14        |  4 +-
>  9 files changed, 15 insertions(+), 86 deletions(-)
>  delete mode 100644 target/linux/ramips/patches-4.14/0100-prom_fixes.patch
> 
> diff --git a/target/linux/ramips/image/Makefile
> b/target/linux/ramips/image/Makefile
> index 0a32859bec..07251aebba 100644
> --- a/target/linux/ramips/image/Makefile
> +++ b/target/linux/ramips/image/Makefile
> @@ -19,12 +19,12 @@ loadaddr-$(CONFIG_TARGET_ramips_mt7621) :=
> 0x80001000
> 
>  KERNEL_LOADADDR := $(loadaddr-y)
> 
> -KERNEL_DTB = kernel-bin | patch-dtb | lzma
> +KERNEL_DTB = kernel-bin | append-dtb | lzma
>  define Device/Default
> -  PROFILES = Default $$(DTS)
> -  KERNEL_DEPENDS = $$(wildcard ../dts/$$(DTS).dts)
> +  PROFILES = Default
>    KERNEL := $(KERNEL_DTB) | uImage lzma
>    DEVICE_DTS_DIR := ../dts
> +  DEVICE_DTS = $$(DTS)
>    IMAGES := sysupgrade.bin
>    IMAGE_SIZE := $(ralink_default_fw_size_8M)
>    SUPPORTED_DEVICES := $(subst _,$(comma),$(1))
> @@ -52,11 +52,6 @@ define Build/jcg-header
>  	mv $@.new $@
>  endef
> 
> -define Build/patch-dtb
> -	$(call Image/BuildDTB,../dts/$(DTS).dts,$@.dtb)
> -	$(STAGING_DIR_HOST)/bin/patch-dtb $@ $@.dtb
> -endef
> -
>  define Build/trx
>  	$(STAGING_DIR_HOST)/bin/trx $(1) \
>  		-o $@ \
> diff --git a/target/linux/ramips/image/mt7621.mk
> b/target/linux/ramips/image/mt7621.mk
> index f13e9c8a4f..fa222f7a89 100644
> --- a/target/linux/ramips/image/mt7621.mk
> +++ b/target/linux/ramips/image/mt7621.mk
> @@ -106,7 +106,7 @@ define Device/dir-860l-b1
>    DTS := DIR-860L-B1
>    BLOCKSIZE := 64k
>    SEAMA_SIGNATURE := wrgac13_dlink.2013gui_dir860lb
> -  KERNEL := kernel-bin | patch-dtb | relocate-kernel | lzma | uImage lzma
> +  KERNEL := kernel-bin | append-dtb | relocate-kernel | lzma | uImage lzma
>    IMAGE_SIZE := $(ralink_default_fw_size_16M)
>    DEVICE_TITLE := D-Link DIR-860L B1
>    DEVICE_PACKAGES := kmod-mt76x2 kmod-usb3 kmod-usb-ledtrig-usbport
> wpad-basic
> diff --git a/target/linux/ramips/image/rt3883.mk
> b/target/linux/ramips/image/rt3883.mk
> index 4844abd1b7..b783994357 100644
> --- a/target/linux/ramips/image/rt3883.mk
> +++ b/target/linux/ramips/image/rt3883.mk
> @@ -48,7 +48,7 @@ define Device/belkin_f9k1109v1
>    DEVICE_TITLE := Belkin F9K1109 Version 1.0
>    DEVICE_PACKAGES := kmod-usb-core kmod-usb-ohci kmod-usb2 swconfig
>    IMAGE_SIZE := 7224k
> -  KERNEL := kernel-bin | patch-dtb | lzma -d16 | uImage lzma
> +  KERNEL := kernel-bin | append-dtb | lzma -d16 | uImage lzma
>    # Stock firmware checks for this uImage image name during upload.
>    UIMAGE_NAME := N750F9K1103VB
>  endef
> diff --git a/target/linux/ramips/mt7620/config-4.14
> b/target/linux/ramips/mt7620/config-4.14
> index 05f3963d43..92a7a2fd38 100644
> --- a/target/linux/ramips/mt7620/config-4.14
> +++ b/target/linux/ramips/mt7620/config-4.14
> @@ -146,8 +146,8 @@ CONFIG_MIPS_CMDLINE_FROM_DTB=y
>  # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
>  CONFIG_MIPS_L1_CACHE_SHIFT=5
>  # CONFIG_MIPS_MACHINE is not set
> -CONFIG_MIPS_NO_APPENDED_DTB=y
> -# CONFIG_MIPS_RAW_APPENDED_DTB is not set
> +# CONFIG_MIPS_NO_APPENDED_DTB is not set
> +CONFIG_MIPS_RAW_APPENDED_DTB=y
>  CONFIG_MIPS_SPRAM=y
>  CONFIG_MODULES_USE_ELF_REL=y
>  # CONFIG_MT7621_WDT is not set
> diff --git a/target/linux/ramips/mt7621/config-4.14
> b/target/linux/ramips/mt7621/config-4.14
> index b279c69879..a2c58e030b 100644
> --- a/target/linux/ramips/mt7621/config-4.14
> +++ b/target/linux/ramips/mt7621/config-4.14
> @@ -173,9 +173,9 @@ CONFIG_MIPS_L1_CACHE_SHIFT=5
>  CONFIG_MIPS_MT=y
>  CONFIG_MIPS_MT_FPAFF=y
>  CONFIG_MIPS_MT_SMP=y
> -CONFIG_MIPS_NO_APPENDED_DTB=y
> +# CONFIG_MIPS_NO_APPENDED_DTB is not set
>  CONFIG_MIPS_PERF_SHARED_TC_COUNTERS=y
> -# CONFIG_MIPS_RAW_APPENDED_DTB is not set
> +CONFIG_MIPS_RAW_APPENDED_DTB=y
>  CONFIG_MIPS_SPRAM=y
>  # CONFIG_MIPS_VPE_LOADER is not set
>  CONFIG_MODULES_USE_ELF_REL=y
> diff --git a/target/linux/ramips/mt76x8/config-4.14
> b/target/linux/ramips/mt76x8/config-4.14
> index 5bcb948585..21cf070374 100644
> --- a/target/linux/ramips/mt76x8/config-4.14
> +++ b/target/linux/ramips/mt76x8/config-4.14
> @@ -143,8 +143,8 @@ CONFIG_MIPS_CMDLINE_FROM_DTB=y
>  # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
>  CONFIG_MIPS_L1_CACHE_SHIFT=5
>  # CONFIG_MIPS_MACHINE is not set
> -CONFIG_MIPS_NO_APPENDED_DTB=y
> -# CONFIG_MIPS_RAW_APPENDED_DTB is not set
> +# CONFIG_MIPS_NO_APPENDED_DTB is not set
> +CONFIG_MIPS_RAW_APPENDED_DTB=y
>  CONFIG_MIPS_SPRAM=y
>  CONFIG_MODULES_USE_ELF_REL=y
>  CONFIG_MT7621_WDT=y
> diff --git a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch
> b/target/linux/ramips/patches-4.14/0100-prom_fixes.patch
> deleted file mode 100644
> index 91ac3b22c4..0000000000
> --- a/target/linux/ramips/patches-4.14/0100-prom_fixes.patch
> +++ /dev/null
> @@ -1,66 +0,0 @@
> -From 67b7bff0fd364c194e653f69baa623ba2141bd4c Mon Sep 17 00:00:00 2001
> -From: John Crispin <blogic at openwrt.org>
> -Date: Mon, 4 Aug 2014 18:46:02 +0200
> -Subject: [PATCH 07/53] MIPS: ralink: copy the commandline from the devicetree
> -
> -Signed-off-by: John Crispin <blogic at openwrt.org>
> ----
> - arch/mips/ralink/of.c |    2 ++
> - 1 file changed, 2 insertions(+)
> -
> ---- a/arch/mips/ralink/of.c
> -+++ b/arch/mips/ralink/of.c
> -@@ -3,7 +3,7 @@
> -  * under the terms of the GNU General Public License version 2 as published
> -  * by the Free Software Foundation.
> -  *
> -- * Copyright (C) 2008 Imre Kaloz <kaloz at openwrt.org>
> -+ * Copyright (C) 2008-2014 Imre Kaloz <kaloz at openwrt.org>
> -  * Copyright (C) 2008-2009 Gabor Juhos <juhosg at openwrt.org>
> -  * Copyright (C) 2013 John Crispin <john at phrozen.org>
> -  */
> -@@ -66,6 +66,19 @@ static int __init early_init_dt_find_mem
> - 	return 0;
> - }
> -
> -+static int chosen_dtb;
> -+
> -+static int __init early_init_dt_find_chosen(unsigned long node, const char
> *uname,
> -+				     int depth, void *data)
> -+{
> -+	if (depth == 1 && !strcmp(uname, "chosen"))
> -+		chosen_dtb = 1;
> -+
> -+	return 0;
> -+}
> -+
> -+extern struct boot_param_header __image_dtb;
> -+
> - void __init plat_mem_setup(void)
> - {
> - 	void *dtb = NULL;
> -@@ -82,7 +95,11 @@ void __init plat_mem_setup(void)
> - 	else if (__dtb_start != __dtb_end)
> - 		dtb = (void *)__dtb_start;
> -
> --	__dt_setup_arch(dtb);
> -+	__dt_setup_arch(&__image_dtb);
> -+
> -+	of_scan_flat_dt(early_init_dt_find_chosen, NULL);
> -+	if (chosen_dtb)
> -+		strlcpy(arcs_cmdline, boot_command_line,
> COMMAND_LINE_SIZE);
> -
> - 	strlcpy(arcs_cmdline, boot_command_line, COMMAND_LINE_SIZE);
> -
> ---- a/arch/mips/kernel/head.S
> -+++ b/arch/mips/kernel/head.S
> -@@ -85,6 +85,9 @@ EXPORT(__image_cmdline)
> - 	.fill	0x400
> - #endif /* CONFIG_IMAGE_CMDLINE_HACK */
> -
> -+	.ascii  "OWRTDTB:"
> -+	EXPORT(__image_dtb)
> -+	.fill   0x4000
> - 	__REF
> -
> - NESTED(kernel_entry, 16, sp)			# kernel entry point
> diff --git a/target/linux/ramips/rt305x/config-4.14
> b/target/linux/ramips/rt305x/config-4.14
> index 1f00bdaae9..60197a1eb8 100644
> --- a/target/linux/ramips/rt305x/config-4.14
> +++ b/target/linux/ramips/rt305x/config-4.14
> @@ -124,8 +124,8 @@ CONFIG_MIPS_CMDLINE_FROM_DTB=y
>  # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
>  CONFIG_MIPS_L1_CACHE_SHIFT=5
>  # CONFIG_MIPS_MACHINE is not set
> -CONFIG_MIPS_NO_APPENDED_DTB=y
> -# CONFIG_MIPS_RAW_APPENDED_DTB is not set
> +# CONFIG_MIPS_NO_APPENDED_DTB is not set
> +CONFIG_MIPS_RAW_APPENDED_DTB=y
>  CONFIG_MIPS_SPRAM=y
>  CONFIG_MODULES_USE_ELF_REL=y
>  # CONFIG_MTD_CFI_INTELEXT is not set
> diff --git a/target/linux/ramips/rt3883/config-4.14
> b/target/linux/ramips/rt3883/config-4.14
> index 046e3732e2..f16b09deb0 100644
> --- a/target/linux/ramips/rt3883/config-4.14
> +++ b/target/linux/ramips/rt3883/config-4.14
> @@ -138,8 +138,8 @@ CONFIG_MIPS_CMDLINE_FROM_DTB=y
>  # CONFIG_MIPS_HUGE_TLB_SUPPORT is not set
>  CONFIG_MIPS_L1_CACHE_SHIFT=5
>  # CONFIG_MIPS_MACHINE is not set
> -CONFIG_MIPS_NO_APPENDED_DTB=y
> -# CONFIG_MIPS_RAW_APPENDED_DTB is not set
> +# CONFIG_MIPS_NO_APPENDED_DTB is not set
> +CONFIG_MIPS_RAW_APPENDED_DTB=y
>  CONFIG_MIPS_SPRAM=y
>  CONFIG_MODULES_USE_ELF_REL=y
>  # CONFIG_MTD_CFI_INTELEXT is not set
> --
> 2.20.1
> 
> 
> _______________________________________________
> openwrt-devel mailing list
> openwrt-devel at lists.openwrt.org
> https://lists.openwrt.org/mailman/listinfo/openwrt-devel
-------------- next part --------------
A non-text attachment was scrubbed...
Name: openpgp-digital-signature.asc
Type: application/pgp-signature
Size: 834 bytes
Desc: not available
URL: <http://lists.infradead.org/pipermail/openwrt-devel/attachments/20191125/5ada2d14/attachment.sig>
-------------- next part --------------
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/mailman/listinfo/openwrt-devel


More information about the openwrt-devel mailing list