Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hi, On 21 April 2015 at 02:13, Sjoerd Simons wrote: > Hey Joe, > > On Mon, 2015-04-20 at 23:31 -0500, Joe Hershberger wrote: >> Hi Sjoerd, >> >> On Mon, Apr 13, 2015 at 3:54 PM, Sjoerd Simons >> wrote: >> > Make the sandbox setup more generic/examplary by including >> > config_distro_defaults.h and config_distro_bootcmd.h. >> > >> > Among other things this makes it easy to test whether images will boot >> > though with the standard distro bootcmds by running e.g: >> > u-boot -c 'host bind 0 myimage.img ; boot' >> > >> > By default there are 2 target host devices to emulate device with >> > multiple storage devices (e.g. internal ("host 0") and external >> > ("host 1") and verify that the prioritization and fallbacks do work >> > correctly. >> > >> > Signed-off-by: Sjoerd Simons >> > Reviewed by: Simon Glass >> > Acked-by: Simon Glass >> >> For me this has broken the build of the "env" target. >> >> I get this following error: >> >> In file included from /home/joe/u-boot/tools/env/fw_env.c:117: >> /usr/include/search.h:173: error: expected "}" before >> "BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX" >> make[2]: *** [tools/env/fw_env.o] Error 1 >> make[1]: *** [env] Error 2 >> make: *** [sub-make] Error 2 >> >> I haven't looked closely at the header you've added. Any quick >> thoughts about what's going on? > > Hrm, the problem seems to be that when running "make env" CONFIG_SANDBOX > isn't defined, so you get the error triggered above. > > Essentially that error is trying to tell you - You're trying to build a > config which will cause your boot environment to have commands not > supported by this build.. > > I haven't dug out what exactly causes this difference in definitions but > it does make me wonder whether we should trigger on something more > conventional like CONFIG_CMD_HOST (similar to e.g. CONFIG_CMD_MMC) > rather then CONFIG_SANDBOX That sounds reasonable. Also I think it would be good to add a flag to enable the distro boot feature. At present I always get the bootdelay message and then an error: U-Boot 2015.04-00423-g183ad88 (Apr 23 2015 - 09:05:12) DRAM: 128 MiB Using default environment In:serial Out: lcd Err: lcd Net: Net Initialization Skipped No ethernet found. Hit any key to stop autoboot: 0 Not bound to a backing file Not bound to a backing file I did a similar thing with LCD since it was similarly invasive. Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hey Joe, On Mon, 2015-04-20 at 23:31 -0500, Joe Hershberger wrote: > Hi Sjoerd, > > On Mon, Apr 13, 2015 at 3:54 PM, Sjoerd Simons > wrote: > > Make the sandbox setup more generic/examplary by including > > config_distro_defaults.h and config_distro_bootcmd.h. > > > > Among other things this makes it easy to test whether images will boot > > though with the standard distro bootcmds by running e.g: > > u-boot -c 'host bind 0 myimage.img ; boot' > > > > By default there are 2 target host devices to emulate device with > > multiple storage devices (e.g. internal ("host 0") and external > > ("host 1") and verify that the prioritization and fallbacks do work > > correctly. > > > > Signed-off-by: Sjoerd Simons > > Reviewed by: Simon Glass > > Acked-by: Simon Glass > > For me this has broken the build of the "env" target. > > I get this following error: > > In file included from /home/joe/u-boot/tools/env/fw_env.c:117: > /usr/include/search.h:173: error: expected "}" before > "BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX" > make[2]: *** [tools/env/fw_env.o] Error 1 > make[1]: *** [env] Error 2 > make: *** [sub-make] Error 2 > > I haven't looked closely at the header you've added. Any quick > thoughts about what's going on? Hrm, the problem seems to be that when running "make env" CONFIG_SANDBOX isn't defined, so you get the error triggered above. Essentially that error is trying to tell you - You're trying to build a config which will cause your boot environment to have commands not supported by this build.. I haven't dug out what exactly causes this difference in definitions but it does make me wonder whether we should trigger on something more conventional like CONFIG_CMD_HOST (similar to e.g. CONFIG_CMD_MMC) rather then CONFIG_SANDBOX -- Sjoerd Simons Collabora Ltd. ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hi Sjoerd, On Mon, Apr 13, 2015 at 3:54 PM, Sjoerd Simons wrote: > Make the sandbox setup more generic/examplary by including > config_distro_defaults.h and config_distro_bootcmd.h. > > Among other things this makes it easy to test whether images will boot > though with the standard distro bootcmds by running e.g: > u-boot -c 'host bind 0 myimage.img ; boot' > > By default there are 2 target host devices to emulate device with > multiple storage devices (e.g. internal ("host 0") and external > ("host 1") and verify that the prioritization and fallbacks do work > correctly. > > Signed-off-by: Sjoerd Simons > Reviewed by: Simon Glass > Acked-by: Simon Glass For me this has broken the build of the "env" target. I get this following error: In file included from /home/joe/u-boot/tools/env/fw_env.c:117: /usr/include/search.h:173: error: expected "}" before "BOOT_TARGET_DEVICES_references_HOST_without_CONFIG_SANDBOX" make[2]: *** [tools/env/fw_env.o] Error 1 make[1]: *** [env] Error 2 make: *** [sub-make] Error 2 I haven't looked closely at the header you've added. Any quick thoughts about what's going on? Thanks, -Joe ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
On 13 April 2015 at 16:34, Simon Glass wrote: > Hi Joe, > > On 13 April 2015 at 16:28, Joe Hershberger wrote: >> Hi Sjoerd, >> >> >> On Mon, Apr 13, 2015 at 5:07 PM, Simon Glass wrote: >>> >>> Hi Sjoerd, >>> >>> On 13 April 2015 at 14:54, Sjoerd Simons >>> wrote: >>> > Make the sandbox setup more generic/examplary by including >>> > config_distro_defaults.h and config_distro_bootcmd.h. >>> > >>> > Among other things this makes it easy to test whether images will boot >>> > though with the standard distro bootcmds by running e.g: >>> > u-boot -c 'host bind 0 myimage.img ; boot' >>> > >>> > By default there are 2 target host devices to emulate device with >>> > multiple storage devices (e.g. internal ("host 0") and external >>> > ("host 1") and verify that the prioritization and fallbacks do work >>> > correctly. >>> > >>> > Signed-off-by: Sjoerd Simons >>> > Reviewed by: Simon Glass >>> > Acked-by: Simon Glass >>> >>> Thanks for the updated patch. Please see my question below. >>> >>> > >>> > --- >>> > >>> > Changes in v4: >>> > - Adapt to sandbox networking support >>> > >>> > Changes in v3: None >>> > Changes in v2: None >>> > >>> > include/configs/sandbox.h | 31 +++ >>> > 1 file changed, 23 insertions(+), 8 deletions(-) Applied to u-boot-x86/sandbox, thanks! [snip] ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hi Joe, On 13 April 2015 at 16:28, Joe Hershberger wrote: > Hi Sjoerd, > > > On Mon, Apr 13, 2015 at 5:07 PM, Simon Glass wrote: >> >> Hi Sjoerd, >> >> On 13 April 2015 at 14:54, Sjoerd Simons >> wrote: >> > Make the sandbox setup more generic/examplary by including >> > config_distro_defaults.h and config_distro_bootcmd.h. >> > >> > Among other things this makes it easy to test whether images will boot >> > though with the standard distro bootcmds by running e.g: >> > u-boot -c 'host bind 0 myimage.img ; boot' >> > >> > By default there are 2 target host devices to emulate device with >> > multiple storage devices (e.g. internal ("host 0") and external >> > ("host 1") and verify that the prioritization and fallbacks do work >> > correctly. >> > >> > Signed-off-by: Sjoerd Simons >> > Reviewed by: Simon Glass >> > Acked-by: Simon Glass >> >> Thanks for the updated patch. Please see my question below. >> >> > >> > --- >> > >> > Changes in v4: >> > - Adapt to sandbox networking support >> > >> > Changes in v3: None >> > Changes in v2: None >> > >> > include/configs/sandbox.h | 31 +++ >> > 1 file changed, 23 insertions(+), 8 deletions(-) >> > >> > diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h >> > index 0a36719..3bf45a2 100644 >> > --- a/include/configs/sandbox.h >> > +++ b/include/configs/sandbox.h >> > @@ -73,7 +73,6 @@ >> > #define CONFIG_CMDLINE_EDITING >> > #define CONFIG_COMMAND_HISTORY >> > #define CONFIG_AUTO_COMPLETE >> > -#define CONFIG_BOOTDELAY 3 >> > >> > #define CONFIG_ENV_SIZE8192 >> > #define CONFIG_ENV_IS_NOWHERE >> > @@ -120,26 +119,31 @@ >> > >> > /* include default commands */ >> > #include >> > +#include > > This include already has some of the commands removed below. > >> > + >> > +#define BOOT_TARGET_DEVICES(func) \ >> > + func(HOST, host, 1) \ >> > + func(HOST, host, 0) >> > + >> > +#include >> > >> > #define CONFIG_KEEP_SERVERADDR >> > #define CONFIG_UDP_CHECKSUM >> > #define CONFIG_CMD_LINK_LOCAL >> > #define CONFIG_CMD_CDP >> > #define CONFIG_CMD_DNS >> > -#define CONFIG_CMD_NFS > > It looks like this one is already defined in config_cmd_default.h. > >> > #define CONFIG_CMD_SNTP >> > #define CONFIG_TIMESTAMP >> > #define CONFIG_CMD_RARP >> > -#define CONFIG_CMD_PING >> > -#define CONFIG_CMD_DHCP >> > #define CONFIG_BOOTP_DNS >> > #define CONFIG_BOOTP_DNS2 >> > -#define CONFIG_BOOTP_GATEWAY >> > #define CONFIG_BOOTP_SEND_HOSTNAME >> > #define CONFIG_BOOTP_SERVERIP >> > -#define CONFIG_BOOTP_SUBNETMASK >> >> Why are you removing these commands? > > I had the same reaction initially... These are being defined already in the > new include above. > Ah, OK thanks. - Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hi Sjoerd, On Mon, Apr 13, 2015 at 5:07 PM, Simon Glass wrote: > > Hi Sjoerd, > > On 13 April 2015 at 14:54, Sjoerd Simons wrote: > > Make the sandbox setup more generic/examplary by including > > config_distro_defaults.h and config_distro_bootcmd.h. > > > > Among other things this makes it easy to test whether images will boot > > though with the standard distro bootcmds by running e.g: > > u-boot -c 'host bind 0 myimage.img ; boot' > > > > By default there are 2 target host devices to emulate device with > > multiple storage devices (e.g. internal ("host 0") and external > > ("host 1") and verify that the prioritization and fallbacks do work > > correctly. > > > > Signed-off-by: Sjoerd Simons > > Reviewed by: Simon Glass > > Acked-by: Simon Glass > > Thanks for the updated patch. Please see my question below. > > > > > --- > > > > Changes in v4: > > - Adapt to sandbox networking support > > > > Changes in v3: None > > Changes in v2: None > > > > include/configs/sandbox.h | 31 +++ > > 1 file changed, 23 insertions(+), 8 deletions(-) > > > > diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h > > index 0a36719..3bf45a2 100644 > > --- a/include/configs/sandbox.h > > +++ b/include/configs/sandbox.h > > @@ -73,7 +73,6 @@ > > #define CONFIG_CMDLINE_EDITING > > #define CONFIG_COMMAND_HISTORY > > #define CONFIG_AUTO_COMPLETE > > -#define CONFIG_BOOTDELAY 3 > > > > #define CONFIG_ENV_SIZE8192 > > #define CONFIG_ENV_IS_NOWHERE > > @@ -120,26 +119,31 @@ > > > > /* include default commands */ > > #include > > +#include This include already has some of the commands removed below. > > + > > +#define BOOT_TARGET_DEVICES(func) \ > > + func(HOST, host, 1) \ > > + func(HOST, host, 0) > > + > > +#include > > > > #define CONFIG_KEEP_SERVERADDR > > #define CONFIG_UDP_CHECKSUM > > #define CONFIG_CMD_LINK_LOCAL > > #define CONFIG_CMD_CDP > > #define CONFIG_CMD_DNS > > -#define CONFIG_CMD_NFS It looks like this one is already defined in config_cmd_default.h. > > #define CONFIG_CMD_SNTP > > #define CONFIG_TIMESTAMP > > #define CONFIG_CMD_RARP > > -#define CONFIG_CMD_PING > > -#define CONFIG_CMD_DHCP > > #define CONFIG_BOOTP_DNS > > #define CONFIG_BOOTP_DNS2 > > -#define CONFIG_BOOTP_GATEWAY > > #define CONFIG_BOOTP_SEND_HOSTNAME > > #define CONFIG_BOOTP_SERVERIP > > -#define CONFIG_BOOTP_SUBNETMASK > > Why are you removing these commands? I had the same reaction initially... These are being defined already in the new include above. > > #define CONFIG_IP_DEFRAG > > > > +/* Can't boot elf images */ > > +#undef CONFIG_CMD_ELF > > + > > #define CONFIG_CMD_HASH > > #define CONFIG_HASH_VERIFY > > #define CONFIG_SHA1 > > @@ -182,8 +186,19 @@ > > "eth5addr=00:00:11:22:33:46\0" \ > > "ipaddr=1.2.3.4\0" > > > > -#define CONFIG_EXTRA_ENV_SETTINGS SANDBOX_SERIAL_SETTINGS \ > > - SANDBOX_ETH_SETTINGS > > +#define MEM_LAYOUT_ENV_SETTINGS \ > > + "bootm_size=0x1000\0" \ > > + "kernel_addr_r=0x100\0" \ > > + "fdt_addr_r=0xc0\0" \ > > + "ramdisk_addr_r=0x200\0" \ > > + "scriptaddr=0x1000\0" \ > > + "pxefile_addr_r=0x2000\0" > > + > > +#define CONFIG_EXTRA_ENV_SETTINGS \ > > + SANDBOX_SERIAL_SETTINGS \ > > + SANDBOX_ETH_SETTINGS \ > > + BOOTENV \ > > + MEM_LAYOUT_ENV_SETTINGS > > > > #define CONFIG_GZIP_COMPRESSED > > #define CONFIG_BZIP2 > > -- > > 2.1.4 > > > > Regards, > Simon > ___ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
Re: [U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Hi Sjoerd, On 13 April 2015 at 14:54, Sjoerd Simons wrote: > Make the sandbox setup more generic/examplary by including > config_distro_defaults.h and config_distro_bootcmd.h. > > Among other things this makes it easy to test whether images will boot > though with the standard distro bootcmds by running e.g: > u-boot -c 'host bind 0 myimage.img ; boot' > > By default there are 2 target host devices to emulate device with > multiple storage devices (e.g. internal ("host 0") and external > ("host 1") and verify that the prioritization and fallbacks do work > correctly. > > Signed-off-by: Sjoerd Simons > Reviewed by: Simon Glass > Acked-by: Simon Glass Thanks for the updated patch. Please see my question below. > > --- > > Changes in v4: > - Adapt to sandbox networking support > > Changes in v3: None > Changes in v2: None > > include/configs/sandbox.h | 31 +++ > 1 file changed, 23 insertions(+), 8 deletions(-) > > diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h > index 0a36719..3bf45a2 100644 > --- a/include/configs/sandbox.h > +++ b/include/configs/sandbox.h > @@ -73,7 +73,6 @@ > #define CONFIG_CMDLINE_EDITING > #define CONFIG_COMMAND_HISTORY > #define CONFIG_AUTO_COMPLETE > -#define CONFIG_BOOTDELAY 3 > > #define CONFIG_ENV_SIZE8192 > #define CONFIG_ENV_IS_NOWHERE > @@ -120,26 +119,31 @@ > > /* include default commands */ > #include > +#include > + > +#define BOOT_TARGET_DEVICES(func) \ > + func(HOST, host, 1) \ > + func(HOST, host, 0) > + > +#include > > #define CONFIG_KEEP_SERVERADDR > #define CONFIG_UDP_CHECKSUM > #define CONFIG_CMD_LINK_LOCAL > #define CONFIG_CMD_CDP > #define CONFIG_CMD_DNS > -#define CONFIG_CMD_NFS > #define CONFIG_CMD_SNTP > #define CONFIG_TIMESTAMP > #define CONFIG_CMD_RARP > -#define CONFIG_CMD_PING > -#define CONFIG_CMD_DHCP > #define CONFIG_BOOTP_DNS > #define CONFIG_BOOTP_DNS2 > -#define CONFIG_BOOTP_GATEWAY > #define CONFIG_BOOTP_SEND_HOSTNAME > #define CONFIG_BOOTP_SERVERIP > -#define CONFIG_BOOTP_SUBNETMASK Why are you removing these commands? > #define CONFIG_IP_DEFRAG > > +/* Can't boot elf images */ > +#undef CONFIG_CMD_ELF > + > #define CONFIG_CMD_HASH > #define CONFIG_HASH_VERIFY > #define CONFIG_SHA1 > @@ -182,8 +186,19 @@ > "eth5addr=00:00:11:22:33:46\0" \ > "ipaddr=1.2.3.4\0" > > -#define CONFIG_EXTRA_ENV_SETTINGS SANDBOX_SERIAL_SETTINGS \ > - SANDBOX_ETH_SETTINGS > +#define MEM_LAYOUT_ENV_SETTINGS \ > + "bootm_size=0x1000\0" \ > + "kernel_addr_r=0x100\0" \ > + "fdt_addr_r=0xc0\0" \ > + "ramdisk_addr_r=0x200\0" \ > + "scriptaddr=0x1000\0" \ > + "pxefile_addr_r=0x2000\0" > + > +#define CONFIG_EXTRA_ENV_SETTINGS \ > + SANDBOX_SERIAL_SETTINGS \ > + SANDBOX_ETH_SETTINGS \ > + BOOTENV \ > + MEM_LAYOUT_ENV_SETTINGS > > #define CONFIG_GZIP_COMPRESSED > #define CONFIG_BZIP2 > -- > 2.1.4 > Regards, Simon ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
[U-Boot] [PATCH v4 9/9] sandbox: add config_distro_defaults and config_distro_bootcmd
Make the sandbox setup more generic/examplary by including config_distro_defaults.h and config_distro_bootcmd.h. Among other things this makes it easy to test whether images will boot though with the standard distro bootcmds by running e.g: u-boot -c 'host bind 0 myimage.img ; boot' By default there are 2 target host devices to emulate device with multiple storage devices (e.g. internal ("host 0") and external ("host 1") and verify that the prioritization and fallbacks do work correctly. Signed-off-by: Sjoerd Simons Reviewed by: Simon Glass Acked-by: Simon Glass --- Changes in v4: - Adapt to sandbox networking support Changes in v3: None Changes in v2: None include/configs/sandbox.h | 31 +++ 1 file changed, 23 insertions(+), 8 deletions(-) diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 0a36719..3bf45a2 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -73,7 +73,6 @@ #define CONFIG_CMDLINE_EDITING #define CONFIG_COMMAND_HISTORY #define CONFIG_AUTO_COMPLETE -#define CONFIG_BOOTDELAY 3 #define CONFIG_ENV_SIZE8192 #define CONFIG_ENV_IS_NOWHERE @@ -120,26 +119,31 @@ /* include default commands */ #include +#include + +#define BOOT_TARGET_DEVICES(func) \ + func(HOST, host, 1) \ + func(HOST, host, 0) + +#include #define CONFIG_KEEP_SERVERADDR #define CONFIG_UDP_CHECKSUM #define CONFIG_CMD_LINK_LOCAL #define CONFIG_CMD_CDP #define CONFIG_CMD_DNS -#define CONFIG_CMD_NFS #define CONFIG_CMD_SNTP #define CONFIG_TIMESTAMP #define CONFIG_CMD_RARP -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP #define CONFIG_BOOTP_DNS #define CONFIG_BOOTP_DNS2 -#define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_SEND_HOSTNAME #define CONFIG_BOOTP_SERVERIP -#define CONFIG_BOOTP_SUBNETMASK #define CONFIG_IP_DEFRAG +/* Can't boot elf images */ +#undef CONFIG_CMD_ELF + #define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY #define CONFIG_SHA1 @@ -182,8 +186,19 @@ "eth5addr=00:00:11:22:33:46\0" \ "ipaddr=1.2.3.4\0" -#define CONFIG_EXTRA_ENV_SETTINGS SANDBOX_SERIAL_SETTINGS \ - SANDBOX_ETH_SETTINGS +#define MEM_LAYOUT_ENV_SETTINGS \ + "bootm_size=0x1000\0" \ + "kernel_addr_r=0x100\0" \ + "fdt_addr_r=0xc0\0" \ + "ramdisk_addr_r=0x200\0" \ + "scriptaddr=0x1000\0" \ + "pxefile_addr_r=0x2000\0" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + SANDBOX_SERIAL_SETTINGS \ + SANDBOX_ETH_SETTINGS \ + BOOTENV \ + MEM_LAYOUT_ENV_SETTINGS #define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2 -- 2.1.4 ___ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot