On 19 February 2015 at 15:41, Sjoerd Simons sjoerd.simons@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 'sb bind 0 myimage.img ; boot'
Signed-off-by: Sjoerd Simons sjoerd.simons@collabora.co.uk
include/configs/sandbox.h | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-)
Reviewed by: Simon Glass sjg@chromium.org
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 5c11650..742bda6 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -75,7 +75,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 @@ -125,10 +124,21 @@
/* include default commands */ #include <config_cmd_default.h> +#include <config_distro_defaults.h>
+#define BOOT_TARGET_DEVICES(func) \
- func(HOST, host, 1) \
- func(HOST, host, 0)
It looks like you support two host devices. Is that somewhat arbitrary?
+#include <config_distro_bootcmd.h>
/* We don't have networking support yet */ #undef CONFIG_CMD_NET #undef CONFIG_CMD_NFS +#undef CONFIG_CMD_PING
+/* Can't boot elf images */ +#undef CONFIG_CMD_ELF
#define CONFIG_CMD_HASH #define CONFIG_HASH_VERIFY @@ -169,16 +179,29 @@ #define CONFIG_CROS_EC_KEYB #define CONFIG_KEYBOARD
-#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial,cros-ec-keyb\0" \ +#define EXTRA_ENV_SETTINGS "stdin=serial,cros-ec-keyb\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" #else
-#define CONFIG_EXTRA_ENV_SETTINGS "stdin=serial\0" \ +#define EXTRA_ENV_SETTINGS "stdin=serial\0" \ "stdout=serial,lcd\0" \ "stderr=serial,lcd\0" #endif
+#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 \
BOOTENV \MEM_LAYOUT_ENV_SETTINGS \EXTRA_ENV_SETTINGS#define CONFIG_GZIP_COMPRESSED #define CONFIG_BZIP2
#define CONFIG_LZO
2.1.4
Regards, Simon