* [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot
@ 2015-06-17 10:56 Josh Wu
2015-08-19 2:20 ` Josh Wu
2015-08-19 7:24 ` Andreas Bießmann
0 siblings, 2 replies; 3+ messages in thread
From: Josh Wu @ 2015-06-17 10:56 UTC (permalink / raw)
To: u-boot
Then we can use this ek_name variable to load corresponding dtb file in
mmc boot.
Also we change the mmc boot command to load zImage as this format is
prefered.
Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
board/atmel/sama5d3xek/sama5d3xek.c | 21 +++++++++++++++++++++
include/configs/sama5d3xek.h | 7 +++++--
2 files changed, 26 insertions(+), 2 deletions(-)
diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
index cf6ed8b..8408b2b 100644
--- a/board/atmel/sama5d3xek/sama5d3xek.c
+++ b/board/atmel/sama5d3xek/sama5d3xek.c
@@ -15,6 +15,7 @@
#include <asm/arch/gpio.h>
#include <asm/arch/clk.h>
#include <lcd.h>
+#include <linux/ctype.h>
#include <atmel_hlcdc.h>
#include <atmel_mci.h>
#include <phy.h>
@@ -369,6 +370,26 @@ void spi_cs_deactivate(struct spi_slave *slave)
}
#endif /* CONFIG_ATMEL_SPI */
+#ifdef CONFIG_BOARD_LATE_INIT
+int board_late_init(void)
+{
+#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
+ const char *BOARD_EK_NAME = "ek_name";
+ 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 != '\0' || i < MAX_STR_LEN; i++, p++)
+ *p = tolower(*p);
+
+ strcat(name, "ek");
+ setenv(BOARD_EK_NAME, name);
+#endif
+ return 0;
+}
+#endif
+
/* SPL */
#ifdef CONFIG_SPL_BUILD
void spl_board_init(void)
diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
index d933a9e..344ae9c 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
@@ -179,8 +182,8 @@
#define FAT_ENV_FILE "uboot.env"
#define FAT_ENV_DEVICE_AND_PART "0"
#define CONFIG_ENV_SIZE 0x4000
-#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 dtb; " \
- "fatload mmc 0:1 0x22000000 uImage; " \
+#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 ${ek_name}.dtb; " \
+ "fatload mmc 0:1 0x22000000 zImage; " \
"bootm 0x22000000 - 0x21000000"
#else
#define CONFIG_ENV_IS_NOWHERE
--
1.9.1
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot
2015-06-17 10:56 [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot Josh Wu
@ 2015-08-19 2:20 ` Josh Wu
2015-08-19 7:24 ` Andreas Bießmann
1 sibling, 0 replies; 3+ messages in thread
From: Josh Wu @ 2015-08-19 2:20 UTC (permalink / raw)
To: u-boot
Hi, Andreas
Any feedback for this patch? Thanks.
Best Regards,
Josh Wu
On 6/17/2015 6:56 PM, Josh Wu wrote:
> Then we can use this ek_name variable to load corresponding dtb file in
> mmc boot.
>
> Also we change the mmc boot command to load zImage as this format is
> prefered.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>
> board/atmel/sama5d3xek/sama5d3xek.c | 21 +++++++++++++++++++++
> include/configs/sama5d3xek.h | 7 +++++--
> 2 files changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
> index cf6ed8b..8408b2b 100644
> --- a/board/atmel/sama5d3xek/sama5d3xek.c
> +++ b/board/atmel/sama5d3xek/sama5d3xek.c
> @@ -15,6 +15,7 @@
> #include <asm/arch/gpio.h>
> #include <asm/arch/clk.h>
> #include <lcd.h>
> +#include <linux/ctype.h>
> #include <atmel_hlcdc.h>
> #include <atmel_mci.h>
> #include <phy.h>
> @@ -369,6 +370,26 @@ void spi_cs_deactivate(struct spi_slave *slave)
> }
> #endif /* CONFIG_ATMEL_SPI */
>
> +#ifdef CONFIG_BOARD_LATE_INIT
> +int board_late_init(void)
> +{
> +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> + const char *BOARD_EK_NAME = "ek_name";
> + 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 != '\0' || i < MAX_STR_LEN; i++, p++)
> + *p = tolower(*p);
> +
> + strcat(name, "ek");
> + setenv(BOARD_EK_NAME, name);
> +#endif
> + return 0;
> +}
> +#endif
> +
> /* SPL */
> #ifdef CONFIG_SPL_BUILD
> void spl_board_init(void)
> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
> index d933a9e..344ae9c 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
> @@ -179,8 +182,8 @@
> #define FAT_ENV_FILE "uboot.env"
> #define FAT_ENV_DEVICE_AND_PART "0"
> #define CONFIG_ENV_SIZE 0x4000
> -#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 dtb; " \
> - "fatload mmc 0:1 0x22000000 uImage; " \
> +#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 ${ek_name}.dtb; " \
> + "fatload mmc 0:1 0x22000000 zImage; " \
> "bootm 0x22000000 - 0x21000000"
> #else
> #define CONFIG_ENV_IS_NOWHERE
^ permalink raw reply [flat|nested] 3+ messages in thread
* [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot
2015-06-17 10:56 [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot Josh Wu
2015-08-19 2:20 ` Josh Wu
@ 2015-08-19 7:24 ` Andreas Bießmann
1 sibling, 0 replies; 3+ messages in thread
From: Andreas Bießmann @ 2015-08-19 7:24 UTC (permalink / raw)
To: u-boot
Hi Josh,
sorry for the late reply!
On 06/17/2015 12:56 PM, Josh Wu wrote:
> Then we can use this ek_name variable to load corresponding dtb file in
> mmc boot.
I appreciate this change. I wonder however why not use the
CONFIG_ENV_VARS_UBOOT_CONFIG + CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG and
the corresponding env vars.
In include/env_default.h we define 'board_name' to the name of the
board. This could then easily be used to switch the required DTB.
I think the CONFIG_ENV_VARS_UBOOT_CONFIG should only be used for boards
where the name is fixed (like some older EK's). Here the runtime config
is right, but let's use the $board_name, Ok?
Andreas
>
> Also we change the mmc boot command to load zImage as this format is
> prefered.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>
> ---
>
> board/atmel/sama5d3xek/sama5d3xek.c | 21 +++++++++++++++++++++
> include/configs/sama5d3xek.h | 7 +++++--
> 2 files changed, 26 insertions(+), 2 deletions(-)
>
> diff --git a/board/atmel/sama5d3xek/sama5d3xek.c b/board/atmel/sama5d3xek/sama5d3xek.c
> index cf6ed8b..8408b2b 100644
> --- a/board/atmel/sama5d3xek/sama5d3xek.c
> +++ b/board/atmel/sama5d3xek/sama5d3xek.c
> @@ -15,6 +15,7 @@
> #include <asm/arch/gpio.h>
> #include <asm/arch/clk.h>
> #include <lcd.h>
> +#include <linux/ctype.h>
> #include <atmel_hlcdc.h>
> #include <atmel_mci.h>
> #include <phy.h>
> @@ -369,6 +370,26 @@ void spi_cs_deactivate(struct spi_slave *slave)
> }
> #endif /* CONFIG_ATMEL_SPI */
>
> +#ifdef CONFIG_BOARD_LATE_INIT
> +int board_late_init(void)
> +{
> +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
> + const char *BOARD_EK_NAME = "ek_name";
> + 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 != '\0' || i < MAX_STR_LEN; i++, p++)
> + *p = tolower(*p);
> +
> + strcat(name, "ek");
> + setenv(BOARD_EK_NAME, name);
> +#endif
> + return 0;
> +}
> +#endif
> +
> /* SPL */
> #ifdef CONFIG_SPL_BUILD
> void spl_board_init(void)
> diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h
> index d933a9e..344ae9c 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
> @@ -179,8 +182,8 @@
> #define FAT_ENV_FILE "uboot.env"
> #define FAT_ENV_DEVICE_AND_PART "0"
> #define CONFIG_ENV_SIZE 0x4000
> -#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 dtb; " \
> - "fatload mmc 0:1 0x22000000 uImage; " \
> +#define CONFIG_BOOTCOMMAND "fatload mmc 0:1 0x21000000 ${ek_name}.dtb; " \
> + "fatload mmc 0:1 0x22000000 zImage; " \
> "bootm 0x22000000 - 0x21000000"
> #else
> #define CONFIG_ENV_IS_NOWHERE
>
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2015-08-19 7:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-06-17 10:56 [U-Boot] [PATCH] ARM: at91: sama5d3xek: initialized a variable:ek_name in U-Boot Josh Wu
2015-08-19 2:20 ` Josh Wu
2015-08-19 7:24 ` Andreas Bießmann
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox