From ee53b59511a60d2e12c17b245ad754ac893c8cb6 Mon Sep 17 00:00:00 2001 From: "Andrew F. Davis" Date: Mon, 12 Aug 2019 15:59:53 -0400 Subject: [PATCH] configs: Remove unneeded overlay_files environment variable The variable 'name_overlays' serves the same purpose. Remove 'overlay_files' and use 'name_overlays' everywhere. Signed-off-by: Andrew F. Davis --- include/configs/am65x_evm.h | 5 ++--- include/configs/j721e_evm.h | 6 ++---- 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/include/configs/am65x_evm.h b/include/configs/am65x_evm.h index 1415bb1b15..6072e4a48c 100644 --- a/include/configs/am65x_evm.h +++ b/include/configs/am65x_evm.h @@ -66,8 +66,7 @@ #define EXTRA_ENV_AM65X_BOARD_SETTINGS \ "findfdt=" \ "setenv name_fdt k3-am654-base-board.dtb;" \ - "setenv fdtfile ${name_fdt};" \ - "setenv overlay_files ${name_overlays}\0" \ + "setenv fdtfile ${name_fdt}\0" \ "loadaddr=0x80080000\0" \ "fdtaddr=0x82000000\0" \ "overlayaddr=0x83000000\0" \ @@ -88,7 +87,7 @@ "get_overlay_mmc=" \ "fdt address ${fdtaddr};" \ "fdt resize 0x100000;" \ - "for overlay in $overlay_files;" \ + "for overlay in $name_overlays;" \ "do;" \ "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay};" \ "fdt apply ${overlayaddr};" \ diff --git a/include/configs/j721e_evm.h b/include/configs/j721e_evm.h index 5b35e22c85..f8d4d7bdf8 100644 --- a/include/configs/j721e_evm.h +++ b/include/configs/j721e_evm.h @@ -60,9 +60,7 @@ /* U-Boot general configuration */ #define EXTRA_ENV_J721E_BOARD_SETTINGS \ "default_device_tree=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ - "findfdt=" \ - "setenv fdtfile ${default_device_tree};" \ - "setenv overlay_files ${name_overlays}\0" \ + "findfdt=setenv fdtfile ${default_device_tree}\0" \ "loadaddr=0x80080000\0" \ "fdtaddr=0x82000000\0" \ "overlayaddr=0x83000000\0" \ @@ -83,7 +81,7 @@ "get_overlay_mmc=" \ "fdt address ${fdtaddr};" \ "fdt resize 0x100000;" \ - "for overlay in $overlay_files;" \ + "for overlay in $name_overlays;" \ "do;" \ "load mmc ${bootpart} ${overlayaddr} ${bootdir}/${overlay} && " \ "fdt apply ${overlayaddr};" \ -- 2.25.1