ARM: rockchip: rv1108: Add support for default distro_bootcmd

This allow easier integration of RV1108 based boards on generic
distributions and build systems.

To avoid behavior change, we make evb-rv1108 to use the existing
environment as it boots from its SPI NOR.

Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
Reviewed-by: Philipp Tomsich <philipp.tomsich@theobroma-systems.com>

diff --git a/include/configs/evb_rv1108.h b/include/configs/evb_rv1108.h
index 34739c74745345c6166658500307e4439d5fb381..b742d98706b6d1dbeb7f756ef16b117832f41621 100644 (file)
--- a/include/configs/evb_rv1108.h
+++ b/include/configs/evb_rv1108.h
@@ -11,11 +11,14 @@
 /*
  * Default environment settings
  */
+#undef CONFIG_EXTRA_ENV_SETTINGS
 #define CONFIG_EXTRA_ENV_SETTINGS                                       \
        "netdev=eth0\0"                                                 \
        "ipaddr=172.16.12.50\0"                                         \
        "serverip=172.16.12.69\0"                                       \
        ""
+
+#undef CONFIG_BOOTCOMMAND
 #define CONFIG_BOOTCOMMAND                                             \
        "sf probe;"                                                     \
        "sf read 0x62000000 0x140800 0x500000;"                         \

diff --git a/include/configs/rv1108_common.h b/include/configs/rv1108_common.h
index cc0384e2f43c79d1f611071096c62654265a3cb3..16d4e2e355cb1c00e03d31a7268a60143b98a6a1 100644 (file)
--- a/include/configs/rv1108_common.h
+++ b/include/configs/rv1108_common.h
@@ -28,3 +28,18 @@
 #define CONFIG_USB_OHCI_NEW
 #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS     1
 #endif
+
+#ifndef CONFIG_SPL_BUILD
+#define ENV_MEM_LAYOUT_SETTINGS \
+       "scriptaddr=0x60000000\0" \
+       "fdt_addr_r=0x61f00000\0" \
+       "kernel_addr_r=0x62000000\0" \
+       "ramdisk_addr_r=0x64000000\0"
+
+#include <config_distro_bootcmd.h>
+#define CONFIG_EXTRA_ENV_SETTINGS \
+       ENV_MEM_LAYOUT_SETTINGS \
+       "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
+       "partitions=" PARTS_DEFAULT \
+       BOOTENV
+#endif