diff options
| author | Krzysztof Kozlowski <krzk@kernel.org> | 2019-02-22 19:36:43 +0100 |
|---|---|---|
| committer | Minkyu Kang <mk7.kang@samsung.com> | 2019-03-11 15:53:29 +0900 |
| commit | e6b1467081d3fb3f86933a14cda1d864eb0e6ac8 (patch) | |
| tree | 1c451430afc28ab72470dacc84a94fbf58bbda96 /board/samsung | |
| parent | d9cab9f92060cc19e3b79ec98cf2aa192d1be474 (diff) | |
| download | u-boot-e6b1467081d3fb3f86933a14cda1d864eb0e6ac8.tar.gz | |
arm: exynos: Remove duplicated "boardname" env setting
Various places in the code set "boardname" env property. It was used
for booting from ITB images and choosing proper DTB file name. Instead
of duplicating it, use existing U-Boot wide - "board_name".
Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org>
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
Diffstat (limited to 'board/samsung')
| -rw-r--r-- | board/samsung/common/bootscripts/autoboot.cmd | 10 | ||||
| -rw-r--r-- | board/samsung/common/misc.c | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/board/samsung/common/bootscripts/autoboot.cmd b/board/samsung/common/bootscripts/autoboot.cmd index 11c724c4e0..d66bcccf5d 100644 --- a/board/samsung/common/bootscripts/autoboot.cmd +++ b/board/samsung/common/bootscripts/autoboot.cmd @@ -3,7 +3,7 @@ # ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr # # It requires a list of environment variables to be defined before load: -# platform dependent: boardname, fdtfile, console +# platform dependent: board_name, fdtfile, console # system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype # setenv fdtaddr "40800000" @@ -35,17 +35,17 @@ else setenv initrd_addr -; fi;" -#### Routine: boot_fit - check that env $boardname is set and boot proper config of ITB image +#### Routine: boot_fit - check that env $board_name is set and boot proper config of ITB image setenv setboot_fit " -if test -e '${boardname}'; then +if test -e '${board_name}'; then setenv fdt_addr ; setenv initrd_addr ; setenv kerneladdr 0x42000000; setenv kernelname Image.itb; - setenv itbcfg "\"#${boardname}\""; + setenv itbcfg "\"#${board_name}\""; setenv imgbootcmd bootm; else - echo Warning! Variable: \$boardname is undefined!; + echo Warning! Variable: \$board_name is undefined!; fi" #### Routine: setboot_uimg - prepare env to boot uImage diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 05243fc896..53cd1b2907 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -101,7 +101,7 @@ void set_board_info(void) bdtype = ""; sprintf(info, "%s%s", bdname, bdtype); - env_set("boardname", info); + env_set("board_name", info); #endif snprintf(info, ARRAY_SIZE(info), "%s%x-%s%s.dtb", CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype); |