From 8c63d433c28e2d1d4100d14bed0d7fcffef36e4e Mon Sep 17 00:00:00 2001 From: Viacheslav Bocharov Date: Tue, 27 Feb 2024 09:54:04 +0300 Subject: board: amlogic: jethubj100: fix common config header Fix JetHub board sequence to read correct gpio for rescue button Signed-off-by: Viacheslav Bocharov Link: https://lore.kernel.org/r/20240227065551.580199-2-adeep@lexina.in Signed-off-by: Neil Armstrong --- include/configs/jethub.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/jethub.h b/include/configs/jethub.h index e22db4991de..2c44bfc853e 100644 --- a/include/configs/jethub.h +++ b/include/configs/jethub.h @@ -11,7 +11,7 @@ #if defined(CONFIG_MESON_AXG) #define BOOTENV_DEV_RESCUE(devtypeu, devtypel, instance) \ "bootcmd_rescue=" \ - "if gpio input 10; then " \ + "if gpio input periphs-banks10; then " \ "run bootcmd_mmc0; " \ "run bootcmd_usb0;" \ "fi;\0" -- cgit v1.3.1 From 0fb25528875d25a8c70c3f1ac4064724c35c9a36 Mon Sep 17 00:00:00 2001 From: Neil Armstrong Date: Fri, 29 Mar 2024 18:51:48 +0100 Subject: configs: meson64: remove amlogic prefix in fdtfile when CONFIG_OF_UPSTREAM is selected Remove amlogic/ path prefix in CFG_EXTRA_ENV_SETTINGS fdtfile when using CONFIG_OF_UPSTREAM, otherwise amlogic/ is added twice. Tested-by: Mattijs Korpershoek # khadas-vim3_android Link: https://lore.kernel.org/r/20240329-u-boot-of-upstream-v2-1-2512ad3eb63d@linaro.org Signed-off-by: Neil Armstrong --- include/configs/meson64.h | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'include/configs') diff --git a/include/configs/meson64.h b/include/configs/meson64.h index efab9a624dc..65fa5f3d6dd 100644 --- a/include/configs/meson64.h +++ b/include/configs/meson64.h @@ -120,6 +120,12 @@ #include +#ifdef CONFIG_OF_UPSTREAM +#define FDTFILE_NAME CONFIG_DEFAULT_DEVICE_TREE ".dtb" +#else +#define FDTFILE_NAME "amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb" +#endif + #ifndef CFG_EXTRA_ENV_SETTINGS #define CFG_EXTRA_ENV_SETTINGS \ "stdin=" STDIN_CFG "\0" \ @@ -133,7 +139,7 @@ "pxefile_addr_r=" PXEFILE_ADDR_R "\0" \ "fdtoverlay_addr_r=" FDTOVERLAY_ADDR_R "\0" \ "ramdisk_addr_r=" RAMDISK_ADDR_R "\0" \ - "fdtfile=amlogic/" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ + "fdtfile=" FDTFILE_NAME "\0" \ "dfu_alt_info=fitimage ram " KERNEL_ADDR_R " 0x4000000 \0" \ BOOTENV #endif -- cgit v1.3.1