Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 23:24:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

arm: exynos: Remove duplicated "boardname" env setting

Browse source 
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>
This commit is contained in:
Krzysztof Kozlowski 2019-02-22 19:36:43 +01:00 committed by Minkyu Kang
parent d9cab9f920
commit e6b1467081
4 changed files with 13 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
board/samsung/common/bootscripts/autoboot.cmd
View file

@ -3,7 +3,7 @@
# ./tools/mkimage -c none -A arm -T script -d autoboot.cmd boot.scr # ./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: # 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 # system dependent: mmcbootdev, mmcbootpart, mmcrootdev, mmcrootpart, rootfstype
# #
setenv fdtaddr "40800000" setenv fdtaddr "40800000"
@ -35,17 +35,17 @@ else
setenv initrd_addr -; setenv initrd_addr -;
fi;" 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 " setenv setboot_fit "
if test -e '${boardname}'; then if test -e '${board_name}'; then
setenv fdt_addr ; setenv fdt_addr ;
setenv initrd_addr ; setenv initrd_addr ;
setenv kerneladdr 0x42000000; setenv kerneladdr 0x42000000;
setenv kernelname Image.itb; setenv kernelname Image.itb;
setenv itbcfg "\"#${boardname}\""; setenv itbcfg "\"#${board_name}\"";
setenv imgbootcmd bootm; setenv imgbootcmd bootm;
else else
echo Warning! Variable: \$boardname is undefined!; echo Warning! Variable: \$board_name is undefined!;
fi" fi"
#### Routine: setboot_uimg - prepare env to boot uImage #### Routine: setboot_uimg - prepare env to boot uImage

2
board/samsung/common/misc.c
View file

@ -101,7 +101,7 @@ void set_board_info(void)
bdtype = ""; bdtype = "";
sprintf(info, "%s%s", bdname, bdtype); sprintf(info, "%s%s", bdname, bdtype);
env_set("boardname", info); env_set("board_name", info);
#endif #endif
snprintf(info, ARRAY_SIZE(info), "%s%x-%s%s.dtb", snprintf(info, ARRAY_SIZE(info), "%s%x-%s%s.dtb",
CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype); CONFIG_SYS_SOC, s5p_cpu_id, bdname, bdtype);

2
include/configs/odroid.h
View file

@ -132,7 +132,7 @@
"setenv kernelname Image.itb;" \ "setenv kernelname Image.itb;" \
"run loadkernel;" \ "run loadkernel;" \
"run kernel_args;" \ "run kernel_args;" \
"bootm ${kernel_addr_r}#${boardname}\0" \ "bootm ${kernel_addr_r}#${board_name}\0" \
"boot_uimg=" \ "boot_uimg=" \
"setenv kernelname uImage;" \ "setenv kernelname uImage;" \
"run check_dtb;" \ "run check_dtb;" \

8
include/configs/odroid_xu3.h
View file

@ -84,10 +84,14 @@
#define CONFIG_SET_DFU_ALT_INFO #define CONFIG_SET_DFU_ALT_INFO
#define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K) #define CONFIG_SET_DFU_ALT_BUF_LEN (SZ_1K)
/* Set soc_rev, soc_id, board_rev, boardname, fdtfile */ /* Set soc_rev, soc_id, board_rev, board_name, fdtfile */
#define CONFIG_ODROID_REV_AIN 9 #define CONFIG_ODROID_REV_AIN 9
#define CONFIG_REVISION_TAG #define CONFIG_REVISION_TAG
/*
* Need to override existing one (smdk5420) with odroid so set_board_info will
* use proper prefix when creating full board_name (SYS_BOARD + type)
*/
#undef CONFIG_SYS_BOARD #undef CONFIG_SYS_BOARD
#define CONFIG_SYS_BOARD "odroid" #define CONFIG_SYS_BOARD "odroid"
@ -101,7 +105,7 @@
"rootfstype=ext4\0" \ "rootfstype=ext4\0" \
"console=" CONFIG_DEFAULT_CONSOLE \ "console=" CONFIG_DEFAULT_CONSOLE \
"fdtfile=exynos5422-odroidxu3.dtb\0" \ "fdtfile=exynos5422-odroidxu3.dtb\0" \
"boardname=odroidxu3\0" \ "board_name=odroidxu3\0" \
"mmcbootdev=0\0" \ "mmcbootdev=0\0" \
"mmcrootdev=0\0" \ "mmcrootdev=0\0" \
"mmcbootpart=1\0" \ "mmcbootpart=1\0" \