Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 68d70a1cf6f0d4f7f013af1652b1525042f38daf

Authored by Bin Meng
1 parent 00f237e226
Exists in smarc_8mq_lf_v2020.04 and in 10 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

x86: qemu: Fix non-working ramboot and nfsboot environment variables 

With qemu-x86 starting to use config_distro_bootcmd, the pre-defined
ramboot and nfsboot commands do not work any more. This is caused by
undefined environment variable 'ramdiskaddr' that was previously set
in CONFIG_EXTRA_ENV_SETTINGS but later CONFIG_EXTRA_ENV_SETTINGS was
redefined for distro boot.

Update the x86 generic CONFIG_EXTRA_ENV_SETTINGS to consider distro
boot, and remove the one in qemu-x86.h.

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>

Showing 2 changed files with 14 additions and 17 deletions Side-by-side Diff

include/configs/qemu-x86.h
Diff comments   View file @ 68d70a1
... ... @@ -27,16 +27,6 @@
27 27  
28 28 #define CONFIG_PREBOOT "pci enum"
29 29  
30   -#undef CONFIG_EXTRA_ENV_SETTINGS
31   -#define CONFIG_EXTRA_ENV_SETTINGS \
32   - CONFIG_STD_DEVICES_SETTINGS \
33   - "scriptaddr=0x7000000\0" \
34   - "kernel_addr_r=0x1000000\0" \
35   - "ramdisk_addr_r=0x4000000\0" \
36   - "consoledev=ttyS0\0" \
37   - CONFIG_OTHBOOTARGS \
38   - BOOTENV
39   -
40 30 #define CONFIG_SYS_MONITOR_LEN (1 << 20)
41 31  
42 32 #define CONFIG_STD_DEVICES_SETTINGS "stdin=serial,i8042-kbd\0" \
include/configs/x86-common.h
Diff comments   View file @ 68d70a1
... ... @@ -105,30 +105,37 @@
105 105 #define CONFIG_OTHBOOTARGS "othbootargs=acpi=off\0"
106 106 #endif
107 107  
  108 +#ifndef CONFIG_DISTRO_DEFAULTS
  109 +#define BOOTENV
  110 +#endif
  111 +
108 112 #define CONFIG_EXTRA_ENV_SETTINGS \
109 113 CONFIG_STD_DEVICES_SETTINGS \
110 114 "pciconfighost=1\0" \
111 115 "netdev=eth0\0" \
112 116 "consoledev=ttyS0\0" \
113 117 CONFIG_OTHBOOTARGS \
114   - "ramdiskaddr=0x4000000\0" \
115   - "ramdiskfile=initramfs.gz\0"
  118 + "scriptaddr=0x7000000\0" \
  119 + "kernel_addr_r=0x1000000\0" \
  120 + "ramdisk_addr_r=0x4000000\0" \
  121 + "ramdiskfile=initramfs.gz\0" \
  122 + BOOTENV
116 123  
117 124 #define CONFIG_RAMBOOTCOMMAND \
118 125 "setenv bootargs root=/dev/ram rw " \
119 126 "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
120 127 "console=$consoledev,$baudrate $othbootargs;" \
121   - "tftpboot $loadaddr $bootfile;" \
122   - "tftpboot $ramdiskaddr $ramdiskfile;" \
123   - "zboot $loadaddr 0 $ramdiskaddr $filesize"
  128 + "tftpboot $kernel_addr_r $bootfile;" \
  129 + "tftpboot $ramdisk_addr_r $ramdiskfile;" \
  130 + "zboot $kernel_addr_r 0 $ramdisk_addr_r $filesize"
124 131  
125 132 #define CONFIG_NFSBOOTCOMMAND \
126 133 "setenv bootargs root=/dev/nfs rw " \
127 134 "nfsroot=$serverip:$rootpath " \
128 135 "ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off " \
129 136 "console=$consoledev,$baudrate $othbootargs;" \
130   - "tftpboot $loadaddr $bootfile;" \
131   - "zboot $loadaddr"
  137 + "tftpboot $kernel_addr_r $bootfile;" \
  138 + "zboot $kernel_addr_r"
132 139  
133 140  
134 141 #endif /* __CONFIG_H */