diff options
| author | Paul Barker <[email protected]> | 2022-07-08 10:25:46 +0100 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2022-07-25 13:02:03 -0400 |
| commit | 390d9e2c8c7202f2153eba5e71cfe13803d44e73 (patch) | |
| tree | 998720b637214977dd891811747ac223f82be861 | |
| parent | 21acb843db24ec8fc743bf78b8e253fc69c20e27 (diff) | |
board: ti: am335x: Use correct dtbs for SanCloud boards
We have different dtbs for the Lite and Extended WiFi variants of the
SanCloud BBE.
Signed-off-by: Paul Barker <[email protected]>
Reviewed-by: Tom Rini <[email protected]>
| -rw-r--r-- | board/ti/am335x/board.c | 18 | ||||
| -rw-r--r-- | configs/am335x_evm_defconfig | 2 |
2 files changed, 15 insertions, 5 deletions
diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c index 2cb5b1cb3fc..b97fedddd5e 100644 --- a/board/ti/am335x/board.c +++ b/board/ti/am335x/board.c @@ -966,10 +966,20 @@ int board_fit_config_name_match(const char *name) return 0; else if (board_is_icev2() && !strcmp(name, "am335x-icev2")) return 0; - else if (board_is_bben() && !strcmp(name, "am335x-sancloud-bbe")) - return 0; - else - return -1; + else if (board_is_bben()) { + char subtype_id = board_ti_get_config()[1]; + + if (subtype_id == 'L') { + if (!strcmp(name, "am335x-sancloud-bbe-lite")) + return 0; + } else if (subtype_id == 'I') { + if (!strcmp(name, "am335x-sancloud-bbe-extended-wifi")) + return 0; + } else if (!strcmp(name, "am335x-sancloud-bbe")) { + return 0; + } + } + return -1; } #endif diff --git a/configs/am335x_evm_defconfig b/configs/am335x_evm_defconfig index b5801094e8c..b500ed0fdd8 100644 --- a/configs/am335x_evm_defconfig +++ b/configs/am335x_evm_defconfig @@ -55,7 +55,7 @@ CONFIG_MTDIDS_DEFAULT="nand0=nand.0" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand.0:128k(NAND.SPL),128k(NAND.SPL.backup1),128k(NAND.SPL.backup2),128k(NAND.SPL.backup3),256k(NAND.u-boot-spl-os),1m(NAND.u-boot),128k(NAND.u-boot-env),128k(NAND.u-boot-env.backup1),8m(NAND.kernel),-(NAND.file-system)" # CONFIG_SPL_EFI_PARTITION is not set CONFIG_OF_CONTROL=y -CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" +CONFIG_OF_LIST="am335x-evm am335x-bone am335x-sancloud-bbe am335x-sancloud-bbe-lite am335x-sancloud-bbe-extended-wifi am335x-boneblack am335x-evmsk am335x-bonegreen am335x-icev2 am335x-pocketbeagle" CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y |