diff mbox series

[2/2] board: ti: am335x: Use correct dtbs for SanCloud boards

Message ID 20220708092546.839914-2-paul.barker@sancloud.com
State Accepted
Commit 390d9e2c8c7202f2153eba5e71cfe13803d44e73
Delegated to: Tom Rini
Headers show
Series [1/2] board: ti: am335x: Enable spi0 bus on SanCloud BBE Lite | expand

Commit Message

Paul Barker July 8, 2022, 9:25 a.m. UTC 
We have different dtbs for the Lite and Extended WiFi variants of the
SanCloud BBE.

Signed-off-by: Paul Barker <paul.barker@sancloud.com>
---
 board/ti/am335x/board.c      | 18 ++++++++++++++----
 configs/am335x_evm_defconfig |  2 +-
 2 files changed, 15 insertions(+), 5 deletions(-)

Comments

Tom Rini July 8, 2022, 8:22 p.m. UTC | #1 
On Fri, Jul 08, 2022 at 10:25:46AM +0100, Paul Barker wrote:

> 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>
Tom Rini July 25, 2022, 9:20 p.m. UTC | #2 
On Fri, Jul 08, 2022 at 10:25:46AM +0100, Paul Barker wrote:

> 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>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c
index 2cb5b1cb3fc7..b97fedddd5e2 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 30577a6fce42..3f677a2326c2 100644
--- a/configs/am335x_evm_defconfig
+++ b/configs/am335x_evm_defconfig
@@ -45,7 +45,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