leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dragonboard410c: Migrate to using CONFIG_EXTRA_ENV_TEXT

Browse Source 
With the exception of distro_boot support, we can move all of the rest
of the environment changes to come from CONFIG_EXTRA_ENV_TEXT and in
turn remove CONFIG_ENV_REFLASH.

Cc: Ramon Fried <rfried.dev@gmail.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-06-13 22:57:32 -04:00
parent 07b9642841
commit 5c3f6a3206
2 changed files with 38 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
board/qualcomm/dragonboard410c/dragonboard410c.env Normal file
View File

@ -0,0 +1,36 @@
/* SPDX-License-Identifier: GPL-2.0+ */
/* Does what recovery does */
#define REFLASH(file, partnum) \
part start mmc 0 partnum start && \
part size mmc 0 partnum size && \
tftp $loadaddr file && \
mmc write $loadaddr $start $size &&
reflash=
mmc dev 0 &&
usb start &&
dhcp &&
tftp $loadaddr dragonboard/rescue/gpt_both0.bin &&
mmc write $loadaddr 0 43 &&
mmc rescan &&
REFLASH(dragonboard/rescue/NON-HLOS.bin, 1)
REFLASH(dragonboard/rescue/sbl1.mbn, 2)
REFLASH(dragonboard/rescue/rpm.mbn, 3)
REFLASH(dragonboard/rescue/tz.mbn, 4)
REFLASH(dragonboard/rescue/hyp.mbn, 5)
REFLASH(dragonboard/rescue/sec.dat, 6)
REFLASH(dragonboard/rescue/emmc_appsboot.mbn, 7)
REFLASH(dragonboard/u-boot.img, 8)
usb stop &&
echo Reflash completed
loadaddr=0x81000000
initrd_high=0xffffffffffffffff
linux_image=Image
kernel_addr_r=0x81000000
fdtfile=qcom/apq8016-sbc.dtb
fdt_addr_r=0x83000000
ramdisk_addr_r=0x84000000
scriptaddr=0x90000000
pxefile_addr_r=0x90100000

42
include/configs/dragonboard410c.h
View File

@ -20,8 +20,7 @@
#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1 #define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM_1
#define CONFIG_SYS_BOOTM_LEN SZ_64M #define CONFIG_SYS_BOOTM_LEN SZ_64M
/* UART */ /* Environment */
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(USB, usb, 0) \ func(USB, usb, 0) \
func(MMC, mmc, 1) \ func(MMC, mmc, 1) \
@ -30,43 +29,6 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
/* Does what recovery does */ #define CONFIG_EXTRA_ENV_SETTINGS BOOTENV
#define REFLASH(file, part) \
"part start mmc 0 "#part" start && "\
"part size mmc 0 "#part" size && "\
"tftp $loadaddr "#file" && " \
"mmc write $loadaddr $start $size && "
#define CONFIG_ENV_REFLASH \
"mmc dev 0 && "\
"usb start && "\
"dhcp && "\
"tftp $loadaddr dragonboard/rescue/gpt_both0.bin && "\
"mmc write $loadaddr 0 43 && " \
"mmc rescan && "\
REFLASH(dragonboard/rescue/NON-HLOS.bin, 1)\
REFLASH(dragonboard/rescue/sbl1.mbn, 2)\
REFLASH(dragonboard/rescue/rpm.mbn, 3)\
REFLASH(dragonboard/rescue/tz.mbn, 4)\
REFLASH(dragonboard/rescue/hyp.mbn, 5)\
REFLASH(dragonboard/rescue/sec.dat, 6)\
REFLASH(dragonboard/rescue/emmc_appsboot.mbn, 7)\
REFLASH(dragonboard/u-boot.img, 8)\
"usb stop &&"\
"echo Reflash completed"
/* Environment */
#define CONFIG_EXTRA_ENV_SETTINGS \
"reflash="CONFIG_ENV_REFLASH"\0"\
"loadaddr=0x81000000\0" \
"initrd_high=0xffffffffffffffff\0" \
"linux_image=Image\0" \
"kernel_addr_r=0x81000000\0"\
"fdtfile=qcom/apq8016-sbc.dtb\0" \
"fdt_addr_r=0x83000000\0"\
"ramdisk_addr_r=0x84000000\0"\
"scriptaddr=0x90000000\0"\
"pxefile_addr_r=0x90100000\0"\
BOOTENV
#endif #endif