ipq6018: Enabling bootipq command
Change-Id: I5059a07b1a436cf732848009eaebb8c29b37a136
Signed-off-by: Antony Arun T <antothom@codeaurora.org>
diff --git a/arch/arm/dts/ipq6018-emulation.dts b/arch/arm/dts/ipq6018-emulation.dts
index 14c590a..6eb1831 100644
--- a/arch/arm/dts/ipq6018-emulation.dts
+++ b/arch/arm/dts/ipq6018-emulation.dts
@@ -14,9 +14,10 @@
/dts-v1/;
#include "ipq6018-soc.dtsi"
/ {
- model ="QCA, IPQ6018-EMULATION";
- compatible = "qca,ipq6018", "qca,ipq6018-emulation";
+ model ="QCA, IPQ6018-EMULATION-C1";
+ compatible = "qca,ipq6018", "qca,ipq6018-emulation-c1";
machid = <0x08010000>;
+ config_name = "config@1";
aliases {
console = "/serial@78af000";
diff --git a/board/qca/arm/ipq6018/ipq6018.c b/board/qca/arm/ipq6018/ipq6018.c
index d53ec02..4999e9c 100644
--- a/board/qca/arm/ipq6018/ipq6018.c
+++ b/board/qca/arm/ipq6018/ipq6018.c
@@ -27,6 +27,12 @@
DECLARE_GLOBAL_DATA_PTR;
struct sdhci_host mmc_host;
+const char *rsvd_node = "/reserved-memory";
+const char *del_node[] = {"uboot",
+ "sbl",
+ NULL};
+const add_node_t add_fdt_node[] = {{}};
+
void uart2_configure_mux(void)
{
unsigned long cfg_rcgr;
@@ -240,6 +246,10 @@
icache_disable();
}
+__weak int ipq_get_tz_version(char *version_name, int buf_size)
+{
+ return 1;
+}
/**
* Set the uuid in bootargs variable for mounting rootfilesystem
*/
@@ -258,3 +268,18 @@
while(1);
}
+void ipq_fdt_fixup_socinfo(void *blob)
+{
+ return;
+}
+
+void ipq_fdt_fixup_usb_device_mode(void *blob)
+{
+ return;
+}
+
+void fdt_fixup_auto_restart(void *blob)
+{
+ return;
+}
+
diff --git a/board/qca/arm/ipq6018/ipq6018.h b/board/qca/arm/ipq6018/ipq6018.h
index d67ef0e..8d32f4a 100644
--- a/board/qca/arm/ipq6018/ipq6018.h
+++ b/board/qca/arm/ipq6018/ipq6018.h
@@ -116,6 +116,10 @@
SMEM_MAX_SIZE = SMEM_SPI_FLASH_ADDR_LEN + 1,
} smem_mem_type_t;
+extern const char *rsvd_node;
+extern const char *del_node[];
+extern const add_node_t add_fdt_node[];
+
#define MSM_SDC1_BASE 0x7800000
#define MSM_SDC1_SDHCI_BASE 0x7804000
diff --git a/include/configs/ipq6018.h b/include/configs/ipq6018.h
index 75e31a5..c32de86 100644
--- a/include/configs/ipq6018.h
+++ b/include/configs/ipq6018.h
@@ -203,7 +203,7 @@
#define CONFIG_SYS_HUSH_PARSER
/* NSS firmware loaded using bootm */
-#define CONFIG_BOOTCOMMAND "bootm"
+#define CONFIG_BOOTCOMMAND "bootipq"
#define CONFIG_BOOTARGS "console=ttyMSM0,115200n8"
#define QCA_ROOT_FS_PART_NAME "rootfs"
@@ -220,6 +220,10 @@
#define CONFIG_CMD_BOOTZ
#define CONFIG_FDT_FIXUP_PARTITIONS
+#define CONFIG_OF_BOARD_SETUP
+
+#ifdef CONFIG_OF_BOARD_SETUP
+#define DLOAD_DISABLE 0x1
/*
* Below Configs need to be updated after enabling reset_crashdump
* Included now to avoid build failure
@@ -229,6 +233,10 @@
#define SCM_CMD_TZ_CONFIG_HW_FOR_RAM_DUMP_ID 0x9
#define SCM_CMD_TZ_FORCE_DLOAD_ID 0x10
#define SCM_CMD_TZ_PSHOLD 0x15
+#define BOOT_VERSION 0
+#define TZ_VERSION 1
+#define RPM_VERSION 3
+#endif
/* L1 cache line size is 64 bytes, L2 cache line size is 128 bytes
* Cache flush and invalidation based on L1 cache, so the cache line
* size is configured to 64 */