ARM: at91: sama5d3xek: use a $dtb_name to load dtb

Since sama5d3xek boards has different type of dtb blobs, so we need to detect
the cpu type in runtime.

So we add a new variable $dtb_name. if $dtb_name is not defined, we just use
	at91-${board_name}.dtb

as the $dtb_name. Otherwise, we will just load the dtb with
	$dtb_name.

For sama5d3xek, we will detect cpu type and make up $dtb_name in
runtime.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
master
Wu, Josh 9 years ago committed by Andreas Bießmann
parent 372ca03fcd
commit 89a3658ac0
  1. 20
      board/atmel/sama5d3xek/sama5d3xek.c
  2. 5
      include/configs/at91-sama5_common.h
  3. 3
      include/configs/sama5d3xek.h

@ -15,6 +15,7 @@
#include <asm/arch/gpio.h> #include <asm/arch/gpio.h>
#include <asm/arch/clk.h> #include <asm/arch/clk.h>
#include <lcd.h> #include <lcd.h>
#include <linux/ctype.h>
#include <atmel_hlcdc.h> #include <atmel_hlcdc.h>
#include <atmel_mci.h> #include <atmel_mci.h>
#include <phy.h> #include <phy.h>
@ -369,6 +370,25 @@ void spi_cs_deactivate(struct spi_slave *slave)
} }
#endif /* CONFIG_ATMEL_SPI */ #endif /* CONFIG_ATMEL_SPI */
#ifdef CONFIG_BOARD_LATE_INIT
int board_late_init(void)
{
#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
const int MAX_STR_LEN = 32;
char name[MAX_STR_LEN], *p;
int i;
strncpy(name, get_cpu_name(), MAX_STR_LEN);
for (i = 0, p = name; (*p) && (i < MAX_STR_LEN); p++, i++)
*p = tolower(*p);
strcat(name, "ek.dtb");
setenv("dtb_name", name);
#endif
return 0;
}
#endif
/* SPL */ /* SPL */
#ifdef CONFIG_SPL_BUILD #ifdef CONFIG_SPL_BUILD
void spl_board_init(void) void spl_board_init(void)

@ -61,7 +61,10 @@
#define FAT_ENV_FILE "uboot.env" #define FAT_ENV_FILE "uboot.env"
#define CONFIG_ENV_SIZE 0x4000 #define CONFIG_ENV_SIZE 0x4000
#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 at91-${board_name}.dtb; " \ #define CONFIG_BOOTCOMMAND "if test ! -n ${dtb_name}; then " \
"setenv dtb_name at91-${board_name}.dtb; " \
"fi; " \
"fatload mmc 0:1 0x21000000 ${dtb_name}; " \
"fatload mmc 0:1 0x22000000 zImage; " \ "fatload mmc 0:1 0x22000000 zImage; " \
"bootz 0x22000000 - 0x21000000" "bootz 0x22000000 - 0x21000000"
#define CONFIG_BOOTARGS \ #define CONFIG_BOOTARGS \

@ -19,6 +19,9 @@
*/ */
#include "at91-sama5_common.h" #include "at91-sama5_common.h"
#define CONFIG_BOARD_LATE_INIT
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
/* serial console */ /* serial console */
#define CONFIG_ATMEL_USART #define CONFIG_ATMEL_USART
#define CONFIG_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_BASE ATMEL_BASE_DBGU

Loading…
Cancel
Save