From patchwork Fri Mar 29 17:51:49 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Neil Armstrong X-Patchwork-Id: 784076 Delivered-To: patch@linaro.org Received: by 2002:a5d:4e01:0:b0:33e:7753:30bd with SMTP id p1csp3342347wrt; Fri, 29 Mar 2024 10:52:25 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXlkAOESTnVwUtGBXcR9Iw8tZ6iCXYScoGdbFygWxmer2WrCoWS12qEZoNwjxNZuCFwQJWAUcaN1/ua50blsBql X-Google-Smtp-Source: AGHT+IF3/6onB/VZY7GhrxpIRhrGD3DiXF1IvYDbmgwz3s83nLe2Z4qckKu6Dq4KItQ5iedPil0c X-Received: by 2002:a5d:4e07:0:b0:33e:d6cb:34be with SMTP id p7-20020a5d4e07000000b0033ed6cb34bemr1999847wrt.29.1711734745362; Fri, 29 Mar 2024 10:52:25 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711734745; cv=none; d=google.com; s=arc-20160816; b=s71GWTziG+Qk3wVOwXza4ZCkMKpJz8s752ofeduET7YZQttxeOxUBj0F844kjFT9+u 5RvmAc7lR1CA9zDsSZc3xH94S85xHZPK1gtYHhYl3h0ZhfNLJLp1h2Kmi9LrgeJSAuz8 QKoq5fRlSJBDPFAbpt28Bw++FQiJlX2Tf3dSsXhFYdKibFxRsPDkcgTJMvZB+rhlNKVI ihRF5ylXlbLOC6xYvdGii9XAaqAEVLjyexceFnvOQ2P37eL7wEx9QUcXa+mwb5OxxjGT xEICFkeTWSvX7P49xELchr3o4kcciRFA8DaPcdv74mfkb2TDYfZ6da3We30xUnT8ySLZ 9QBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:cc:to:in-reply-to:references :message-id:content-transfer-encoding:mime-version:subject:date:from :dkim-signature; bh=zwDnz3uGjyYlBYlamZRBwQc/JTUwMVWzF3SrjvDvefY=; fh=iZml44523oxL1mfT5nxo3tYs9EM26CouMgZBE1hYWQQ=; b=HPhXJeWRSOUKvA1sQlWlD4053Ehdh9ahZvmf/zfDKiVP0UfLeIfj27eX/0Jr28DIO/ vySXliSY8ZXKwLB7K6xOgoDwMC/Quf5I6U/aQdpQgwYKYOtuf5EcIxz5Jwn2FQ9geWgp QO98QppGm82lrXJpK+wHhOcn0HtE0aTlUvdHZd2l2tWKmDbOeq+SJ9oZWosE8iyrBP19 cJLTFZSOrYipx+Msd/J9BY3UELwquLDWC9yUGDW2GV4g0swwKrPe0iNIhoEBp+tuo3R6 Zi7ng6Vx9VhHqBu1qKJaf/009/mjP4EQGclsCEfZ/L3Hcwsu3XUhQ4E9E79RI6zzVHU8 w0jw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jlc8Yzt2; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from phobos.denx.de (phobos.denx.de. [85.214.62.61]) by mx.google.com with ESMTPS id n6-20020a5d6606000000b0033e9d07b70esi2237333wru.995.2024.03.29.10.52.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 10:52:25 -0700 (PDT) Received-SPF: pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) client-ip=85.214.62.61; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Jlc8Yzt2; spf=pass (google.com: domain of u-boot-bounces@lists.denx.de designates 85.214.62.61 as permitted sender) smtp.mailfrom=u-boot-bounces@lists.denx.de; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id E68FD88252; Fri, 29 Mar 2024 18:52:04 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de Authentication-Results: phobos.denx.de; dkim=pass (2048-bit key; unprotected) header.d=linaro.org header.i=@linaro.org header.b="Jlc8Yzt2"; dkim-atps=neutral Received: by phobos.denx.de (Postfix, from userid 109) id 2BBBB8825C; Fri, 29 Mar 2024 18:52:01 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de X-Spam-Level: X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.2 Received: from mail-wr1-x42d.google.com (mail-wr1-x42d.google.com [IPv6:2a00:1450:4864:20::42d]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)) (No client certificate requested) by phobos.denx.de (Postfix) with ESMTPS id 778A088253 for ; Fri, 29 Mar 2024 18:51:56 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=pass (p=none dis=none) header.from=linaro.org Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=neil.armstrong@linaro.org Received: by mail-wr1-x42d.google.com with SMTP id ffacd0b85a97d-33ed7ef0ae8so1480950f8f.0 for ; Fri, 29 Mar 2024 10:51:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711734716; x=1712339516; darn=lists.denx.de; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:from:to:cc:subject:date:message-id :reply-to; bh=zwDnz3uGjyYlBYlamZRBwQc/JTUwMVWzF3SrjvDvefY=; b=Jlc8Yzt2UoAC7q8lHM8hmyWFYAIBoi2l/OZeyUErF9Yz5EbO6S6FSV4sL2JZnYq2IW xIzsquiiPgS0sZiwl2KfmV3D8FLOzrutt/g6G2hAklAYVNn2IPM0lJ73MjyQLGw3wZSw VJtdcw0Li9/mEkKpdWD4DFA76eyemIPrfy7LV0pT5r5GdqDTgChFcRnePdFbDCkrAlHy e44AKDgx+WtGxbneZcgXgZ8tuc/RCwooqWomlDYtmlODOC4jAbBYiaEpksNZIRSwTyPG CkyIejCEi9OQO2ts3jWRK/omTdDeUpFP8xGHZq75/3nasZ8w6HJlxZ5Fl7C668Y/C0W0 RaOw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711734716; x=1712339516; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zwDnz3uGjyYlBYlamZRBwQc/JTUwMVWzF3SrjvDvefY=; b=hfg15N1HFwBQPSqdTDbG9NN2BX8G94XXONEipzO+T7JPHLenzJDD2HDXeu7BHhWvPo dDK7JBh5mQZxHhgZmF5B4/lwJTGm1/WuN+fFMZh6cutcPNC651AsqQdVbQxA3VJ6vpf/ +lFMcAK+EQEBYReDqFV9m00yuvA9D6Qr9mJCjKBLqUxvZaRO0pgz9k7Z2d1iQNgNQELG ZxqFk/JUIp/wS4UDSYvM2MaPoIxyvXejEuELOyL6KlSQKGmadljdPcVMbNxeRgam25jN ZNhPNhAh617SLuRvFjCxUv/8ppINzb8k7X6G2M3PohwQloepjNa9YU7drSGi7eYcsV7d paDA== X-Forwarded-Encrypted: i=1; AJvYcCXHrBWnEHM4UO27ZDhpXxHOxPYKNdMvbPk4owi5aGys8frbt2F1GdD9spegnYyrFisp3AeXSlPHcu0Pc+niNZgkybonBQ== X-Gm-Message-State: AOJu0YxN8j80nj6IIhsaPuO+wU858NuaQXQLXa+wjaBj9uY51NOJXnrc UgNL7dEsFTrYHPtnFAIdP1Vhvomel9pkQZG8+b3kMkWfb5jABvrOBNUsPb3tPGb9ECiohfr8FPF aHiM= X-Received: by 2002:adf:ca90:0:b0:341:66c2:3dbb with SMTP id r16-20020adfca90000000b0034166c23dbbmr1906035wrh.30.1711734715710; Fri, 29 Mar 2024 10:51:55 -0700 (PDT) Received: from arrakeen.starnux.net ([2a01:e0a:982:cbb0:8261:5fff:fe11:bdda]) by smtp.gmail.com with ESMTPSA id d7-20020a05600c3ac700b00415509b33c0sm2127781wms.10.2024.03.29.10.51.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Mar 2024 10:51:55 -0700 (PDT) From: Neil Armstrong Date: Fri, 29 Mar 2024 18:51:49 +0100 Subject: [PATCH v2 2/5] dts: meson: Switch GXL, GXM & AXG to using upstream DT MIME-Version: 1.0 Message-Id: <20240329-u-boot-of-upstream-v2-2-2512ad3eb63d@linaro.org> References: <20240329-u-boot-of-upstream-v2-0-2512ad3eb63d@linaro.org> In-Reply-To: <20240329-u-boot-of-upstream-v2-0-2512ad3eb63d@linaro.org> To: Tom Rini , Vyacheslav Bocharov , Christian Hewitt Cc: u-boot-amlogic@groups.io, u-boot@lists.denx.de, Neil Armstrong , Sumit Garg X-Mailer: b4 0.12.4 X-Developer-Signature: v=1; a=openpgp-sha256; l=8517; i=neil.armstrong@linaro.org; h=from:subject:message-id; bh=j5oJHz601sXvM1gYK9vJjT8ZFX0wEUBNB+5X+Ml0XUs=; b=owEBbQKS/ZANAwAKAXfc29rIyEnRAcsmYgBmBv+2w7E0awpITAtzHq/8epajXEKOhKuYHaF7YWSr aMIeGD+JAjMEAAEKAB0WIQQ9U8YmyFYF/h30LIt33NvayMhJ0QUCZgb/tgAKCRB33NvayMhJ0SCcEA DDZpogwH/mY47qFyvXRKJSlOxxyNvDjAUWdO4LTr5w/r5VHLHCtYxR50T6ZIG3SzpD6cObtK9k5vCW ZB/s4S2qLLcb2mBkqbXcycAF1uFS9++Yv6Wshxay99T6gnWqGit6Z86k5ox4iUjQNpdVynkNHUe1Nl Rp/em6OOp2eCdrLI18qqtqYTV6kGBPsxmOEfXfcJlTttHI1ragWYdN0KvfNnkNS2upFLJIqn6WlGQh 62/kNLU6YUQK4miIWb9MoV6625mUWbOOjcF4YOA1xwPvuvh+wcdFLd05QyUpB+29rRmmaY/WNwjY+6 Q82FkXqSdTtSLTJCGAaYlOhvD/vZSQu05P7iH4cXhuVBDcyG2qa4hurovEgrgXHWipfA5fEQNi3lXY 8/xCJwBd9vEuRkFu+6Zbz2gMBUf3y6n2sJkuDyMGQ5YXKExC4dpM92e3sTVuwGCIil9TOZNEuim/1O sDf3F+M9Mk9u1HLAgw1ooL5cH+bP7cBeBm/Do8tK0GBzo96cZRH45zEjTuDhNGtMCQeNRpADj52gU0 MXpA3sf9raXtI25v2JAElbZTD6bGoY3+mBDJVn5NohTwp4m7OpMo38aoDlaYGgFsMRKt70MlLgOK7s +ZZiTSlx2/T8f+Wy+TGb5oWkPPTMtHNbvEqDR5lWjiUjvh6lSt2ib867yFpw== X-Developer-Key: i=neil.armstrong@linaro.org; a=openpgp; fpr=89EC3D058446217450F22848169AB7B1A4CFF8AE X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.8 at phobos.denx.de X-Virus-Status: Clean Enable OF_UPSTREAM to use upstream DT and add amlogic/ prefix to the DEFAULT_DEVICE_TREE. And thereby directly build DTB from dts/upstream/src/ including *-u-boot.dtsi files from arch/$(ARCH)/dts/ directory. Cc: Sumit Garg Acked-by: Viacheslav Bocharov Reviewed-by: Sumit Garg Signed-off-by: Neil Armstrong --- arch/arm/mach-meson/Kconfig | 3 +++ configs/beelink-gt1-ultimate_defconfig | 2 +- configs/jethub_j100_defconfig | 2 +- configs/jethub_j80_defconfig | 2 +- configs/khadas-vim2_defconfig | 2 +- configs/khadas-vim_defconfig | 2 +- configs/libretech-ac_defconfig | 2 +- configs/libretech-cc_defconfig | 2 +- configs/libretech-cc_v2_defconfig | 2 +- configs/libretech-s905d-pc_defconfig | 2 +- configs/libretech-s912-pc_defconfig | 2 +- configs/p212_defconfig | 2 +- configs/s400_defconfig | 2 +- configs/wetek-core2_defconfig | 2 +- 14 files changed, 16 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-meson/Kconfig b/arch/arm/mach-meson/Kconfig index 95e7b019ce..1d837ae0f3 100644 --- a/arch/arm/mach-meson/Kconfig +++ b/arch/arm/mach-meson/Kconfig @@ -32,18 +32,21 @@ config MESON_GXBB config MESON_GXL bool "GXL" select MESON_GX + imply OF_UPSTREAM help Select this if your SoC is an S905X/D or S805X config MESON_GXM bool "GXM" select MESON_GX + imply OF_UPSTREAM help Select this if your SoC is an S912 config MESON_AXG bool "AXG" select MESON64_COMMON + imply OF_UPSTREAM help Select this if your SoC is an A113X/D diff --git a/configs/beelink-gt1-ultimate_defconfig b/configs/beelink-gt1-ultimate_defconfig index 00fdad8544..0e30e13c82 100644 --- a/configs/beelink-gt1-ultimate_defconfig +++ b/configs/beelink-gt1-ultimate_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxm-gt1-ultimate" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxm-gt1-ultimate" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXM=y diff --git a/configs/jethub_j100_defconfig b/configs/jethub_j100_defconfig index 863245430a..9de6b4b44d 100644 --- a/configs/jethub_j100_defconfig +++ b/configs/jethub_j100_defconfig @@ -8,7 +8,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-axg-jethome-jethub-j100" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-axg-jethome-jethub-j100" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_AXG=y diff --git a/configs/jethub_j80_defconfig b/configs/jethub_j80_defconfig index ca0808f712..85306872f9 100644 --- a/configs/jethub_j80_defconfig +++ b/configs/jethub_j80_defconfig @@ -8,7 +8,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905w-jethome-jethub-j80" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905w-jethome-jethub-j80" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/khadas-vim2_defconfig b/configs/khadas-vim2_defconfig index 59ef33723e..50f8b30650 100644 --- a/configs/khadas-vim2_defconfig +++ b/configs/khadas-vim2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxm-khadas-vim2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxm-khadas-vim2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXM=y diff --git a/configs/khadas-vim_defconfig b/configs/khadas-vim_defconfig index 5ed7c1a408..ac00e8975e 100644 --- a/configs/khadas-vim_defconfig +++ b/configs/khadas-vim_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905x-khadas-vim" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905x-khadas-vim" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/libretech-ac_defconfig b/configs/libretech-ac_defconfig index f0ab19580c..6ad0457002 100644 --- a/configs/libretech-ac_defconfig +++ b/configs/libretech-ac_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFF0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s805x-libretech-ac" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s805x-libretech-ac" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/libretech-cc_defconfig b/configs/libretech-cc_defconfig index bb1a37a0cd..beb919ca6e 100644 --- a/configs/libretech-cc_defconfig +++ b/configs/libretech-cc_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905x-libretech-cc" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905x-libretech-cc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/libretech-cc_v2_defconfig b/configs/libretech-cc_v2_defconfig index 8949e240c9..784a269fd5 100644 --- a/configs/libretech-cc_v2_defconfig +++ b/configs/libretech-cc_v2_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0xFFFF0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905x-libretech-cc-v2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905x-libretech-cc-v2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/libretech-s905d-pc_defconfig b/configs/libretech-s905d-pc_defconfig index a5dc3115fc..0adc0afdf3 100644 --- a/configs/libretech-s905d-pc_defconfig +++ b/configs/libretech-s905d-pc_defconfig @@ -9,7 +9,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xFFFF0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905d-libretech-pc" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905d-libretech-pc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/libretech-s912-pc_defconfig b/configs/libretech-s912-pc_defconfig index 68f462eeff..cbce0cf400 100644 --- a/configs/libretech-s912-pc_defconfig +++ b/configs/libretech-s912-pc_defconfig @@ -8,7 +8,7 @@ CONFIG_ENV_SIZE=0x10000 CONFIG_ENV_OFFSET=0xFFFF0000 CONFIG_ENV_SECT_SIZE=0x10000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxm-s912-libretech-pc" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxm-s912-libretech-pc" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXM=y diff --git a/configs/p212_defconfig b/configs/p212_defconfig index 6b73607d64..9cf22ca4db 100644 --- a/configs/p212_defconfig +++ b/configs/p212_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxl-s905x-p212" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxl-s905x-p212" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXL=y diff --git a/configs/s400_defconfig b/configs/s400_defconfig index 8e22c95f88..d75d296fa0 100644 --- a/configs/s400_defconfig +++ b/configs/s400_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-axg-s400" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-axg-s400" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_AXG=y diff --git a/configs/wetek-core2_defconfig b/configs/wetek-core2_defconfig index 01ffb8bbd7..c4b126c2b7 100644 --- a/configs/wetek-core2_defconfig +++ b/configs/wetek-core2_defconfig @@ -6,7 +6,7 @@ CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x20000000 CONFIG_ENV_SIZE=0x2000 CONFIG_DM_GPIO=y -CONFIG_DEFAULT_DEVICE_TREE="meson-gxm-wetek-core2" +CONFIG_DEFAULT_DEVICE_TREE="amlogic/meson-gxm-wetek-core2" CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_DM_RESET=y CONFIG_MESON_GXM=y