board: STiH410-B2260: update environment variable

Update environment variable by updating:
 _ BOOT_TARGET_DEVICE
 _ CONFIGS_BOOTARGS
 _ kernel_addr_r, fdtfile, fdt_addr_r, scriptaddr, fdt_high, intird_high

Signed-off-by: Patrice Chotard <patrice.chotard@st.com>
Reviewed-by: Simon Glass <sjg@chromium.org>

diff --git a/configs/stih410-b2260_defconfig b/configs/stih410-b2260_defconfig
index 4b41b6bcf1151753286b42222bb93a3ce9627395..d4aa4f3ab6f0b77cadffa60342b8e827e96f7869 100644 (file)
--- a/configs/stih410-b2260_defconfig
+++ b/configs/stih410-b2260_defconfig
@@ -6,7 +6,7 @@ CONFIG_DISTRO_DEFAULTS=y
 CONFIG_FIT=y
 CONFIG_FIT_VERBOSE=y
 CONFIG_USE_BOOTARGS=y
-CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk consoleblank=0 ignore_loglevel"
+CONFIG_BOOTARGS="console=ttyAS1,115200 CONSOLE=/dev/ttyAS1 consoleblank=0 root=/dev/mmcblk0p2 rootfstype=ext4 rw rootwait mem=992M@0x40000000 vmalloc=256m"
 # CONFIG_DISPLAY_CPUINFO is not set
 CONFIG_SYS_PROMPT="stih410-b2260 => "
 CONFIG_FASTBOOT=y

diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h
index 372c08360122b59b0b7f6323dfba5df49bab8afc..115488c78e94fd108726b09e74097430e1f3ec1b 100644 (file)
--- a/include/configs/stih410-b2260.h
+++ b/include/configs/stih410-b2260.h
@@ -18,10 +18,28 @@
 
 #define CONFIG_SYS_HZ_CLOCK            1000000000      /* 1 GHz */
 
+#include <config_distro_defaults.h>
 /* Environment */
-#define CONFIG_EXTRA_ENV_SETTINGS \
-       "board= B2260" \
-       "load_addr= #CONFIG_SYS_LOAD_ADDR \0"
+
+#define CONFIG_LOADADDR                        CONFIG_SYS_LOAD_ADDR
+
+#define CONFIG_ENV_VARS_UBOOT_CONFIG
+
+#define BOOT_TARGET_DEVICES(func) \
+       func(MMC, mmc, 0) \
+       func(USB, usb, 0) \
+       func(DHCP, dhcp, na)
+#include <config_distro_bootcmd.h>
+#define CONFIG_BOOTFILE                        "uImage"
+#define CONFIG_EXTRA_ENV_SETTINGS                              \
+                       "kernel_addr_r=0x40000000\0"            \
+                       "fdtfile=stih410-b2260.dtb\0"           \
+                       "fdt_addr_r=0x47000000\0"               \
+                       "scriptaddr=0x50000000\0"               \
+                       "fdt_high=0xffffffffffffffff\0"         \
+                       "initrd_high=0xffffffffffffffff\0"      \
+                       BOOTENV
+
 
 #define CONFIG_ENV_SIZE 0x4000