| Message ID | 1462977912-13666-2-git-send-email-bmeng.cn@gmail.com |
|---|---|
| State | Accepted |
| Delegated to: | Bin Meng |
| Headers | show |
On 11 May 2016 at 08:44, Bin Meng <bmeng.cn@gmail.com> wrote: > Currently U-Boot environment address is at offset 0x7fe00 of a 8MB > SPI flash. When creating a partial u-boot.rom image without flash > descriptor and ME firmware, U-Boot actually occupies the last 1MB > of the flash, and reprograming U-Boot causes previous environment > settings get lost which is not convenient during testing. > > Adjust the environment address to 0x6ef000 instead (before the MRC > cache data region in the flash). > > Signed-off-by: Bin Meng <bmeng.cn@gmail.com> > Reviewed-by: Stefan Roese <sr@denx.de> > --- > > Changes in v2: None > > doc/README.x86 | 2 +- > include/configs/minnowmax.h | 2 +- > 2 files changed, 2 insertions(+), 2 deletions(-) Reviewed-by: Simon Glass <sjg@chromium.org>
On Thu, May 19, 2016 at 12:00 PM, Simon Glass <sjg@chromium.org> wrote: > On 11 May 2016 at 08:44, Bin Meng <bmeng.cn@gmail.com> wrote: >> Currently U-Boot environment address is at offset 0x7fe00 of a 8MB >> SPI flash. When creating a partial u-boot.rom image without flash >> descriptor and ME firmware, U-Boot actually occupies the last 1MB >> of the flash, and reprograming U-Boot causes previous environment >> settings get lost which is not convenient during testing. >> >> Adjust the environment address to 0x6ef000 instead (before the MRC >> cache data region in the flash). >> >> Signed-off-by: Bin Meng <bmeng.cn@gmail.com> >> Reviewed-by: Stefan Roese <sr@denx.de> >> --- >> >> Changes in v2: None >> >> doc/README.x86 | 2 +- >> include/configs/minnowmax.h | 2 +- >> 2 files changed, 2 insertions(+), 2 deletions(-) > > Reviewed-by: Simon Glass <sjg@chromium.org> applied to u-boot-x86, thanks!
diff --git a/doc/README.x86 b/doc/README.x86 index ce806ee..25cb218 100644 --- a/doc/README.x86 +++ b/doc/README.x86 @@ -304,12 +304,12 @@ Offset Description Controlling config 000000 descriptor.bin Hard-coded to 0 in ifdtool 001000 me.bin Set by the descriptor 500000 <spare> +6ef000 Environment CONFIG_ENV_OFFSET 6f0000 MRC cache CONFIG_ENABLE_MRC_CACHE 700000 u-boot-dtb.bin CONFIG_SYS_TEXT_BASE 790000 vga.bin CONFIG_VGA_BIOS_ADDR 7c0000 fsp.bin CONFIG_FSP_ADDR 7f8000 <spare> (depends on size of fsp.bin) -7fe000 Environment CONFIG_ENV_OFFSET 7ff800 U-Boot 16-bit boot CONFIG_SYS_X86_START16 Overall ROM image size is controlled by CONFIG_ROM_SIZE. diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index 674d1f6..95ad128 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -40,6 +40,6 @@ #define CONFIG_X86EMU_RAW_IO #define CONFIG_ENV_SECT_SIZE 0x1000 -#define CONFIG_ENV_OFFSET 0x007fe000 +#define CONFIG_ENV_OFFSET 0x006ef000 #endif /* __CONFIG_H */