Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Librem5
uboot-imx
Commits
fb1547fd
Commit
fb1547fd
authored
Apr 21, 2018
by
Sergei Poselenov
Browse files
RM 2522. Revert part of the changes of b56966e92907, so "mmcroot" would
be updated automatically for MMC or SD boot.
parent
525db883
Changes
2
Hide whitespace changes
Inline
Side-by-side
include/configs/imx8m_lpddr4_som.h
View file @
fb1547fd
...
...
@@ -163,9 +163,10 @@
"boot_fdt=try\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"sddev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"sdpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT "\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"mmcautodetect=yes\0" \
"args_common=console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 " \
"video=HDMI-A-1:1920x1080-32@60\0" \
"args_quiet=setenv bootargs ${args_common} quiet=quiet\0" \
...
...
@@ -173,33 +174,33 @@
"args=run args_quiet\0" \
"netargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"
sd
args=setenv bootargs ${bootargs} root=${mmcroot}
rootwait rw
\0 " \
"loadbootscript=fatload mmc ${
sd
dev}:${
sd
part} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from
SD card
...; " \
"
mmc
args=setenv bootargs ${bootargs} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${
mmc
dev}:${
mmc
part} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from
mmc
...; " \
"source\0" \
"loadimage=fatload mmc ${
sd
dev}:${
sd
part} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${
sd
dev}:${
sd
part} ${fdt_addr} ${fdt_file}\0" \
"loadimage=fatload mmc ${
mmc
dev}:${
mmc
part} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${
mmc
dev}:${
mmc
part} ${fdt_addr} ${fdt_file}\0" \
"rtos_file=imx8mq_m4_TCM_rpmsg_lite_str_echo_rtos.bin\0" \
"rtos_bootaddr=0x7e0000\0" \
"rtos
sd
boot=fatload mmc ${
sd
dev}:${
sd
part} ${rtos_bootaddr} " \
"rtos
mmc
boot=fatload mmc ${
mmc
dev}:${
mmc
part} ${rtos_bootaddr} " \
"${rtos_file} && bootaux ${rtos_bootaddr}\0" \
"rtosnetboot=tftp ${rtos_bootaddr} ${rtos_file} && "\
"bootaux ${rtos_bootaddr}\0"\
"rtosboot=run rtos
sd
boot\0" \
"
sd
boot=echo Booting from
SD card
...; " \
"mmc dev ${
sd
dev}; if mmc rescan; then " \
"rtosboot=run rtos
mmc
boot\0" \
"
mmc
boot=echo Booting from
mmc
...; " \
"mmc dev ${
mmc
dev}; if mmc rescan; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"run rtosboot; " \
"run args
sd
args addip loadfdt && run loadimage && " \
"run args
mmc
args addip loadfdt && run loadimage && " \
"booti ${loadaddr} - ${fdt_addr};" \
"fi;" \
"fi\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
"netboot=echo Booting from net ...; " \
"run args
sd
args; " \
"run args
mmc
args; " \
"if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \
"else " \
...
...
@@ -209,7 +210,7 @@
"${get_cmd} ${loadaddr} ${image} && " \
"${get_cmd} ${fdt_addr} ${fdt_file} && " \
"run addip && booti ${loadaddr} - ${fdt_addr};\0"
#define CONFIG_BOOTCOMMAND "run
sd
boot"
#define CONFIG_BOOTCOMMAND "run
mmc
boot"
#endif
/* Link Definitions */
...
...
include/configs/imx8m_som.h
View file @
fb1547fd
...
...
@@ -163,9 +163,10 @@
"boot_fdt=try\0" \
"initrd_addr=0x43800000\0" \
"initrd_high=0xffffffffffffffff\0" \
"sddev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"sdpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT "\0" \
"mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
"mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
"mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
"mmcautodetect=yes\0" \
"args_common=console=ttymxc0,115200 earlycon=ec_imx6q,0x30860000,115200 " \
"video=HDMI-A-1:1920x1080-32@60\0" \
"args_quiet=setenv bootargs ${args_common} quiet=quiet\0" \
...
...
@@ -173,25 +174,25 @@
"args=run args_quiet\0" \
"netargs=setenv bootargs ${bootargs} " \
"root=/dev/nfs nfsroot=${serverip}:${nfsroot},v3,tcp\0" \
"
sd
args=setenv bootargs ${bootargs} root=${mmcroot}
rootwait rw
\0 " \
"loadbootscript=fatload mmc ${
sd
dev}:${
sd
part} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from
SD card
...; " \
"
mmc
args=setenv bootargs ${bootargs} root=${mmcroot}\0 " \
"loadbootscript=fatload mmc ${
mmc
dev}:${
mmc
part} ${loadaddr} ${script};\0" \
"bootscript=echo Running bootscript from
mmc
...; " \
"source\0" \
"loadimage=fatload mmc ${
sd
dev}:${
sd
part} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${
sd
dev}:${
sd
part} ${fdt_addr} ${fdt_file}\0" \
"
sd
boot=echo Booting from
SD card
...; " \
"mmc dev ${
sd
dev}; if mmc rescan; then " \
"loadimage=fatload mmc ${
mmc
dev}:${
mmc
part} ${loadaddr} ${image}\0" \
"loadfdt=fatload mmc ${
mmc
dev}:${
mmc
part} ${fdt_addr} ${fdt_file}\0" \
"
mmc
boot=echo Booting from
mmc
...; " \
"mmc dev ${
mmc
dev}; if mmc rescan; then " \
"if run loadbootscript; then " \
"run bootscript; " \
"else " \
"run args
sd
args addip loadfdt && run loadimage && " \
"run args
mmc
args addip loadfdt && run loadimage && " \
"booti ${loadaddr} - ${fdt_addr};" \
"fi;" \
"fi\0" \
"addip=setenv bootargs ${bootargs} ip=${ipaddr}:${serverip}:${gatewayip}:" \
"${netmask}:${hostname}:eth0:off\0" \
"netboot=echo Booting from net ...; " \
"run args
sd
args; " \
"run args
mmc
args; " \
"if test ${ip_dyn} = yes; then " \
"setenv get_cmd dhcp; " \
"else " \
...
...
@@ -200,7 +201,7 @@
"${get_cmd} ${loadaddr} ${image} && " \
"${get_cmd} ${fdt_addr} ${fdt_file} && " \
"run addip && booti ${loadaddr} - ${fdt_addr};\0"
#define CONFIG_BOOTCOMMAND "run
sd
boot"
#define CONFIG_BOOTCOMMAND "run
mmc
boot"
#endif
/* Link Definitions */
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment