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 <paul.barker@sancloud.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 2cb5b1cb3fc7fcd5e9123848719899bd14b15e26..b97fedddd5e29e474f505afed64e84741ce820f0 100644 (file)
--- 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 b5801094e8c48195aff80e7fba90ab8cec4ec739..b500ed0fdd8d2eb097a5b5680f0bc044e768df50 100644 (file)
--- 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