diff options
| author | Wu, Josh <Josh.wu@atmel.com> | 2015-08-19 19:11:19 +0800 |
|---|---|---|
| committer | Andreas Bießmann <andreas.devel@googlemail.com> | 2015-08-21 15:47:04 +0200 |
| commit | 89a3658ac02873f32d7ad0a3b1d3c5308c5e2528 (patch) | |
| tree | 74fee6fea163498a5ad21021461edcf3388bd676 /include/configs | |
| parent | 372ca03fcd3cc777677d683336e9965c02fc42f2 (diff) | |
| download | blackbird-obmc-uboot-89a3658ac02873f32d7ad0a3b1d3c5308c5e2528.tar.gz blackbird-obmc-uboot-89a3658ac02873f32d7ad0a3b1d3c5308c5e2528.zip | |
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>
Diffstat (limited to 'include/configs')
| -rw-r--r-- | include/configs/at91-sama5_common.h | 5 | ||||
| -rw-r--r-- | include/configs/sama5d3xek.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/include/configs/at91-sama5_common.h b/include/configs/at91-sama5_common.h index bb737a1fe8..0fe0852821 100644 --- a/include/configs/at91-sama5_common.h +++ b/include/configs/at91-sama5_common.h @@ -61,7 +61,10 @@ #define FAT_ENV_FILE "uboot.env" #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; " \ "bootz 0x22000000 - 0x21000000" #define CONFIG_BOOTARGS \ diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 5c7b722da3..7b2f69a27b 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -19,6 +19,9 @@ */ #include "at91-sama5_common.h" +#define CONFIG_BOARD_LATE_INIT +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + /* serial console */ #define CONFIG_ATMEL_USART #define CONFIG_USART_BASE ATMEL_BASE_DBGU |
