Merge "qsr1000: Adding hnvram initialization to uboot"
diff --git a/board/ruby/cmd_qtnboard.c b/board/ruby/cmd_qtnboard.c
index 32a28f5..2d2bc8d 100644
--- a/board/ruby/cmd_qtnboard.c
+++ b/board/ruby/cmd_qtnboard.c
@@ -41,25 +41,6 @@
static const char * const type2name[] = BOARD_CFG_FIELD_NAMES;
-#ifdef GFRG240
-static board_cfg_t g_default_board_cfg = {
- .bc_board_id = QTN_RUBY_UNIVERSAL_BOARD_ID,
- .bc_name = "gfrg240",
- .bc_ddr_type = DDR3_16_WINBOND,
- .bc_ddr_speed = DDR3_500MHz,
- .bc_ddr_size = DDR_256MB,
- .bc_emac0 = EMAC_IN_USE,
- .bc_emac1 =
- (EMAC_IN_USE | EMAC_PHY_FORCE_1000MB | EMAC_PHY_NOT_IN_USE | EMAC_PHY_AR8327),
- .bc_phy0_addr = 0x4,
- .bc_phy1_addr = EMAC_PHY_ADDR_SCAN,
- .bc_spi1 = SPI1_NOT_IN_USE,
- .bc_wifi_hw = QTN_TPZ_SKY85703,
- .bc_uart1 = UART1_NOT_IN_USE,
- .bc_pcie = PCIE_ROOTCOMPLEX,
- .bc_rgmii_timing = 0x84848484,
- };
-#else
static board_cfg_t g_default_board_cfg = {
.bc_board_id = QTN_RUBY_UNIVERSAL_BOARD_ID,
.bc_name = "default board",
@@ -75,7 +56,6 @@
.bc_uart1 = UART1_NOT_IN_USE,
.bc_rgmii_timing = CONFIG_ARCH_RGMII_DEFAULT,
};
-#endif /* #ifdef GFRG240 */
#ifndef TOPAZ_EP_MINI_UBOOT
static uint32_t qtn_board_get_end(void)
@@ -408,12 +388,6 @@
uint16_t board_config_size = 0;
const uint8_t * const board_config = qtn_get_file_env_ptr(QTN_HW_BOARD_CFG_BIN, &board_config_size);
-#ifdef GFRG240
- if (board_config == NULL) {
- memcpy(&board_hw_config, &g_default_board_cfg, sizeof(board_cfg_t));
- return SUCCESS;
- }
-#endif
if (board_config == NULL) {
if (qtn_get_emac_set() < 0) {
return FAIL;
diff --git a/quantenna/common/current_platform.h b/quantenna/common/current_platform.h
index ea6efbb..e54dda5 100644
--- a/quantenna/common/current_platform.h
+++ b/quantenna/common/current_platform.h
@@ -11,4 +11,4 @@
#define SIGMA_TESTBED_SUPPORT 0
#define GFRG240 1
-#define PLATFORM_DEFAULT_BOARD_ID QTN_RUBY_UNIVERSAL_BOARD_ID
+#define PLATFORM_DEFAULT_BOARD_ID QTN_TOPAZ_PROWL
diff --git a/quantenna/common/ruby_board_db.h b/quantenna/common/ruby_board_db.h
index da7883d..b44069f 100644
--- a/quantenna/common/ruby_board_db.h
+++ b/quantenna/common/ruby_board_db.h
@@ -1163,6 +1163,21 @@
.bc_emac0 = EMAC_IN_USE | EMAC_PHY_FORCE_1000MB | EMAC_PHY_NOT_IN_USE | EMAC_PHY_RTL8363SB_P0, \
.bc_wifi_hw = QTN_TPZ_SE5003L1, \
.bc_rgmii_timing = CONFIG_ARCH_RGMII_NODELAY, \
+ } ,{ /* 1232 */ \
+ .bc_board_id = QTN_TOPAZ_PROWL, \
+ .bc_name = "gfrg240", \
+ .bc_ddr_type = DDR3_16_WINBOND, \
+ .bc_ddr_speed = DDR3_500MHz, \
+ .bc_ddr_size = DDR_256MB, \
+ .bc_emac0 = EMAC_IN_USE, \
+ .bc_emac1 = (EMAC_IN_USE | EMAC_PHY_FORCE_1000MB | EMAC_PHY_NOT_IN_USE | EMAC_PHY_AR8327), \
+ .bc_phy0_addr = 0x4, \
+ .bc_phy1_addr = EMAC_PHY_ADDR_SCAN, \
+ .bc_spi1 = SPI1_NOT_IN_USE, \
+ .bc_wifi_hw = QTN_TPZ_SKY85703, \
+ .bc_uart1 = UART1_NOT_IN_USE, \
+ .bc_pcie = PCIE_ROOTCOMPLEX, \
+ .bc_rgmii_timing = 0x84848484, \
} \
}
diff --git a/quantenna/common/ruby_partitions.h b/quantenna/common/ruby_partitions.h
index 0ebd4a0..7d688fe 100644
--- a/quantenna/common/ruby_partitions.h
+++ b/quantenna/common/ruby_partitions.h
@@ -29,16 +29,25 @@
#define __RUBY_PARTITIONS_H
#ifdef GFRG240
-#define UBOOT_TEXT_PARTITION_SIZE 0x0040000 /* 256K */
-#define UBOOT_ENV_PARTITION_SIZE 0x0010000 /* 64K */
-#define UBOOT_RESERVED_A_PARTITION_SIZE 0x0030000 /* 192K */
-#define UBOOT_VENDOR_PARTITION_SIZE 0x0080000 /* 512K */
-#define UBOOT_RESERVED_B_PARTITION_SIZE 0x0100000 /* 1M */
-#define UBOOT_HNVRAM_PARTITION_SIZE 0x0200000 /* 2M */
-#define UBOOT_KERNEL_PARTITION_SIZE 0x1C00000 /* 28M (x2) */
-#define UBOOT_DATA_PARTITION_SIZE 0x0400000 /* 4M */
+#define UBOOT_TEXT_PARTITION_SIZE 0x00040000 /* 256K */
+#define UBOOT_ENV_PARTITION_SIZE 0x00010000 /* 64K */
+#define UBOOT_RESERVED_A_PARTITION_SIZE 0x00030000 /* 192K */
+#define UBOOT_VENDOR_PARTITION_SIZE 0x00080000 /* 512K */
+#define UBOOT_RESERVED_B_PARTITION_SIZE 0x00100000 /* 1M */
+#define UBOOT_HNVRAM_PARTITION_SIZE 0x00200000 /* 2M */
+#define UBOOT_KERNEL_PARTITION_SIZE 0x01C00000 /* 28M (x2) */
+#define UBOOT_DATA_PARTITION_SIZE 0x00400000 /* 4M */
-#define CONFIG_ENV_OFFSET 0x0040000 /* offset of uboot environment */
+#define CONFIG_ENV_OFFSET 0x00040000 /* offset of uboot environment */
+
+#define UBOOT_PARTITION_OFFSET_KERNEL0 (UBOOT_TEXT_PARTITION_SIZE + \
+ UBOOT_ENV_PARTITION_SIZE + \
+ UBOOT_RESERVED_A_PARTITION_SIZE + \
+ UBOOT_VENDOR_PARTITION_SIZE + \
+ UBOOT_RESERVED_B_PARTITION_SIZE + \
+ UBOOT_HNVRAM_PARTITION_SIZE)
+#define UBOOT_PARTITION_OFFSET_KERNEL1 (UBOOT_PARTITION_OFFSET_KERNEL0 + \
+ UBOOT_KERNEL_PARTITION_SIZE)
#define MTD_PARTNAME_UBOOT_BIN "uboot"
#define MTD_PARTNAME_UBOOT_ENV "uboot_env"
diff --git a/quantenna/include/qtn/shared_defs_common.h b/quantenna/include/qtn/shared_defs_common.h
index ef55d8c..e106f60 100644
--- a/quantenna/include/qtn/shared_defs_common.h
+++ b/quantenna/include/qtn/shared_defs_common.h
@@ -126,6 +126,7 @@
#define QTN_TOPAZ_BB_BOARD 1229
#define QTN_TOPAZ_RF_BOARD 1230
#define QTN_TOPAZ_QHS840_5S1 1231
+#define QTN_TOPAZ_PROWL 1232
#define QTN_RUBY_AUTOCONFIG_ID 32768
#define QTN_RUBY_UNIVERSAL_BOARD_ID 65535
