ARM: rmobile: Contain CONFIG_ARCH_RMOBILE_BOARD_STRING

[u-boot] / board / renesas / porter / porter.c

diff --git a/board/renesas/porter/porter.c b/board/renesas/porter/porter.c
index acd4f91d59d235bba511ff03ecb67374fb9cd196..fcf4ff90f02c694193b027c7a22e8045021babd5 100644 (file)
--- a/board/renesas/porter/porter.c
+++ b/board/renesas/porter/porter.c
@@ -11,6 +11,7 @@
 #include <malloc.h>
 #include <dm.h>
 #include <dm/platform_data/serial_sh.h>
+#include <environment.h>
 #include <asm/processor.h>
 #include <asm/mach-types.h>
 #include <asm/io.h>
@@ -110,10 +111,6 @@ int board_phy_config(struct phy_device *phydev)
        return 0;
 }
 
-const struct rmobile_sysinfo sysinfo = {
-       CONFIG_ARCH_RMOBILE_BOARD_STRING
-};
-
 void reset_cpu(ulong addr)
 {
        struct udevice *dev;
@@ -136,3 +133,18 @@ void reset_cpu(ulong addr)
        if (ret)
                hang();
 }
+
+enum env_location env_get_location(enum env_operation op, int prio)
+{
+       const u32 load_magic = 0xb33fc0de;
+
+       /* Block environment access if loaded using JTAG */
+       if ((readl(CONFIG_SPL_TEXT_BASE + 0x24) == load_magic) &&
+           (op != ENVOP_INIT))
+               return ENVL_UNKNOWN;
+
+       if (prio)
+               return ENVL_UNKNOWN;
+
+       return ENVL_SPI_FLASH;
+}