Hi Sjoerd, On Mon, Apr 13, 2015 at 5:07 PM, Simon Glass <s...@chromium.org> wrote: > > Hi Sjoerd, > > On 13 April 2015 at 14:54, Sjoerd Simons <sjoerd.sim...@collabora.co.uk> 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 <sjoerd.sim...@collabora.co.uk> > > Reviewed by: Simon Glass <s...@chromium.org> > > Acked-by: Simon Glass <s...@chromium.org> > > 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_SIZE 8192 > > #define CONFIG_ENV_IS_NOWHERE > > @@ -120,26 +119,31 @@ > > > > /* include default commands */ > > #include <config_cmd_default.h> > > +#include <config_distro_defaults.h>
This include already has some of the commands removed below. > > + > > +#define BOOT_TARGET_DEVICES(func) \ > > + func(HOST, host, 1) \ > > + func(HOST, host, 0) > > + > > +#include <config_distro_bootcmd.h> > > > > #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=0x10000000\0" \ > > + "kernel_addr_r=0x1000000\0" \ > > + "fdt_addr_r=0xc00000\0" \ > > + "ramdisk_addr_r=0x2000000\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