[U-Boot] [PATCH 16/20] keymile, common: add setting of some environment variables
Heiko Schocher
hs at denx.de
Tue Mar 8 14:30:14 CET 2011
This patch adds last_stage_init to all keymile boards. And
in the last stage init some environment variables for u-boot
were set. Currently these are pnvramaddr, pram and var address.
Signed-off-by: Holger Brunck <holger.brunck at keymile.com>
Signed-off-by: Heiko Schocher <hs at denx.de>
cc: Valentin Longchamp <valentin.longchamp at keymile.com>
cc: Wolfgang Denk <wd at denx.de>
cc: Kim Phillips <kim.phillips at freescale.com>
---
board/keymile/common/common.c | 35 +++++++++++++++++++++++++++++++++++
board/keymile/common/common.h | 1 +
board/keymile/km83xx/km83xx.c | 13 +++++++++++++
board/keymile/km_arm/km_arm.c | 11 +++++++++++
board/keymile/mgcoge/mgcoge.c | 13 +++++++++++++
include/configs/keymile-common.h | 3 +++
include/configs/km_arm.h | 5 +++++
7 files changed, 81 insertions(+), 0 deletions(-)
diff --git a/board/keymile/common/common.c b/board/keymile/common/common.c
index 6136884..25c4539 100644
--- a/board/keymile/common/common.c
+++ b/board/keymile/common/common.c
@@ -42,6 +42,7 @@
extern int i2c_soft_read_pin (void);
extern int i2c_make_abort (void);
+extern unsigned int arch_ram_size(void);
int ivm_calc_crc (unsigned char *buf, int len)
{
@@ -73,6 +74,40 @@ int ivm_calc_crc (unsigned char *buf, int len)
return crc;
}
+/* Set Keymile specific environment variables
+ * Currently only some memory layout variables are calculated here
+ * ... ------------------------------------------------
+ * ... |@rootfsaddr |@pnvramaddr |@varaddr |@reserved |@END_OF_RAM
+ * ... |<------------------- pram ------------------->|
+ * ... ------------------------------------------------
+ * @END_OF_RAM: denotes the RAM size
+ * @pnvramaddr: Startadress of pseudo non volatile RAM in hex
+ * @pram : preserved ram size in k
+ * @varaddr : startadress for /var mounted into RAM
+ */
+int set_km_env(void)
+{
+ uchar buf[32];
+ unsigned int pnvramaddr;
+ unsigned int pram;
+ unsigned int varaddr;
+
+ pnvramaddr = arch_ram_size() - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM
+ - CONFIG_KM_PNVRAM;
+ sprintf ((char *)buf, "0x%x", pnvramaddr);
+ setenv ("pnvramaddr", (char *)buf);
+
+ pram = (CONFIG_KM_RESERVED_PRAM + CONFIG_KM_PHRAM + CONFIG_KM_PNVRAM) /
+ 0x400;
+ sprintf ((char *)buf, "0x%x", pram);
+ setenv ("pram", (char *)buf);
+
+ varaddr = arch_ram_size() - CONFIG_KM_RESERVED_PRAM - CONFIG_KM_PHRAM;
+ sprintf ((char *)buf, "0x%x", varaddr);
+ setenv ("varaddr", (char *)buf);
+ return 0;
+}
+
static int ivm_set_value (char *name, char *value)
{
char tempbuf[256];
diff --git a/board/keymile/common/common.h b/board/keymile/common/common.h
index 8fd3125..acf19af 100644
--- a/board/keymile/common/common.h
+++ b/board/keymile/common/common.h
@@ -22,6 +22,7 @@ int ivm_read_eeprom (void);
int keymile_hdlc_enet_initialize (bd_t *bis);
#endif
+int set_km_env(void);
int fdt_set_node_and_value (void *blob,
char *nodename,
char *regname,
diff --git a/board/keymile/km83xx/km83xx.c b/board/keymile/km83xx/km83xx.c
index c625b5d..1ee5ee0 100644
--- a/board/keymile/km83xx/km83xx.c
+++ b/board/keymile/km83xx/km83xx.c
@@ -30,6 +30,8 @@
#include "../common/common.h"
+DECLARE_GLOBAL_DATA_PTR;
+
extern void disable_addr_trans (void);
extern void enable_addr_trans (void);
const qe_iop_conf_t qe_iop_conf_tab[] = {
@@ -177,6 +179,17 @@ int misc_init_r (void)
return 0;
}
+unsigned int arch_ram_size(void)
+{
+ return gd->bd->bi_memsize;
+}
+
+int last_stage_init(void)
+{
+ set_km_env();
+ return 0;
+}
+
int fixed_sdram(void)
{
volatile immap_t *im = (immap_t *)CONFIG_SYS_IMMR;
diff --git a/board/keymile/km_arm/km_arm.c b/board/keymile/km_arm/km_arm.c
index 3dc63ea..1b5426a 100644
--- a/board/keymile/km_arm/km_arm.c
+++ b/board/keymile/km_arm/km_arm.c
@@ -210,6 +210,12 @@ int board_init(void)
return 0;
}
+int last_stage_init(void)
+{
+ set_km_env();
+ return 0;
+}
+
#if defined(CONFIG_CMD_SF)
int do_spi_toggle(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
{
@@ -273,6 +279,11 @@ void dram_init_banksize(void)
}
}
+unsigned int arch_ram_size(void)
+{
+ return gd->ram_size;
+}
+
/* Configure and enable MV88E1118 PHY */
void reset_phy(void)
{
diff --git a/board/keymile/mgcoge/mgcoge.c b/board/keymile/mgcoge/mgcoge.c
index 44dc7a5..e932633 100644
--- a/board/keymile/mgcoge/mgcoge.c
+++ b/board/keymile/mgcoge/mgcoge.c
@@ -37,6 +37,8 @@
#include "../common/common.h"
+DECLARE_GLOBAL_DATA_PTR;
+
/*
* I/O Port configuration table
*
@@ -310,6 +312,17 @@ int board_early_init_r (void)
return 0;
}
+unsigned int arch_ram_size(void)
+{
+ return gd->bd->bi_memsize;
+}
+
+int last_stage_init(void)
+{
+ set_km_env();
+ return 0;
+}
+
int hush_init_var (void)
{
ivm_read_eeprom ();
diff --git a/include/configs/keymile-common.h b/include/configs/keymile-common.h
index 33f2af2..142a6a1 100644
--- a/include/configs/keymile-common.h
+++ b/include/configs/keymile-common.h
@@ -26,6 +26,9 @@
/* Do boardspecific init for all boards */
#define CONFIG_BOARD_EARLY_INIT_R 1
+#define CONFIG_LAST_STAGE_INIT
+
+#define CONFIG_BOOTCOUNT_LIMIT
/*
* By default kwbimage.cfg from board specific folder is used
diff --git a/include/configs/km_arm.h b/include/configs/km_arm.h
index 578438e..cb14ada 100644
--- a/include/configs/km_arm.h
+++ b/include/configs/km_arm.h
@@ -251,4 +251,9 @@ int get_scl (void);
#define CONFIG_SYS_INIT_SP_ADDR 0xC8012000
/* Do early setups now in board_init_f() */
#define CONFIG_BOARD_EARLY_INIT_F
+
+/* resereved pram area at the end of memroy [hex] */
+/* 8Mbytes for switch + 4Kbytes for bootcount */
+#define CONFIG_KM_RESERVED_PRAM 0x801000
+
#endif /* _CONFIG_KM_ARM_H */
--
1.7.4
More information about the U-Boot
mailing list