[U-Boot] [UBOOT PATCH 1/2] ARM:Panda:Fix device tree loading for the panda-es

[Dan Murphy]

Bump
On 04/19/2013 10:21 AM, Dan Murphy wrote:
> + Sricharan
> On 04/18/2013 11:29 AM, Dan Murphy wrote:
>> Fix the device tree loading for panda(4430) and panda-es(4460)
>>
>> Modify the board name if a 4460 panda or panda-es is detected
>> at run time.
>> In the findfdt add a check for the panda-es board name and load
>> the panda-es device tree blob.
>>
>> Signed-off-by: Dan Murphy <dmurphy at ti.com>
>> ---
>>  board/ti/panda/panda.c         |    6 ++++++
>>  include/configs/omap4_common.h |    4 +++-
>>  2 files changed, 9 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c
>> index cab0598..2bbe392 100644
>> --- a/board/ti/panda/panda.c
>> +++ b/board/ti/panda/panda.c
>> @@ -82,6 +82,12 @@ int misc_init_r(void)
>>  	if (omap_revision() == OMAP4430_ES1_0)
>>  		return 0;
>>  
>> +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
>> +	if (omap_revision() >= OMAP4460_ES1_0 ||
>> +		omap_revision() <= OMAP4460_ES1_1)
>> +		setenv("board_name", strcat(CONFIG_SYS_BOARD, "-es"));
>> +#endif
>> +
>>  	gpio_direction_input(PANDA_ULPI_PHY_TYPE_GPIO);
>>  	phy_type = gpio_get_value(PANDA_ULPI_PHY_TYPE_GPIO);
>>  
>> diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h
>> index 1fd3097..68faeca 100644
>> --- a/include/configs/omap4_common.h
>> +++ b/include/configs/omap4_common.h
>> @@ -176,7 +176,9 @@
>>  		"if test $board_name = sdp4430; then " \
>>  			"setenv fdtfile omap4-sdp.dtb; fi; " \
>>  		"if test $board_name = panda; then " \
>> -			"setenv fdtfile omap4-panda-es.dtb; fi\0" \
>> +			"setenv fdtfile omap4-panda.dtb; fi;" \
>> +		"if test $board_name = panda-es; then " \
>> +			"setenv fdtfile omap4-panda-es.dtb; fi; \0" \
>>  	"loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
>>  
>>  #define CONFIG_BOOTCOMMAND \