diff options
| author | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-15 22:09:08 +0300 |
|---|---|---|
| committer | Andrey V.Kosteltsev <AKosteltsev@IBS.RU> | 2022-07-15 22:09:08 +0300 |
| commit | 2798ccb278a52fc54e19074dd3dabd16976e4635 (patch) | |
| tree | 7578e94559fb71cc643f3b1dfd2bb938e535e608 /meta-ibs | |
| parent | 25a9fc88684b989768b9f58378b6cb9051663ea8 (diff) | |
| download | openbmc-2798ccb278a52fc54e19074dd3dabd16976e4635.tar.xz | |
IBS: 64mb SPI Flash layout
Diffstat (limited to 'meta-ibs')
3 files changed, 13 insertions, 11 deletions
diff --git a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc b/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc index e924f8db01..778f2b63d7 100644 --- a/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc +++ b/meta-ibs/meta-ast2500/conf/machine/include/sila-ast2500-64mb.inc @@ -17,7 +17,8 @@ include conf/machine/include/obmc-bsp-sila-common.inc SERIAL_CONSOLES = "115200;ttyS3 115200;ttyS4" FLASH_SIZE = "65536" -FLASH_ROFS_OFFSET = "6656" -FLASH_RWFS_OFFSET = "53248" +FLASH_KERNEL_OFFSET:flash-65536 = "512" +FLASH_ROFS_OFFSET:flash-65536 = "9216" +FLASH_RWFS_OFFSET:flash-65536 = "49152" IMAGE_FEATURES += "allow-root-login" diff --git a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi index 8b4f656d79..db50ad6796 100644 --- a/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi +++ b/meta-ibs/meta-ast2500/recipes-kernel/linux/linux-aspeed/openbmc-flash-layout-64MB.dtsi @@ -7,27 +7,27 @@ partitions { #size-cells = <1>; u-boot@0 { - reg = <0x0 0x60000>; + reg = <0x0 0x60000>; // 384KB label = "u-boot"; }; u-boot-env@60000 { - reg = <0x60000 0x20000>; + reg = <0x60000 0x20000>; // 128KB label = "u-boot-env"; }; kernel@80000 { - reg = <0x80000 0x600000>; + reg = <0x80000 0x880000>; // 8704KB label = "kernel"; }; - rofs@680000 { - reg = <0x680000 0x2d80000>; + rofs@900000 { + reg = <0x900000 0x2700000>; // 39MB label = "rofs"; }; - rwfs@3400000 { - reg = <0x3400000 0xC00000>; + rwfs@3000000 { + reg = <0x3000000 0x100000>; // 16MB label = "rwfs"; }; }; diff --git a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag index a911e551c1..a54bac6419 100644 --- a/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag +++ b/meta-ibs/meta-common/recipes-ibs/firmware-watchdog/firmware-watchdog/virtual-asset-tag @@ -4,7 +4,8 @@ # model="CP2.*" -spi_flash_model="mx25l25635e" +spi_32mb_flash_model="mx25l25635e" +spi_64mb_flash_model="n25q512a" interface=xyz.openbmc_project.FruDevice asset_tag_var=PRODUCT_ASSET_TAG @@ -29,7 +30,7 @@ get_asset_tag() { echo "${tag}" } -if `dmesg | grep -q "aspeed-smc 1e620000.spi: ${spi_flash_model}"` ; then +if `dmesg | grep -q "aspeed-smc 1e620000.spi: ${spi_32mb_flash_model}"` || `dmesg | grep -q "aspeed-smc 1e620000.spi: ${spi_64mb_flash_model}"` ; then run_cmd /usr/bin/busctl set-property ${interface} $(get_model_path) ${interface} ${asset_tag_var} s "${asset_tag_vm}" else if [ "$(get_asset_tag)" = "...................." ] ; then |