[poky] [PATCH v1] u-boot/beaglebone: Select Beaglebone Black target specifically.

[Kristian Amlie]

On 16/12/16 15:28, Ed Bartosh wrote:
> On Fri, Dec 16, 2016 at 08:32:48AM +0100, Kristian Amlie wrote:
>> The am335x_evm_config target has a subtle problem which is not present
>> in the am335x_boneblack_config target: When booting from an external
>> MMC card, the internal MMC is not accessible using the former target.
>>
>> This problem was introduced in U-Boot in commit 80b24fcd3083515e6b961,
>> due to the addition of the CONFIG_DM_MMC option, and the
>> am335x_boneblack_config target does not have this problem.
>>
>> Signed-off-by: Kristian Amlie <kristian.amlie at mender.io>
>> ---
>>  meta-yocto-bsp/conf/machine/beaglebone.conf | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/meta-yocto-bsp/conf/machine/beaglebone.conf b/meta-yocto-bsp/conf/machine/beaglebone.conf
>> index fc6a527..24a95b4 100644
>> --- a/meta-yocto-bsp/conf/machine/beaglebone.conf
>> +++ b/meta-yocto-bsp/conf/machine/beaglebone.conf
>> @@ -31,7 +31,7 @@ KERNEL_EXTRA_ARGS += "LOADADDR=${UBOOT_ENTRYPOINT}"
>>  
>>  SPL_BINARY = "MLO"
>>  UBOOT_SUFFIX = "img"
>> -UBOOT_MACHINE = "am335x_evm_config"
>> +UBOOT_MACHINE = "am335x_boneblack_config"
>>  UBOOT_ENTRYPOINT = "0x80008000"
>>  UBOOT_LOADADDRESS = "0x80008000"
>>  
> 
> Would this work for Beaglebone white?

I don't have one, so unfortunately I can't test it. However, the
beagleboard.org site states that the differences between the two are the
on-board USB JTAG and serial adapters. Looking at the differences of the
two configs I can't find anything obvious that would influence this
(I'll admit that I don't fully understand all the options though).

Below is the (sorted) difference. I can't spot anything bad, can you?


--- configs/am335x_evm_defconfig.sort	2016-12-19 08:50:26.674878278 +0100
+++ configs/am335x_boneblack_defconfig.sort	2016-12-19
08:50:39.163314913 +0100
@@ -1,6 +1,9 @@
 CONFIG_AM33XX=y
 CONFIG_ARM=y
-# CONFIG_BLK is not set
+CONFIG_AUTOBOOT_DELAY_STR="d"
+CONFIG_AUTOBOOT_KEYED=y
+CONFIG_AUTOBOOT_PROMPT="Press SPACE to abort autoboot in %d seconds\n"
+CONFIG_AUTOBOOT_STOP_STR=" "
 CONFIG_CMD_ASKENV=y
 CONFIG_CMD_BOOTZ=y
 CONFIG_CMD_DFU=y
@@ -21,38 +24,27 @@
 CONFIG_CMD_SF=y
 CONFIG_CMD_SPI=y
 CONFIG_CMD_USB=y
-CONFIG_DEFAULT_DEVICE_TREE="am335x-evm"
 CONFIG_DFU_MMC=y
-CONFIG_DFU_NAND=y
 CONFIG_DFU_RAM=y
-CONFIG_DM_ETH=y
-CONFIG_DM_I2C=y
-# CONFIG_DM_MMC_OPS is not set
-CONFIG_DM_MMC=y
+CONFIG_DFU_TFTP=y
 CONFIG_FIT=y
 CONFIG_G_DNL_MANUFACTURER="Texas Instruments"
 CONFIG_G_DNL_PRODUCT_NUM=0xd022
 CONFIG_G_DNL_VENDOR_NUM=0x0451
 CONFIG_HUSH_PARSER=y
-CONFIG_OF_CONTROL=y
-CONFIG_OF_LIST="am335x-evm am335x-bone am335x-boneblack am335x-evmsk
am335x-bonegreen am335x-icev2"
-CONFIG_OMAP_TIMER=y
-CONFIG_RSA=y
+CONFIG_OF_LIBFDT=y
 CONFIG_SPI_FLASH_WINBOND=y
 CONFIG_SPI_FLASH=y
-CONFIG_SPL_LOAD_FIT=y
-CONFIG_SPL_MTD_SUPPORT=y
 CONFIG_SPL_MUSB_NEW_SUPPORT=y
-CONFIG_SPL_OF_LIBFDT=y
+# CONFIG_SPL_NAND_SUPPORT is not set
 CONFIG_SPL_OS_BOOT=y
 CONFIG_SPL_STACK_R_ADDR=0x82000000
 CONFIG_SPL_STACK_R=y
 CONFIG_SPL=y
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
-CONFIG_SYS_EXTRA_OPTIONS="NAND"
+CONFIG_SYS_EXTRA_OPTIONS="EMMC_BOOT"
 CONFIG_SYS_NS16550=y
 CONFIG_TARGET_AM335X_EVM=y
-CONFIG_TIMER=y
 CONFIG_USB_GADGET_DOWNLOAD=y
 CONFIG_USB_GADGET=y
 CONFIG_USB_MUSB_GADGET=y


I could also fire off an email to the U-Boot list if we're not confident
in this fix.

-- 
Kristian