[PATCH v9 4/7] sandbox: Use a text-based environment

[Alexander Dahl]

Hello Simon,

Am Tue, Oct 19, 2021 at 04:44:19PM -0600 schrieb Simon Glass:
> Use a text file for the environment instead of the #define settings.
> 
> Signed-off-by: Simon Glass <sjg at chromium.org>
> Reviewed-by: Marek Behún <marek.behun at nic.cz>
> ---
> 
> (no changes since v3)
> 
> Changes in v3:
> - Add new patch to use a text-based environment for sandbox
> 
>  board/sandbox/sandbox.env | 25 +++++++++++++++++++++++++
>  include/configs/sandbox.h | 29 -----------------------------
>  2 files changed, 25 insertions(+), 29 deletions(-)
>  create mode 100644 board/sandbox/sandbox.env
> 
> diff --git a/board/sandbox/sandbox.env b/board/sandbox/sandbox.env
> new file mode 100644
> index 00000000000..0f8d95b8db0
> --- /dev/null
> +++ b/board/sandbox/sandbox.env
> @@ -0,0 +1,25 @@
> +stdin=serial
> +#ifdef CONFIG_SANDBOX_SDL
> +stdin+=,cros-ec-keyb,usbkbd
> +#endif
> +stdout=serial,vidconsole
> +stderr=serial,vidconsole
> +
> +ethaddr=00:00:11:22:33:44
> +eth2addr=00:00:11:22:33:48
> +eth3addr=00:00:11:22:33:45
> +eth4addr=00:00:11:22:33:48
> +eth5addr=00:00:11:22:33:46
> +eth6addr=00:00:11:22:33:47

These MAC addresses use the OUI 00:00:11 which is assigned to NORMEREL
SYSTEMES, a company based in France.  I doubt U-Boot is allowed to use
addresses from that block, and would prefer using a locally
administered address here, and set the second bit. Thus
02:00:11:xx:xx:xx would be okay for example.

> +ipaddr=1.2.3.4

Same here, this is a globally reachable IP address, which U-Boot
probably is not allowed to use.  According to RFC 5737 there are two
IPv4 address blocks for documentational use:

“The blocks 192.0.2.0/24 (TEST-NET-1), 198.51.100.0/24 (TEST-NET-2),
and 203.0.113.0/24 (TEST-NET-3) are provided for use in
documentation.”

Greets
Alex

> +
> +/*
> + * These are used for distro boot which is not supported. But once bootmethod
> + * is provided these will be used again.
> + */
> +bootm_size=0x10000000
> +kernel_addr_r=0x1000000
> +fdt_addr_r=0xc00000
> +ramdisk_addr_r=0x2000000
> +scriptaddr=0x1000
> +pxefile_addr_r=0x2000
> diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
> index c19232f202f..c703a1330c0 100644
> --- a/include/configs/sandbox.h
> +++ b/include/configs/sandbox.h
> @@ -64,37 +64,8 @@
>  #define CONFIG_LCD_BMP_RLE8
>  
>  #define CONFIG_KEYBOARD
> -
> -#define SANDBOX_SERIAL_SETTINGS		"stdin=serial,cros-ec-keyb,usbkbd\0" \
> -					"stdout=serial,vidconsole\0" \
> -					"stderr=serial,vidconsole\0"
> -#else
> -#define SANDBOX_SERIAL_SETTINGS		"stdin=serial\0" \
> -					"stdout=serial,vidconsole\0" \
> -					"stderr=serial,vidconsole\0"
>  #endif
>  
> -#define SANDBOX_ETH_SETTINGS		"ethaddr=00:00:11:22:33:44\0" \
> -					"eth2addr=00:00:11:22:33:48\0" \
> -					"eth3addr=00:00:11:22:33:45\0" \
> -					"eth4addr=00:00:11:22:33:48\0" \
> -					"eth5addr=00:00:11:22:33:46\0" \
> -					"eth6addr=00:00:11:22:33:47\0" \
> -					"ipaddr=1.2.3.4\0"
> -
> -#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 \
> -	MEM_LAYOUT_ENV_SETTINGS
> -
>  #ifndef CONFIG_SPL_BUILD
>  #define CONFIG_SYS_IDE_MAXBUS		1
>  #define CONFIG_SYS_ATA_IDE0_OFFSET	0
> -- 
> 2.33.0.1079.g6e70778dc9-goog
>