Populate the fdtfile environment variable based on CONFIG_DEFAULT_FDT_FILE. Allow to override this default behavior via FDTFILE.
Set CONFIG_DEFAULT_FDT_FILE for the GeekBox.
Signed-off-by: Andreas Färber afaerber@suse.de --- configs/geekbox_defconfig | 1 + include/configs/rk3368_common.h | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/configs/geekbox_defconfig b/configs/geekbox_defconfig index f5783100c0..5e4d5f03a4 100644 --- a/configs/geekbox_defconfig +++ b/configs/geekbox_defconfig @@ -4,6 +4,7 @@ CONFIG_ROCKCHIP_RK3368=y CONFIG_TARGET_GEEKBOX=y CONFIG_DEFAULT_DEVICE_TREE="rk3368-geekbox" CONFIG_HUSH_PARSER=y +CONFIG_DEFAULT_FDT_FILE="rockchip/rk3368-geekbox.dtb" # CONFIG_DISPLAY_CPUINFO is not set # CONFIG_CMD_IMLS is not set CONFIG_REGMAP=y diff --git a/include/configs/rk3368_common.h b/include/configs/rk3368_common.h index d4fd54492c..0208e6f9f2 100644 --- a/include/configs/rk3368_common.h +++ b/include/configs/rk3368_common.h @@ -35,8 +35,13 @@
#include <config_distro_bootcmd.h>
+#ifndef FDTFILE +#define FDTFILE "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" +#endif + #define CONFIG_EXTRA_ENV_SETTINGS \ - BOOTENV + BOOTENV \ + FDTFILE
#endif